This is an archive of the discontinued LLVM Phabricator instance.

Differential D118879

[clang-format] Avoid merging macro definitions.
ClosedPublic

Authored by curdeius on Feb 2 2022, 11:59 PM.

Details

Reviewers
MyDeveloperDay
HazardyKnusperkeks
owenpan
Commits
rGca0d97072e79: [clang-format] Avoid merging macro definitions.
Summary

Fixes https://github.com/llvm/llvm-project/issues/42087.

Diff Detail

Event Timeline

curdeius requested review of this revision.Feb 2 2022, 11:59 PM
curdeius created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 2 2022, 11:59 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B147323: Diff 405538.Feb 3 2022, 12:00 AM
curdeius added a parent revision: D118844: [clang-format] Avoid adding space after the name of a function-like macro when the name is a keyword..Feb 3 2022, 12:00 AM
curdeius updated this revision to Diff 405539.Feb 3 2022, 12:03 AM

Force CI after changing parent revision.

HazardyKnusperkeks accepted this revision.Feb 3 2022, 12:21 AM
This revision is now accepted and ready to land.Feb 3 2022, 12:21 AM
Harbormaster completed remote builds in B147324: Diff 405539.Feb 3 2022, 12:30 AM
owenpan accepted this revision.Feb 3 2022, 4:14 AM
owenpan added inline comments.
clang/unittests/Format/FormatTest.cpp
1812
1814
This revision was landed with ongoing or failed builds.Feb 3 2022, 9:55 AM
Closed by commit rGca0d97072e79: [clang-format] Avoid merging macro definitions. (authored by curdeius). · Explain Why
This revision was automatically updated to reflect the committed changes.
curdeius marked 2 inline comments as done.
curdeius added a commit: rGca0d97072e79: [clang-format] Avoid merging macro definitions..
curdeius added a comment.Feb 3 2022, 9:55 AM

Thanks for the reviews!

Revision Contents

PathSize
clang/
lib/
Format/
4 lines
unittests/
Format/
16 lines

Diff 405538

clang/lib/Format/UnwrappedLineFormatter.cpp

Show First 20 Lines • Show All 617 Lines • ▼ Show 20 Linesprivate:
} }
unsigned unsigned
tryMergeSimpleBlock(SmallVectorImpl<AnnotatedLine *>::const_iterator I, tryMergeSimpleBlock(SmallVectorImpl<AnnotatedLine *>::const_iterator I,
SmallVectorImpl<AnnotatedLine *>::const_iterator E, SmallVectorImpl<AnnotatedLine *>::const_iterator E,
unsigned Limit) { unsigned Limit) {
AnnotatedLine &Line = **I; AnnotatedLine &Line = **I;
// Don't merge with a preprocessor directive.
if (I[1]->Type == LT_PreprocessorDirective)
return 0;
// Don't merge ObjC @ keywords and methods. // Don't merge ObjC @ keywords and methods.
// FIXME: If an option to allow short exception handling clauses on a single // FIXME: If an option to allow short exception handling clauses on a single
// line is added, change this to not return for @try and friends. // line is added, change this to not return for @try and friends.
if (Style.Language != FormatStyle::LK_Java && if (Style.Language != FormatStyle::LK_Java &&
Line.First->isOneOf(tok::at, tok::minus, tok::plus)) Line.First->isOneOf(tok::at, tok::minus, tok::plus))
return 0; return 0;
// Check that the current line allows merging. This depends on whether we // Check that the current line allows merging. This depends on whether we
▲ Show 20 Lines • Show All 800 Lines • Show Last 20 Lines

clang/unittests/Format/FormatTest.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 1,799 Lines • ▼ Show 20 LinesTEST_F(FormatTest, UnderstandsMacros) {
verifyFormat("#define true ((int)1)"); verifyFormat("#define true ((int)1)");
verifyFormat("#define and(x)"); verifyFormat("#define and(x)");
verifyFormat("#define if(x) x"); verifyFormat("#define if(x) x");
verifyFormat("#define return(x) (x)"); verifyFormat("#define return(x) (x)");
verifyFormat("#define while(x) for (; x;)"); verifyFormat("#define while(x) for (; x;)");
verifyFormat("#define xor(x) (^(x))"); verifyFormat("#define xor(x) (^(x))");
verifyFormat("#define __except(x)"); verifyFormat("#define __except(x)");
verifyFormat("#define __try(x)"); verifyFormat("#define __try(x)");
FormatStyle Style = getLLVMStyle();
Style.BreakBeforeBraces = FormatStyle::BS_Custom;
Style.BraceWrapping.AfterFunction = true;
// Test that a macro definition gets never merged with the following
owenpanUnsubmitted
Done
ReplyInline Actions
Style.BraceWrapping.AfterFunction = true;
// Test that a macro definition gets never merged with the following
+ // Test that a macro definition never gets merged with the following
// definition.
owenpan:
// definition.
// FIXME: The AAA macro definition should probably not be splitted into 3
owenpanUnsubmitted
Done
ReplyInline Actions
// definition.
// FIXME: The AAA macro definition should probably not be splitted into 3
+ // FIXME: The AAA macro definition probably should not be split into 3
// lines.
owenpan:
// lines.
verifyFormat("#define AAA "
" \\\n"
" N "
" \\\n"
" {\n"
"#define BBB }\n",
Style);
// verifyFormat("#define AAA N { //\n", Style);
} }
TEST_F(FormatTest, ShortBlocksInMacrosDontMergeWithCodeAfterMacro) { TEST_F(FormatTest, ShortBlocksInMacrosDontMergeWithCodeAfterMacro) {
FormatStyle Style = getLLVMStyleWithColumns(60); FormatStyle Style = getLLVMStyleWithColumns(60);
Style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Always; Style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Always;
Style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_WithoutElse; Style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_WithoutElse;
Style.BreakBeforeBraces = FormatStyle::BS_Allman; Style.BreakBeforeBraces = FormatStyle::BS_Allman;
EXPECT_EQ("#define A \\\n" EXPECT_EQ("#define A \\\n"
▲ Show 20 Lines • Show All 22,431 Lines • Show Last 20 Lines