From: Argyrios Kyrtzidis Date: Fri, 26 Jul 2013 18:38:12 +0000 (+0000) Subject: [libclang] Remove comma from the blacklist of characters that prevent a comment to... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc663264c56e587ce9210a7c3b049645e92526b9;p=clang [libclang] Remove comma from the blacklist of characters that prevent a comment to be attached to a decl. It's common to use an availability function macro at the start of a decl. rdar://13965065 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@187230 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 8e7b13eff0..1b465312cc 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -227,7 +227,7 @@ RawComment *ASTContext::getRawCommentForDeclNoCache(const Decl *D) const { // There should be no other declarations or preprocessor directives between // comment and declaration. - if (Text.find_first_of(",;{}#@") != StringRef::npos) + if (Text.find_first_of(";{}#@") != StringRef::npos) return NULL; return *Comment; diff --git a/test/Index/annotate-comments.cpp b/test/Index/annotate-comments.cpp index 2a0b635de8..6612a44792 100644 --- a/test/Index/annotate-comments.cpp +++ b/test/Index/annotate-comments.cpp @@ -247,6 +247,13 @@ void isdoxy52(int); */ void isdoxy53(int); +#define MYMAC(x,y) +/** + * Aaa. IS_DOXYGEN_START IS_DOXYGEN_END + */ +MYMAC(0,0) +void isdoxy54(int); + #endif // RUN: rm -rf %t @@ -327,4 +334,5 @@ void isdoxy53(int); // CHECK: annotate-comments.cpp:222:6: FunctionDecl=isdoxy50:{{.*}} BriefComment=[Returns ddd IS_DOXYGEN_END] // CHECK: annotate-comments.cpp:231:6: FunctionDecl=isdoxy51:{{.*}} BriefComment=[Aaa. IS_DOXYGEN_START] // CHECK: annotate-comments.cpp:241:6: FunctionDecl=isdoxy52:{{.*}} BriefComment=[Aaa. IS_DOXYGEN_START Bbb.] - +// CHECK: annotate-comments.cpp:248:6: FunctionDecl=isdoxy53:{{.*}} BriefComment=[Aaa. IS_DOXYGEN_START IS_DOXYGEN_END] +// CHECK: annotate-comments.cpp:255:6: FunctionDecl=isdoxy54:{{.*}} BriefComment=[Aaa. IS_DOXYGEN_START IS_DOXYGEN_END]