Author: Krasimir Georgiev Date: 2021-08-03T16:19:35+02:00 New Revision: f6bc614546e169bb1b17a29c422ebace038e6c62
URL: https://github.com/llvm/llvm-project/commit/f6bc614546e169bb1b17a29c422ebace038e6c62 DIFF: https://github.com/llvm/llvm-project/commit/f6bc614546e169bb1b17a29c422ebace038e6c62.diff LOG: [clan-format] detect function definitions more conservatively https://reviews.llvm.org/D105964 updated the detection of function definitions. It had the unfortunate effect to start marking object definitions with attribute-like macros as function definitions. This addresses this issue. Reviewed By: owenpan Differential Revision: https://reviews.llvm.org/D107269 Added: Modified: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/FormatTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 54e6c7d38e7d..de3dabcfc639 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2482,7 +2482,7 @@ static bool isFunctionDeclarationName(const FormatToken &Current, // return i + 1; // } if (Next->Next && Next->Next->is(tok::identifier) && - !(Next->MatchingParen->Next && Next->MatchingParen->Next->is(tok::semi))) + Line.Last->isNot(tok::semi)) return true; for (const FormatToken *Tok = Next->Next; Tok && Tok != Next->MatchingParen; Tok = Tok->Next) { diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index c328bd44744a..de6f1b784394 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -8224,7 +8224,12 @@ TEST_F(FormatTest, ReturnTypeBreakingStyle) { "f(i)\n" "{\n" " return i + 1;\n" - "}", + "}\n" + "int\n" // Break here. + "f(i)\n" + "{\n" + " return i + 1;\n" + "};", Style); verifyFormat("int f(a, b, c);\n" // No break here. "int\n" // Break here. @@ -8233,8 +8238,20 @@ TEST_F(FormatTest, ReturnTypeBreakingStyle) { "float c;\n" "{\n" " return a + b < c;\n" - "}", + "}\n" + "int\n" // Break here. + "f(a, b, c)\n" // Break here. + "short a, b;\n" + "float c;\n" + "{\n" + " return a + b < c;\n" + "};", Style); + // The return breaking style doesn't affect object definitions with + // attribute-like macros. + verifyFormat("Tttttttttttttttttttttttt ppppppppppppppp\n" + " ABSL_GUARDED_BY(mutex) = {};", + getGoogleStyleWithColumns(40)); Style = getGNUStyle(); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits