[PATCH] D116859: Fix for: clang-format: break added to macro define with ColumnLimit: 0
Armen Khachkinaev via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Sat Jan 8 05:31:15 PST 2022
futuarmo created this revision.
futuarmo added reviewers: djasper, MyDeveloperDay.
futuarmo requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Fix for #49164 <https://github.com/llvm/llvm-project/issues/49164> issue.
Alse added test for this case
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D116859
Files:
clang/lib/Format/ContinuationIndenter.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -4804,6 +4804,14 @@
Style);
}
+TEST_F(FormatTest, FormatMacroWithZeroColumnWidth) {
+ FormatStyle ZeroColumn = getLLVMStyleWithColumns(0);
+
+ verifyFormat("#define STRINGIFY(t) #t\n"
+ "#define MAKEVERSIONSTRING(x, y, z, build) STRINGIFY(x) \".\" STRINGIFY(y) \".\" STRINGIFY(z) \".\" STRINGIFY(build)\n",
+ ZeroColumn);
+}
+
TEST_F(FormatTest, LayoutMacroDefinitionsStatementsSpanningBlocks) {
verifyFormat("#define A \\\n"
" f({ \\\n"
Index: clang/lib/Format/ContinuationIndenter.cpp
===================================================================
--- clang/lib/Format/ContinuationIndenter.cpp
+++ clang/lib/Format/ContinuationIndenter.cpp
@@ -485,7 +485,8 @@
// different LineFormatter would be used otherwise.
if (Previous.ClosesTemplateDeclaration)
return Style.AlwaysBreakTemplateDeclarations != FormatStyle::BTDS_No;
- if (Previous.is(TT_FunctionAnnotationRParen))
+ if (Previous.is(TT_FunctionAnnotationRParen) &&
+ State.Line->Type != LT_PreprocessorDirective)
return true;
if (Previous.is(TT_LeadingJavaAnnotation) && Current.isNot(tok::l_paren) &&
Current.isNot(TT_LeadingJavaAnnotation))
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D116859.398329.patch
Type: text/x-patch
Size: 1430 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220108/833a0507/attachment.bin>
More information about the cfe-commits
mailing list