This is an archive of the discontinued LLVM Phabricator instance.

Differential D65631

[clang-format] Fix a bug that doesn't break braces before unions for Allman
ClosedPublic

Authored by owenpan on Aug 1 2019, 9:17 PM.

Details

Reviewers
None
Commits
rL367648: [clang-format] Fix a bug that doesn't break braces before unions for Allman
rC367648: [clang-format] Fix a bug that doesn't break braces before unions for Allman
Summary

Fixes PR42155

Diff Detail

Repository
rL LLVM

Event Timeline

owenpan created this revision.Aug 1 2019, 9:17 PM
Herald added a subscriber: cfe-commits. · View Herald TranscriptAug 1 2019, 9:17 PM
This revision was not accepted when it landed; it landed in state Needs Review.Aug 1 2019, 9:32 PM
Closed by commit rL367648: [clang-format] Fix a bug that doesn't break braces before unions for Allman (authored by owenpan). · Explain Why
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptAug 1 2019, 9:32 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
cfe/
trunk/
lib/
Format/
1 line
unittests/
Format/
3 lines

Diff 212966

cfe/trunk/lib/Format/Format.cpp

Show First 20 Lines • Show All 634 Lines • ▼ Show 20 Lines case FormatStyle::BS_Allman:
Expanded.BraceWrapping.AfterCaseLabel = true; Expanded.BraceWrapping.AfterCaseLabel = true;
Expanded.BraceWrapping.AfterClass = true; Expanded.BraceWrapping.AfterClass = true;
Expanded.BraceWrapping.AfterControlStatement = true; Expanded.BraceWrapping.AfterControlStatement = true;
Expanded.BraceWrapping.AfterEnum = true; Expanded.BraceWrapping.AfterEnum = true;
Expanded.BraceWrapping.AfterFunction = true; Expanded.BraceWrapping.AfterFunction = true;
Expanded.BraceWrapping.AfterNamespace = true; Expanded.BraceWrapping.AfterNamespace = true;
Expanded.BraceWrapping.AfterObjCDeclaration = true; Expanded.BraceWrapping.AfterObjCDeclaration = true;
Expanded.BraceWrapping.AfterStruct = true; Expanded.BraceWrapping.AfterStruct = true;
Expanded.BraceWrapping.AfterUnion = true;
Expanded.BraceWrapping.AfterExternBlock = true; Expanded.BraceWrapping.AfterExternBlock = true;
Expanded.BraceWrapping.BeforeCatch = true; Expanded.BraceWrapping.BeforeCatch = true;
Expanded.BraceWrapping.BeforeElse = true; Expanded.BraceWrapping.BeforeElse = true;
break; break;
case FormatStyle::BS_GNU: case FormatStyle::BS_GNU:
Expanded.BraceWrapping = {true, true, true, true, true, true, true, true, Expanded.BraceWrapping = {true, true, true, true, true, true, true, true,
true, true, true, true, true, true, true, true}; true, true, true, true, true, true, true, true};
break; break;
▲ Show 20 Lines • Show All 1,879 Lines • Show Last 20 Lines

cfe/trunk/unittests/Format/FormatTest.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 11,080 Lines • ▼ Show 20 Lines verifyFormat("namespace a\n"
" }\n" " }\n"
" }\n" " }\n"
" void g() { return; }\n" " void g() { return; }\n"
"};\n" "};\n"
"struct B\n" "struct B\n"
"{\n" "{\n"
" int x;\n" " int x;\n"
"};\n" "};\n"
"union C\n"
"{\n"
"};\n"
"} // namespace a", "} // namespace a",
AllmanBraceStyle); AllmanBraceStyle);
verifyFormat("void f()\n" verifyFormat("void f()\n"
"{\n" "{\n"
" if (true)\n" " if (true)\n"
" {\n" " {\n"
" a();\n" " a();\n"
▲ Show 20 Lines • Show All 2,822 Lines • Show Last 20 Lines