[clang] ca0d970 - [clang-format] Avoid merging macro definitions.
Marek Kurdej via cfe-commits
cfe-commits at lists.llvm.org
Thu Feb 3 09:54:53 PST 2022
Author: Marek Kurdej
Date: 2022-02-03T18:54:46+01:00
New Revision: ca0d97072e79f8d7159c50db616647eeb1b094b8
URL: https://github.com/llvm/llvm-project/commit/ca0d97072e79f8d7159c50db616647eeb1b094b8
DIFF: https://github.com/llvm/llvm-project/commit/ca0d97072e79f8d7159c50db616647eeb1b094b8.diff
LOG: [clang-format] Avoid merging macro definitions.
Fixes https://github.com/llvm/llvm-project/issues/42087.
Reviewed By: HazardyKnusperkeks, owenpan
Differential Revision: https://reviews.llvm.org/D118879
Added:
Modified:
clang/lib/Format/UnwrappedLineFormatter.cpp
clang/unittests/Format/FormatTest.cpp
Removed:
################################################################################
diff --git a/clang/lib/Format/UnwrappedLineFormatter.cpp b/clang/lib/Format/UnwrappedLineFormatter.cpp
index 08ba442b5f0e..f7d26b813f4f 100644
--- a/clang/lib/Format/UnwrappedLineFormatter.cpp
+++ b/clang/lib/Format/UnwrappedLineFormatter.cpp
@@ -621,6 +621,10 @@ class LineJoiner {
tryMergeSimpleBlock(SmallVectorImpl<AnnotatedLine *>::const_iterator I,
SmallVectorImpl<AnnotatedLine *>::const_iterator E,
unsigned Limit) {
+ // Don't merge with a preprocessor directive.
+ if (I[1]->Type == LT_PreprocessorDirective)
+ return 0;
+
AnnotatedLine &Line = **I;
// Don't merge ObjC @ keywords and methods.
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index 3d9e38616450..094b9142aa10 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -1805,6 +1805,21 @@ TEST_F(FormatTest, UnderstandsMacros) {
verifyFormat("#define xor(x) (^(x))");
verifyFormat("#define __except(x)");
verifyFormat("#define __try(x)");
+
+ FormatStyle Style = getLLVMStyle();
+ Style.BreakBeforeBraces = FormatStyle::BS_Custom;
+ Style.BraceWrapping.AfterFunction = true;
+ // Test that a macro definition never gets merged with the following
+ // definition.
+ // FIXME: The AAA macro definition probably should not be split into 3 lines.
+ verifyFormat("#define AAA "
+ " \\\n"
+ " N "
+ " \\\n"
+ " {\n"
+ "#define BBB }\n",
+ Style);
+ // verifyFormat("#define AAA N { //\n", Style);
}
TEST_F(FormatTest, ShortBlocksInMacrosDontMergeWithCodeAfterMacro) {
More information about the cfe-commits
mailing list