From d5687907e0e736d42845d342e0d6c7b4820ba31c Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Wed, 24 Jul 2024 13:16:47 +0200
Subject: [PATCH] Fixed tests on macos (#248)

---
 src/class_diagram/model/diagram.cc            |  4 ++--
 src/common/visitor/translation_unit_visitor.h |  5 -----
 src/package_diagram/model/diagram.cc          |  4 ++--
 tests/t00080/.clang-uml                       | 11 +----------
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/class_diagram/model/diagram.cc b/src/class_diagram/model/diagram.cc
index 779a0fba..135d4ca8 100644
--- a/src/class_diagram/model/diagram.cc
+++ b/src/class_diagram/model/diagram.cc
@@ -273,12 +273,12 @@ void diagram::apply_filter()
         if (!filter().should_include(c.get()))
             to_remove.emplace(c.get().id());
 
-    nested_trait_ns::remove(to_remove);
-
     element_view<class_>::remove(to_remove);
     element_view<enum_>::remove(to_remove);
     element_view<concept_>::remove(to_remove);
 
+    nested_trait_ns::remove(to_remove);
+
     for (auto &c : element_view<class_>::view())
         c.get().apply_filter(filter(), to_remove);
 
diff --git a/src/common/visitor/translation_unit_visitor.h b/src/common/visitor/translation_unit_visitor.h
index 8906b281..c4569c7c 100644
--- a/src/common/visitor/translation_unit_visitor.h
+++ b/src/common/visitor/translation_unit_visitor.h
@@ -255,11 +255,6 @@ public:
 
         auto *comment = decl.getASTContext().getRawCommentForDeclNoCache(&decl);
 
-        if (comment == nullptr) {
-            comment = clanguml::common::get_declaration_raw_comment(
-                source_manager(), decl.getASTContext(), &decl);
-        }
-
         process_comment(comment, decl.getASTContext().getDiagnostics(), e);
     }
 
diff --git a/src/package_diagram/model/diagram.cc b/src/package_diagram/model/diagram.cc
index 67161539..36cfbea6 100644
--- a/src/package_diagram/model/diagram.cc
+++ b/src/package_diagram/model/diagram.cc
@@ -84,10 +84,10 @@ void diagram::apply_filter()
         if (!filter().should_include(c.get()))
             to_remove.emplace(c.get().id());
 
-    nested_trait_ns::remove(to_remove);
-
     element_view<package>::remove(to_remove);
 
+    nested_trait_ns::remove(to_remove);
+
     for (auto &c : element_view<package>::view())
         c.get().apply_filter(filter(), to_remove);
 }
diff --git a/tests/t00080/.clang-uml b/tests/t00080/.clang-uml
index cbc4a031..cf855dae 100644
--- a/tests/t00080/.clang-uml
+++ b/tests/t00080/.clang-uml
@@ -1,6 +1,3 @@
-add_compile_flags:
-  - -fparse-all-comments
-  - -fretain-comments-from-system-headers
 diagrams:
   t00080_class:
     type: class
@@ -15,10 +12,4 @@ diagrams:
           - clanguml::t00080
         elements:
           - std::thread
-    using_namespace: clanguml::t00080
-    plantuml:
-      after:
-        - '{% set e=element("std::thread") %} note top of {{ e.alias }} : {{ trim(e.comment.paragraph.0) }}'
-    mermaid:
-      after:
-        - '{% set e=element("std::thread") %} note for {{ e.alias }} "{{ trim(e.comment.paragraph.0) }}"'
\ No newline at end of file
+    using_namespace: clanguml::t00080
\ No newline at end of file