This is an archive of the discontinued LLVM Phabricator instance.

Differential D51719

Wrapped block after case label should not be merged into a single line (Bug 38854)
ClosedPublic

Authored by owenpan on Sep 6 2018, 12:45 AM.

Details

Reviewers
djasper
klimek
sammccall
krasimir
Commits
rG58c3dee3b3cd: [clang-format] Wrapped block after case label should not be merged into one line
rC342116: [clang-format] Wrapped block after case label should not be merged into one line
rL342116: [clang-format] Wrapped block after case label should not be merged into one line
Summary

See https://bugs.llvm.org/show_bug.cgi?id=38854

Diff Detail

Repository
rC Clang

Event Timeline

owenpan created this revision.Sep 6 2018, 12:45 AM
Herald added a subscriber: cfe-commits. · View Herald TranscriptSep 6 2018, 12:45 AM
owenpan added reviewers: djasper, klimek, sammccall.Sep 6 2018, 12:48 AM
owenpan added a reviewer: krasimir.Sep 10 2018, 4:15 PM

Can one of the reviews have a quick look at this one? Thanks!

sammccall accepted this revision.Sep 11 2018, 1:05 AM
This revision is now accepted and ready to land.Sep 11 2018, 1:05 AM
Closed by commit rL342116: [clang-format] Wrapped block after case label should not be merged into one line (authored by owenpan). · Explain WhySep 13 2018, 12:28 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptSep 13 2018, 12:28 AM

Revision Contents

PathSize
lib/
Format/
4 lines
unittests/
Format/
26 lines

Diff 164153

lib/Format/UnwrappedLineFormatter.cpp

Show First 20 Lines • Show All 317 Lines • ▼ Show 20 Lines tryFitMultipleLinesInOne(LevelIndentTracker &IndentTracker,
// Don't merge block with left brace wrapped after ObjC special blocks // Don't merge block with left brace wrapped after ObjC special blocks
if (TheLine->First->is(tok::l_brace) && I != AnnotatedLines.begin() && if (TheLine->First->is(tok::l_brace) && I != AnnotatedLines.begin() &&
I[-1]->First->is(tok::at) && I[-1]->First->Next) { I[-1]->First->is(tok::at) && I[-1]->First->Next) {
tok::ObjCKeywordKind kwId = I[-1]->First->Next->Tok.getObjCKeywordID(); tok::ObjCKeywordKind kwId = I[-1]->First->Next->Tok.getObjCKeywordID();
if (kwId == clang::tok::objc_autoreleasepool || if (kwId == clang::tok::objc_autoreleasepool ||
kwId == clang::tok::objc_synchronized) kwId == clang::tok::objc_synchronized)
return 0; return 0;
} }
// Don't merge block with left brace wrapped after case labels
if (TheLine->First->is(tok::l_brace) && I != AnnotatedLines.begin() &&
I[-1]->First->isOneOf(tok::kw_case, tok::kw_default))
return 0;
// Try to merge a block with left brace wrapped that wasn't yet covered // Try to merge a block with left brace wrapped that wasn't yet covered
if (TheLine->Last->is(tok::l_brace)) { if (TheLine->Last->is(tok::l_brace)) {
return !Style.BraceWrapping.AfterFunction || return !Style.BraceWrapping.AfterFunction ||
(I[1]->First->is(tok::r_brace) && (I[1]->First->is(tok::r_brace) &&
!Style.BraceWrapping.SplitEmptyRecord) !Style.BraceWrapping.SplitEmptyRecord)
? tryMergeSimpleBlock(I, E, Limit) ? tryMergeSimpleBlock(I, E, Limit)
: 0; : 0;
} }
▲ Show 20 Lines • Show All 874 Lines • Show Last 20 Lines

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,058 Lines • ▼ Show 20 Lines verifyFormat("switch (a) {\n"
"}"); "}");
verifyFormat("switch (a) {\n" verifyFormat("switch (a) {\n"
"case some_namespace::\n" "case some_namespace::\n"
" some_constant:\n" " some_constant:\n"
" return;\n" " return;\n"
"}", "}",
getLLVMStyleWithColumns(34)); getLLVMStyleWithColumns(34));
FormatStyle Style = getLLVMStyle();
Style.IndentCaseLabels = true;
Style.AllowShortBlocksOnASingleLine = false;
Style.BreakBeforeBraces = FormatStyle::BS_Custom;
Style.BraceWrapping.AfterControlStatement = true;
EXPECT_EQ("switch (n)\n"
"{\n"
" case 0:\n"
" {\n"
" return false;\n"
" }\n"
" default:\n"
" {\n"
" return true;\n"
" }\n"
"}",
format("switch (n) {\n"
" case 0: {\n"
" return false;\n"
" }\n"
" default: {\n"
" return true;\n"
" }\n"
"}",
Style));
} }
TEST_F(FormatTest, CaseRanges) { TEST_F(FormatTest, CaseRanges) {
verifyFormat("switch (x) {\n" verifyFormat("switch (x) {\n"
"case 'A' ... 'Z':\n" "case 'A' ... 'Z':\n"
"case 1 ... 5:\n" "case 1 ... 5:\n"
"case a ... b:\n" "case a ... b:\n"
" break;\n" " break;\n"
▲ Show 20 Lines • Show All 11,486 Lines • Show Last 20 Lines