Skip to content

Commit 2925cbd

Browse files
authored
Revert "[Misc] Update clang-format." (#7322)
1 parent afcd8ff commit 2925cbd

File tree

1 file changed

+35
-89
lines changed

1 file changed

+35
-89
lines changed

.clang-format

+35-89
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,21 @@ Language: Cpp
44
AccessModifierOffset: -1
55
AlignAfterOpenBracket: AlwaysBreak
66
AlignArrayOfStructures: None
7-
AlignConsecutiveAssignments:
8-
Enabled: false
9-
AcrossEmptyLines: false
10-
AcrossComments: false
11-
AlignCompound: false
12-
AlignFunctionPointers: false
13-
PadOperators: true
14-
AlignConsecutiveBitFields:
15-
Enabled: false
16-
AcrossEmptyLines: false
17-
AcrossComments: false
18-
AlignCompound: false
19-
AlignFunctionPointers: false
20-
PadOperators: false
21-
AlignConsecutiveDeclarations:
22-
Enabled: false
23-
AcrossEmptyLines: false
24-
AcrossComments: false
25-
AlignCompound: false
26-
AlignFunctionPointers: false
27-
PadOperators: false
28-
AlignConsecutiveMacros:
29-
Enabled: false
30-
AcrossEmptyLines: false
31-
AcrossComments: false
32-
AlignCompound: false
33-
AlignFunctionPointers: false
34-
PadOperators: false
35-
AlignConsecutiveShortCaseStatements:
36-
Enabled: false
37-
AcrossEmptyLines: false
38-
AcrossComments: false
39-
AlignCaseColons: false
7+
AlignConsecutiveMacros: None
8+
AlignConsecutiveAssignments: None
9+
AlignConsecutiveBitFields: None
10+
AlignConsecutiveDeclarations: None
4011
AlignEscapedNewlines: Left
4112
AlignOperands: Align
42-
AlignTrailingComments:
43-
Kind: Always
44-
OverEmptyLines: 0
13+
AlignTrailingComments: true
4514
AllowAllArgumentsOnNextLine: true
4615
AllowAllParametersOfDeclarationOnNextLine: true
47-
AllowBreakBeforeNoexceptSpecifier: Never
16+
AllowShortEnumsOnASingleLine: true
4817
AllowShortBlocksOnASingleLine: Never
4918
AllowShortCaseLabelsOnASingleLine: false
50-
AllowShortCompoundRequirementOnASingleLine: true
51-
AllowShortEnumsOnASingleLine: true
5219
AllowShortFunctionsOnASingleLine: All
53-
AllowShortIfStatementsOnASingleLine: WithoutElse
5420
AllowShortLambdasOnASingleLine: All
21+
AllowShortIfStatementsOnASingleLine: WithoutElse
5522
AllowShortLoopsOnASingleLine: true
5623
AlwaysBreakAfterDefinitionReturnType: None
5724
AlwaysBreakAfterReturnType: None
@@ -61,18 +28,17 @@ AttributeMacros:
6128
- __capability
6229
BinPackArguments: true
6330
BinPackParameters: true
64-
BitFieldColonSpacing: Both
6531
BraceWrapping:
6632
AfterCaseLabel: false
6733
AfterClass: false
6834
AfterControlStatement: Never
6935
AfterEnum: false
70-
AfterExternBlock: false
7136
AfterFunction: false
7237
AfterNamespace: false
7338
AfterObjCDeclaration: false
7439
AfterStruct: false
7540
AfterUnion: false
41+
AfterExternBlock: false
7642
BeforeCatch: false
7743
BeforeElse: false
7844
BeforeLambdaBody: false
@@ -81,29 +47,33 @@ BraceWrapping:
8147
SplitEmptyFunction: true
8248
SplitEmptyRecord: true
8349
SplitEmptyNamespace: true
84-
BreakAdjacentStringLiterals: true
85-
BreakAfterAttributes: Leave
86-
BreakAfterJavaFieldAnnotations: false
87-
BreakArrays: true
8850
BreakBeforeBinaryOperators: None
89-
BreakBeforeConceptDeclarations: Always
51+
BreakBeforeConceptDeclarations: true
9052
BreakBeforeBraces: Attach
91-
BreakBeforeInlineASMColon: OnlyMultiline
53+
BreakBeforeInheritanceComma: false
54+
BreakInheritanceList: BeforeColon
9255
BreakBeforeTernaryOperators: true
56+
BreakConstructorInitializersBeforeComma: false
9357
BreakConstructorInitializers: BeforeColon
94-
BreakInheritanceList: BeforeColon
58+
BreakAfterJavaFieldAnnotations: false
9559
BreakStringLiterals: true
9660
ColumnLimit: 80
9761
CommentPragmas: '^ IWYU pragma:'
62+
QualifierAlignment: Leave
9863
CompactNamespaces: false
9964
ConstructorInitializerIndentWidth: 4
10065
ContinuationIndentWidth: 4
10166
Cpp11BracedListStyle: true
67+
DeriveLineEnding: true
10268
DerivePointerAlignment: true
10369
DisableFormat: false
10470
EmptyLineAfterAccessModifier: Never
10571
EmptyLineBeforeAccessModifier: LogicalBlock
10672
ExperimentalAutoDetectBinPacking: false
73+
PackConstructorInitializers: NextLine
74+
BasedOnStyle: ''
75+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
76+
AllowAllConstructorInitializersOnNextLine: true
10777
FixNamespaceComments: true
10878
ForEachMacros:
10979
- foreach
@@ -132,30 +102,19 @@ IncludeCategories:
132102
IncludeIsMainRegex: '([-_](test|unittest))?$'
133103
IncludeIsMainSourceRegex: ''
134104
IndentAccessModifiers: false
135-
IndentCaseBlocks: false
136105
IndentCaseLabels: true
137-
IndentExternBlock: AfterExternBlock
106+
IndentCaseBlocks: false
138107
IndentGotoLabels: true
139108
IndentPPDirectives: None
140-
IndentRequiresClause: true
109+
IndentExternBlock: AfterExternBlock
110+
IndentRequires: false
141111
IndentWidth: 2
142112
IndentWrappedFunctionNames: false
143-
InsertBraces: false
144-
InsertNewlineAtEOF: false
145113
InsertTrailingCommas: None
146-
IntegerLiteralSeparator:
147-
Binary: 0
148-
BinaryMinDigits: 0
149-
Decimal: 0
150-
DecimalMinDigits: 0
151-
Hex: 0
152-
HexMinDigits: 0
153114
JavaScriptQuotes: Leave
154115
JavaScriptWrapImports: true
155116
KeepEmptyLinesAtTheStartOfBlocks: false
156-
KeepEmptyLinesAtEOF: false
157117
LambdaBodyIndentation: Signature
158-
LineEnding: DeriveLF
159118
MacroBlockBegin: ''
160119
MacroBlockEnd: ''
161120
MaxEmptyLinesToKeep: 1
@@ -165,21 +124,18 @@ ObjCBlockIndentWidth: 2
165124
ObjCBreakBeforeNestedBlockParam: true
166125
ObjCSpaceAfterProperty: false
167126
ObjCSpaceBeforeProtocolList: true
168-
PackConstructorInitializers: NextLine
169127
PenaltyBreakAssignment: 2
170128
PenaltyBreakBeforeFirstCallParameter: 1
171129
PenaltyBreakComment: 300
172130
PenaltyBreakFirstLessLess: 120
173131
PenaltyBreakOpenParenthesis: 0
174-
PenaltyBreakScopeResolution: 500
175132
PenaltyBreakString: 1000
176133
PenaltyBreakTemplateDeclaration: 10
177134
PenaltyExcessCharacter: 1000000
178-
PenaltyIndentedWhitespace: 0
179135
PenaltyReturnTypeOnItsOwnLine: 200
136+
PenaltyIndentedWhitespace: 0
180137
PointerAlignment: Left
181138
PPIndentWidth: -1
182-
QualifierAlignment: Leave
183139
RawStringFormats:
184140
- Language: Cpp
185141
Delimiters:
@@ -213,26 +169,19 @@ RawStringFormats:
213169
ReferenceAlignment: Pointer
214170
ReflowComments: true
215171
RemoveBracesLLVM: false
216-
RemoveParentheses: Leave
217-
RemoveSemicolon: false
218-
RequiresClausePosition: OwnLine
219-
RequiresExpressionIndentation: OuterScope
220172
SeparateDefinitionBlocks: Leave
221173
ShortNamespaceLines: 1
222-
SkipMacroDefinitionBody: false
223174
SortIncludes: CaseSensitive
224175
SortJavaStaticImport: Before
225-
SortUsingDeclarations: LexicographicNumeric
176+
SortUsingDeclarations: true
226177
SpaceAfterCStyleCast: false
227178
SpaceAfterLogicalNot: false
228179
SpaceAfterTemplateKeyword: true
229-
SpaceAroundPointerQualifiers: Default
230180
SpaceBeforeAssignmentOperators: true
231181
SpaceBeforeCaseColon: false
232182
SpaceBeforeCpp11BracedList: false
233183
SpaceBeforeCtorInitializerColon: true
234184
SpaceBeforeInheritanceColon: true
235-
SpaceBeforeJsonColon: false
236185
SpaceBeforeParens: ControlStatements
237186
SpaceBeforeParensOptions:
238187
AfterControlStatements: true
@@ -241,40 +190,37 @@ SpaceBeforeParensOptions:
241190
AfterFunctionDeclarationName: false
242191
AfterIfMacros: true
243192
AfterOverloadedOperator: false
244-
AfterPlacementOperator: true
245-
AfterRequiresInClause: false
246-
AfterRequiresInExpression: false
247193
BeforeNonEmptyParentheses: false
194+
SpaceAroundPointerQualifiers: Default
248195
SpaceBeforeRangeBasedForLoopColon: true
249-
SpaceBeforeSquareBrackets: false
250196
SpaceInEmptyBlock: false
197+
SpaceInEmptyParentheses: false
251198
SpacesBeforeTrailingComments: 2
252199
SpacesInAngles: Never
200+
SpacesInConditionalStatement: false
253201
SpacesInContainerLiterals: true
202+
SpacesInCStyleCastParentheses: false
254203
SpacesInLineCommentPrefix:
255204
Minimum: 1
256205
Maximum: -1
257-
SpacesInParens: Never
258-
SpacesInParensOptions:
259-
InCStyleCasts: false
260-
InConditionalStatements: false
261-
InEmptyParentheses: false
262-
Other: false
206+
SpacesInParentheses: false
263207
SpacesInSquareBrackets: false
208+
SpaceBeforeSquareBrackets: false
209+
BitFieldColonSpacing: Both
264210
Standard: Auto
265211
StatementAttributeLikeMacros:
266212
- Q_EMIT
267213
StatementMacros:
268214
- Q_UNUSED
269215
- QT_REQUIRE_VERSION
270216
TabWidth: 8
217+
UseCRLF: false
271218
UseTab: Never
272-
VerilogBreakBetweenInstancePorts: true
273219
WhitespaceSensitiveMacros:
220+
- STRINGIZE
221+
- PP_STRINGIZE
274222
- BOOST_PP_STRINGIZE
275-
- CF_SWIFT_NAME
276223
- NS_SWIFT_NAME
277-
- PP_STRINGIZE
278-
- STRINGIZE
224+
- CF_SWIFT_NAME
279225
...
280226

0 commit comments

Comments
 (0)