From c4fb819014a6d42e1887251a510c9ee0e84de833 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Tue, 9 May 2023 22:03:42 +0200 Subject: [PATCH] Fixed include diagram JSON generator on Windows --- .../generators/json/include_diagram_generator.cc | 6 +++++- tests/t00056/test_case.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/include_diagram/generators/json/include_diagram_generator.cc b/src/include_diagram/generators/json/include_diagram_generator.cc index 02a5c53f..80157a44 100644 --- a/src/include_diagram/generators/json/include_diagram_generator.cc +++ b/src/include_diagram/generators/json/include_diagram_generator.cc @@ -55,7 +55,11 @@ void generator::generate(const source_file &f, nlohmann::json &parent) const nlohmann::json j; j["id"] = std::to_string(f.id()); j["name"] = f.name(); - j["display_name"] = f.full_name(false); + auto display_name = f.full_name(false); + #if defined(_MSC_VER) + util::replace_all(display_name, "\\", "/"); + #endif + j["display_name"] = std::move(display_name); if (f.type() == common::model::source_file_t::kDirectory) { LOG_DBG("Generating directory {}", f.name()); diff --git a/tests/t00056/test_case.h b/tests/t00056/test_case.h index 5e6ddd6d..216eca4a 100644 --- a/tests/t00056/test_case.h +++ b/tests/t00056/test_case.h @@ -56,7 +56,7 @@ TEST_CASE("t00056", "[test-case][class]") #ifdef _MSC_VER REQUIRE_THAT(puml, IsConceptRequirement( - _A("convertible_to_string"), "std::string({s})")); + _A("convertible_to_string"), "std::string{s}")); #else REQUIRE_THAT(puml, IsConceptRequirement(