Add documentation node searching for template alias declaration

Fix issue SonarOpenCommunity#736
lcintrat · Jan 3, 2016 · 7a5e47a · 7a5e47a
1 parent 52de9de
commit 7a5e47a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/cxx-squid/src/main/java/org/sonar/cxx/visitors/AbstractCxxPublicApiVisitor.java b/cxx-squid/src/main/java/org/sonar/cxx/visitors/AbstractCxxPublicApiVisitor.java
@@ -489,8 +489,14 @@ private void visitAliasDeclaration(AstNode aliasDeclNode) {
       if (aliasDeclIdNode == null) {
         LOG.error("No identifier found at {}", aliasDeclNode.getTokenLine());
       } else {
+        // check if this is a template specification to adjust
+        // documentation node
+        AstNode template = aliasDeclNode
+            .getFirstAncestor(CxxGrammarImpl.templateDeclaration);
+        AstNode docNode = (template != null) ? template : aliasDeclNode;
+
         // look for block documentation
-        List<Token> comments = getBlockDocumentation(aliasDeclNode);
+        List<Token> comments = getBlockDocumentation(docNode);
 
         // documentation may be inlined
         if (comments.isEmpty()) {

diff --git a/cxx-squid/src/test/java/org/sonar/cxx/CxxPublicApiVisitorTest.java b/cxx-squid/src/test/java/org/sonar/cxx/CxxPublicApiVisitorTest.java
@@ -133,7 +133,7 @@ public void no_doc() {
 
   @Test
   public void template() {
-    testFile("src/test/resources/metrics/template.h", 3, 2, true);
+    testFile("src/test/resources/metrics/template.h", 5, 2, true);
   }
 
   @Test

diff --git a/cxx-squid/src/test/resources/metrics/template.h b/cxx-squid/src/test/resources/metrics/template.h
@@ -9,3 +9,12 @@ class testClass
 
 	int publicAttr;
 };
+
+/*!
+ * \brief issue #736
+ */
+template <typename T>
+using intrinsic_type = typename intrinsic_traits<T>::intrinsic_type;
+
+template <typename T>
+using inline_intrinsic_type = typename intrinsic_traits<T>::intrinsic_type; ///< issue #736