Skip to content

Commit 6f9c20c

Browse files
frozenbugsUbuntu
and
Ubuntu
authored
Update clang (#7319)
Co-authored-by: Ubuntu <[email protected]>
1 parent 2925cbd commit 6f9c20c

File tree

1 file changed

+46
-35
lines changed

1 file changed

+46
-35
lines changed

.clang-format

+46-35
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,40 @@ Language: Cpp
44
AccessModifierOffset: -1
55
AlignAfterOpenBracket: AlwaysBreak
66
AlignArrayOfStructures: None
7-
AlignConsecutiveMacros: None
8-
AlignConsecutiveAssignments: None
9-
AlignConsecutiveBitFields: None
10-
AlignConsecutiveDeclarations: None
7+
AlignConsecutiveAssignments:
8+
Enabled: false
9+
AcrossEmptyLines: false
10+
AcrossComments: false
11+
AlignCompound: false
12+
PadOperators: true
13+
AlignConsecutiveBitFields:
14+
Enabled: false
15+
AcrossEmptyLines: false
16+
AcrossComments: false
17+
AlignCompound: false
18+
PadOperators: false
19+
AlignConsecutiveDeclarations:
20+
Enabled: false
21+
AcrossEmptyLines: false
22+
AcrossComments: false
23+
AlignCompound: false
24+
PadOperators: false
25+
AlignConsecutiveMacros:
26+
Enabled: false
27+
AcrossEmptyLines: false
28+
AcrossComments: false
29+
AlignCompound: false
30+
PadOperators: false
1131
AlignEscapedNewlines: Left
1232
AlignOperands: Align
13-
AlignTrailingComments: true
1433
AllowAllArgumentsOnNextLine: true
1534
AllowAllParametersOfDeclarationOnNextLine: true
16-
AllowShortEnumsOnASingleLine: true
1735
AllowShortBlocksOnASingleLine: Never
1836
AllowShortCaseLabelsOnASingleLine: false
37+
AllowShortEnumsOnASingleLine: true
1938
AllowShortFunctionsOnASingleLine: All
20-
AllowShortLambdasOnASingleLine: All
2139
AllowShortIfStatementsOnASingleLine: WithoutElse
40+
AllowShortLambdasOnASingleLine: All
2241
AllowShortLoopsOnASingleLine: true
2342
AlwaysBreakAfterDefinitionReturnType: None
2443
AlwaysBreakAfterReturnType: None
@@ -28,17 +47,18 @@ AttributeMacros:
2847
- __capability
2948
BinPackArguments: true
3049
BinPackParameters: true
50+
BitFieldColonSpacing: Both
3151
BraceWrapping:
3252
AfterCaseLabel: false
3353
AfterClass: false
3454
AfterControlStatement: Never
3555
AfterEnum: false
56+
AfterExternBlock: false
3657
AfterFunction: false
3758
AfterNamespace: false
3859
AfterObjCDeclaration: false
3960
AfterStruct: false
4061
AfterUnion: false
41-
AfterExternBlock: false
4262
BeforeCatch: false
4363
BeforeElse: false
4464
BeforeLambdaBody: false
@@ -47,33 +67,25 @@ BraceWrapping:
4767
SplitEmptyFunction: true
4868
SplitEmptyRecord: true
4969
SplitEmptyNamespace: true
70+
BreakAfterJavaFieldAnnotations: false
5071
BreakBeforeBinaryOperators: None
51-
BreakBeforeConceptDeclarations: true
72+
BreakBeforeConceptDeclarations: Always
5273
BreakBeforeBraces: Attach
53-
BreakBeforeInheritanceComma: false
54-
BreakInheritanceList: BeforeColon
5574
BreakBeforeTernaryOperators: true
56-
BreakConstructorInitializersBeforeComma: false
5775
BreakConstructorInitializers: BeforeColon
58-
BreakAfterJavaFieldAnnotations: false
76+
BreakInheritanceList: BeforeColon
5977
BreakStringLiterals: true
6078
ColumnLimit: 80
6179
CommentPragmas: '^ IWYU pragma:'
62-
QualifierAlignment: Leave
6380
CompactNamespaces: false
6481
ConstructorInitializerIndentWidth: 4
6582
ContinuationIndentWidth: 4
6683
Cpp11BracedListStyle: true
67-
DeriveLineEnding: true
6884
DerivePointerAlignment: true
6985
DisableFormat: false
7086
EmptyLineAfterAccessModifier: Never
7187
EmptyLineBeforeAccessModifier: LogicalBlock
7288
ExperimentalAutoDetectBinPacking: false
73-
PackConstructorInitializers: NextLine
74-
BasedOnStyle: ''
75-
ConstructorInitializerAllOnOneLineOrOnePerLine: false
76-
AllowAllConstructorInitializersOnNextLine: true
7789
FixNamespaceComments: true
7890
ForEachMacros:
7991
- foreach
@@ -102,14 +114,15 @@ IncludeCategories:
102114
IncludeIsMainRegex: '([-_](test|unittest))?$'
103115
IncludeIsMainSourceRegex: ''
104116
IndentAccessModifiers: false
105-
IndentCaseLabels: true
106117
IndentCaseBlocks: false
118+
IndentCaseLabels: true
119+
IndentExternBlock: AfterExternBlock
107120
IndentGotoLabels: true
108121
IndentPPDirectives: None
109-
IndentExternBlock: AfterExternBlock
110-
IndentRequires: false
122+
IndentRequiresClause: true
111123
IndentWidth: 2
112124
IndentWrappedFunctionNames: false
125+
InsertBraces: false
113126
InsertTrailingCommas: None
114127
JavaScriptQuotes: Leave
115128
JavaScriptWrapImports: true
@@ -124,6 +137,7 @@ ObjCBlockIndentWidth: 2
124137
ObjCBreakBeforeNestedBlockParam: true
125138
ObjCSpaceAfterProperty: false
126139
ObjCSpaceBeforeProtocolList: true
140+
PackConstructorInitializers: NextLine
127141
PenaltyBreakAssignment: 2
128142
PenaltyBreakBeforeFirstCallParameter: 1
129143
PenaltyBreakComment: 300
@@ -132,10 +146,11 @@ PenaltyBreakOpenParenthesis: 0
132146
PenaltyBreakString: 1000
133147
PenaltyBreakTemplateDeclaration: 10
134148
PenaltyExcessCharacter: 1000000
135-
PenaltyReturnTypeOnItsOwnLine: 200
136149
PenaltyIndentedWhitespace: 0
150+
PenaltyReturnTypeOnItsOwnLine: 200
137151
PointerAlignment: Left
138152
PPIndentWidth: -1
153+
QualifierAlignment: Leave
139154
RawStringFormats:
140155
- Language: Cpp
141156
Delimiters:
@@ -169,14 +184,15 @@ RawStringFormats:
169184
ReferenceAlignment: Pointer
170185
ReflowComments: true
171186
RemoveBracesLLVM: false
187+
RequiresClausePosition: OwnLine
172188
SeparateDefinitionBlocks: Leave
173189
ShortNamespaceLines: 1
174190
SortIncludes: CaseSensitive
175191
SortJavaStaticImport: Before
176-
SortUsingDeclarations: true
177192
SpaceAfterCStyleCast: false
178193
SpaceAfterLogicalNot: false
179194
SpaceAfterTemplateKeyword: true
195+
SpaceAroundPointerQualifiers: Default
180196
SpaceBeforeAssignmentOperators: true
181197
SpaceBeforeCaseColon: false
182198
SpaceBeforeCpp11BracedList: false
@@ -190,37 +206,32 @@ SpaceBeforeParensOptions:
190206
AfterFunctionDeclarationName: false
191207
AfterIfMacros: true
192208
AfterOverloadedOperator: false
209+
AfterRequiresInClause: false
210+
AfterRequiresInExpression: false
193211
BeforeNonEmptyParentheses: false
194-
SpaceAroundPointerQualifiers: Default
195212
SpaceBeforeRangeBasedForLoopColon: true
213+
SpaceBeforeSquareBrackets: false
196214
SpaceInEmptyBlock: false
197-
SpaceInEmptyParentheses: false
198215
SpacesBeforeTrailingComments: 2
199216
SpacesInAngles: Never
200-
SpacesInConditionalStatement: false
201217
SpacesInContainerLiterals: true
202-
SpacesInCStyleCastParentheses: false
203218
SpacesInLineCommentPrefix:
204219
Minimum: 1
205220
Maximum: -1
206-
SpacesInParentheses: false
207221
SpacesInSquareBrackets: false
208-
SpaceBeforeSquareBrackets: false
209-
BitFieldColonSpacing: Both
210222
Standard: Auto
211223
StatementAttributeLikeMacros:
212224
- Q_EMIT
213225
StatementMacros:
214226
- Q_UNUSED
215227
- QT_REQUIRE_VERSION
216228
TabWidth: 8
217-
UseCRLF: false
218229
UseTab: Never
219230
WhitespaceSensitiveMacros:
220-
- STRINGIZE
221-
- PP_STRINGIZE
222231
- BOOST_PP_STRINGIZE
223-
- NS_SWIFT_NAME
224232
- CF_SWIFT_NAME
233+
- NS_SWIFT_NAME
234+
- PP_STRINGIZE
235+
- STRINGIZE
225236
...
226237

0 commit comments

Comments
 (0)