maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
Marek Kurdej 2022-02-03 18:46:35 +01:00
parent 529aa4b011
commit ca0d97072e
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Format/UnwrappedLineFormatter.cpp
View File

@ -621,6 +621,10 @@ private:
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.

15
clang/unittests/Format/FormatTest.cpp
View File

@ -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) {