From 54b378dc71057b2ad5b0a1b9b7b51fb965a578dc Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Sun, 30 Jan 2022 18:30:35 +0100 Subject: [PATCH] Fixed template namespace filter in class diagrams --- .../generators/plantuml/class_diagram_generator.cc | 6 ++---- tests/t00014/test_case.h | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/class_diagram/generators/plantuml/class_diagram_generator.cc b/src/class_diagram/generators/plantuml/class_diagram_generator.cc index 15a24ea4..e3b7ee00 100644 --- a/src/class_diagram/generators/plantuml/class_diagram_generator.cc +++ b/src/class_diagram/generators/plantuml/class_diagram_generator.cc @@ -360,8 +360,7 @@ void generator::generate(std::ostream &ostr) const if (m_config.should_include_entities("classes")) { for (const auto &c : m_model.classes()) { - if (!c.is_template_instantiation() && - !m_config.should_include(c.name())) + if (!m_config.should_include(c.name())) continue; generate_alias(c, ostr); ostr << '\n'; @@ -375,8 +374,7 @@ void generator::generate(std::ostream &ostr) const } for (const auto &c : m_model.classes()) { - if (!c.is_template_instantiation() && - !m_config.should_include(c.name())) + if (!m_config.should_include(c.name())) continue; generate(c, ostr); ostr << '\n'; diff --git a/tests/t00014/test_case.h b/tests/t00014/test_case.h index c968ef64..56eecac5 100644 --- a/tests/t00014/test_case.h +++ b/tests/t00014/test_case.h @@ -44,6 +44,8 @@ TEST_CASE("t00014", "[test-case][class]") REQUIRE_THAT(puml, IsClassTemplate("A", "T,std::string")); REQUIRE_THAT(puml, IsClassTemplate("A", "bool,std::string")); REQUIRE_THAT(puml, IsClassTemplate("AString", "float")); + REQUIRE_THAT( + puml, !IsClassTemplate("std::std::function", "void(T...,int),int)")); REQUIRE_THAT(puml, IsInstantiation(_A("A"), _A("A"))); REQUIRE_THAT(