Skip to content

Commit 316e259

Browse files
[clang-format][NFC] More sorting in getLLVMStyle()
Seems I've missed that. Amends 41a09a0
1 parent f6b2529 commit 316e259

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

clang/lib/Format/Format.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,14 +1269,9 @@ FormatStyle getLLVMStyle(FormatStyle::LanguageKind Language) {
12691269
LLVMStyle.AlwaysBreakBeforeMultilineStrings = false;
12701270
LLVMStyle.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_MultiLine;
12711271
LLVMStyle.AttributeMacros.push_back("__capability");
1272+
LLVMStyle.BitFieldColonSpacing = FormatStyle::BFCS_Both;
12721273
LLVMStyle.BinPackArguments = true;
12731274
LLVMStyle.BinPackParameters = true;
1274-
LLVMStyle.BreakArrays = true;
1275-
LLVMStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_None;
1276-
LLVMStyle.BreakBeforeConceptDeclarations = FormatStyle::BBCDS_Always;
1277-
LLVMStyle.BreakBeforeInlineASMColon = FormatStyle::BBIAS_OnlyMultiline;
1278-
LLVMStyle.BreakBeforeTernaryOperators = true;
1279-
LLVMStyle.BreakBeforeBraces = FormatStyle::BS_Attach;
12801275
LLVMStyle.BraceWrapping = {/*AfterCaseLabel=*/false,
12811276
/*AfterClass=*/false,
12821277
/*AfterControlStatement=*/FormatStyle::BWACS_Never,
@@ -1295,8 +1290,13 @@ FormatStyle getLLVMStyle(FormatStyle::LanguageKind Language) {
12951290
/*SplitEmptyFunction=*/true,
12961291
/*SplitEmptyRecord=*/true,
12971292
/*SplitEmptyNamespace=*/true};
1298-
LLVMStyle.BitFieldColonSpacing = FormatStyle::BFCS_Both;
12991293
LLVMStyle.BreakAfterJavaFieldAnnotations = false;
1294+
LLVMStyle.BreakArrays = true;
1295+
LLVMStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_None;
1296+
LLVMStyle.BreakBeforeBraces = FormatStyle::BS_Attach;
1297+
LLVMStyle.BreakBeforeConceptDeclarations = FormatStyle::BBCDS_Always;
1298+
LLVMStyle.BreakBeforeInlineASMColon = FormatStyle::BBIAS_OnlyMultiline;
1299+
LLVMStyle.BreakBeforeTernaryOperators = true;
13001300
LLVMStyle.BreakConstructorInitializers = FormatStyle::BCIS_BeforeColon;
13011301
LLVMStyle.BreakInheritanceList = FormatStyle::BILS_BeforeColon;
13021302
LLVMStyle.BreakStringLiterals = true;

0 commit comments

Comments
 (0)