[PATCH] D132001: [clang-format] Fix regressions in WhitespaceSensitiveMacros
Owen Pan via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Tue Aug 16 16:37:26 PDT 2022
owenpan created this revision.
owenpan added reviewers: curdeius, krasimir, HazardyKnusperkeks, MyDeveloperDay, ksyx.
owenpan added a project: clang-format.
Herald added a project: All.
owenpan requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Fixes https://github.com/llvm/llvm-project/issues/54522.
Fixes https://github.com/llvm/llvm-project/issues/57158.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D132001
Files:
clang/lib/Format/UnwrappedLineParser.cpp
clang/unittests/Format/FormatTest.cpp
clang/unittests/Format/TokenAnnotatorTest.cpp
Index: clang/unittests/Format/TokenAnnotatorTest.cpp
===================================================================
--- clang/unittests/Format/TokenAnnotatorTest.cpp
+++ clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -273,6 +273,19 @@
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;
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -23807,6 +23807,10 @@
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);",
Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -2007,7 +2007,8 @@
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;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D132001.453161.patch
Type: text/x-patch
Size: 2250 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220816/fc0550b7/attachment.bin>
More information about the cfe-commits
mailing list