Author: owenca Date: 2022-08-22T20:42:54-07:00 New Revision: 2e36120726ee46cbfd3eee1e9244bdd756dee92d
URL: https://github.com/llvm/llvm-project/commit/2e36120726ee46cbfd3eee1e9244bdd756dee92d DIFF: https://github.com/llvm/llvm-project/commit/2e36120726ee46cbfd3eee1e9244bdd756dee92d.diff LOG: [clang-format] Fix regressions in WhitespaceSensitiveMacros Fixes #54522. Fixes #57158. Differential Revision: https://reviews.llvm.org/D132001 Added: Modified: clang/lib/Format/UnwrappedLineParser.cpp clang/unittests/Format/FormatTest.cpp clang/unittests/Format/TokenAnnotatorTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index e7ce86b0a7524..640ae6b5fa8ae 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -2006,7 +2006,8 @@ void UnwrappedLineParser::parseStructuralElement( if (FollowedByNewline && (Text.size() >= 5 || FunctionLike) && tokenCanStartNewLine(*FormatTok) && Text == Text.upper()) { - PreviousToken->setFinalizedType(TT_FunctionLikeOrFreestandingMacro); + if (PreviousToken->isNot(TT_UntouchableMacroFunc)) + PreviousToken->setFinalizedType(TT_FunctionLikeOrFreestandingMacro); addUnwrappedLine(); return; } diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 83aa0dd9fb7a7..4879b0e06bd38 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -23826,6 +23826,10 @@ TEST_F(FormatTest, WhitespaceSensitiveMacros) { FormatStyle Style = getLLVMStyle(); Style.WhitespaceSensitiveMacros.push_back("FOO"); + // Newlines are important here. + verifyFormat("FOO(1+2 )\n", Style); + verifyFormat("FOO(a:b:c)\n", Style); + // Don't use the helpers here, since 'mess up' will change the whitespace // and these are all whitespace sensitive by definition EXPECT_EQ("FOO(String-ized&Messy+But(: :Still)=Intentional);", diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 91af78c694f81..13b95598a602c 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -273,6 +273,25 @@ TEST_F(TokenAnnotatorTest, UnderstandsVariableTemplates) { EXPECT_TOKEN(Tokens[13], tok::ampamp, TT_BinaryOperator); } +TEST_F(TokenAnnotatorTest, UnderstandsWhitespaceSensitiveMacros) { + FormatStyle Style = getLLVMStyle(); + Style.WhitespaceSensitiveMacros.push_back("FOO"); + + auto Tokens = annotate("FOO(1+2 )\n", Style); + EXPECT_EQ(Tokens.size(), 7u) << Tokens; + EXPECT_TOKEN(Tokens[0], tok::identifier, TT_UntouchableMacroFunc); + + Tokens = annotate("FOO(a:b:c)\n", Style); + EXPECT_EQ(Tokens.size(), 9u) << Tokens; + EXPECT_TOKEN(Tokens[0], tok::identifier, TT_UntouchableMacroFunc); +} + +TEST_F(TokenAnnotatorTest, UnderstandsLBracesInMacroDefinition) { + auto Tokens = annotate("#define BEGIN NS {"); + EXPECT_EQ(Tokens.size(), 6u) << Tokens; + EXPECT_TOKEN(Tokens[4], tok::l_brace, TT_Unknown); +} + TEST_F(TokenAnnotatorTest, UnderstandsDelete) { auto Tokens = annotate("delete (void *)p;"); EXPECT_EQ(Tokens.size(), 8u) << Tokens; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
