llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: Owen Pan (owenca) <details> <summary>Changes</summary> Fixed #<!-- -->70789. --- Full diff: https://github.com/llvm/llvm-project/pull/73220.diff 2 Files Affected: - (modified) clang/lib/Format/UnwrappedLineParser.cpp (+7) - (modified) clang/unittests/Format/FormatTest.cpp (+2) ``````````diff diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index c870ff01605e725..0f841e0bee50b6c 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -1171,6 +1171,13 @@ void UnwrappedLineParser::parsePPDefine() { assert((int)Line->PPLevel >= 0); Line->InMacroBody = true; + if (FormatTok->is(tok::identifier) && + Tokens->peekNextToken()->is(tok::colon)) { + nextToken(); + nextToken(); + addUnwrappedLine(); + } + // Errors during a preprocessor directive can only affect the layout of the // preprocessor directive, and thus we ignore them. An alternative approach // would be to use the same approach we use on the file level (no diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 67423f9b06fbc37..d095a2b751defe3 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -1863,6 +1863,8 @@ TEST_F(FormatTest, UnderstandsMacros) { verifyFormat("MACRO(something##something)"); verifyFormat("MACRO(return##something)"); verifyFormat("MACRO(co_return##something)"); + + verifyFormat("#define A x:"); } TEST_F(FormatTest, ShortBlocksInMacrosDontMergeWithCodeAfterMacro) { `````````` </details> https://github.com/llvm/llvm-project/pull/73220 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
