Skip to content

Commit 3c78eb1

Browse files
committed
Style: Downgrade .clang-format arguments to 17.x
1 parent bbc5469 commit 3c78eb1

File tree

2 files changed

+9
-49
lines changed

2 files changed

+9
-49
lines changed

.clang-format

+8-45
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Commented out parameters are those with the same value as base LLVM style.
22
# We can uncomment them if we want to change their value, or enforce the
3-
# chosen value in case the base style changes (last sync: Clang 19.1.0).
3+
# chosen value in case the base style changes (last sync: Clang 17.0.6).
44
BasedOnStyle: LLVM
55
AccessModifierOffset: -4
66
AlignAfterOpenBracket: DontAlign
@@ -10,74 +10,48 @@ AlignAfterOpenBracket: DontAlign
1010
# AcrossEmptyLines: false
1111
# AcrossComments: false
1212
# AlignCompound: false
13-
# AlignFunctionPointers: false
1413
# PadOperators: true
1514
# AlignConsecutiveBitFields:
1615
# Enabled: false
1716
# AcrossEmptyLines: false
1817
# AcrossComments: false
1918
# AlignCompound: false
20-
# AlignFunctionPointers: false
2119
# PadOperators: false
2220
# AlignConsecutiveDeclarations:
2321
# Enabled: false
2422
# AcrossEmptyLines: false
2523
# AcrossComments: false
2624
# AlignCompound: false
27-
# AlignFunctionPointers: false
2825
# PadOperators: false
2926
# AlignConsecutiveMacros:
3027
# Enabled: false
3128
# AcrossEmptyLines: false
3229
# AcrossComments: false
3330
# AlignCompound: false
34-
# AlignFunctionPointers: false
3531
# PadOperators: false
3632
# AlignConsecutiveShortCaseStatements:
3733
# Enabled: false
3834
# AcrossEmptyLines: false
3935
# AcrossComments: false
40-
# AlignCaseArrows: false
4136
# AlignCaseColons: false
42-
# AlignConsecutiveTableGenBreakingDAGArgColons:
43-
# Enabled: false
44-
# AcrossEmptyLines: false
45-
# AcrossComments: false
46-
# AlignCompound: false
47-
# AlignFunctionPointers: false
48-
# PadOperators: false
49-
# AlignConsecutiveTableGenCondOperatorColons:
50-
# Enabled: false
51-
# AcrossEmptyLines: false
52-
# AcrossComments: false
53-
# AlignCompound: false
54-
# AlignFunctionPointers: false
55-
# PadOperators: false
56-
# AlignConsecutiveTableGenDefinitionColons:
57-
# Enabled: false
58-
# AcrossEmptyLines: false
59-
# AcrossComments: false
60-
# AlignCompound: false
61-
# AlignFunctionPointers: false
62-
# PadOperators: false
6337
# AlignEscapedNewlines: Right
6438
AlignOperands: DontAlign
6539
AlignTrailingComments:
6640
Kind: Never
6741
OverEmptyLines: 0
6842
# AllowAllArgumentsOnNextLine: true
6943
AllowAllParametersOfDeclarationOnNextLine: false
70-
# AllowBreakBeforeNoexceptSpecifier: Never
7144
# AllowShortBlocksOnASingleLine: Never
72-
# AllowShortCaseExpressionOnASingleLine: true
7345
# AllowShortCaseLabelsOnASingleLine: false
74-
# AllowShortCompoundRequirementOnASingleLine: true
7546
# AllowShortEnumsOnASingleLine: true
7647
# AllowShortFunctionsOnASingleLine: All
7748
# AllowShortIfStatementsOnASingleLine: Never
7849
# AllowShortLambdasOnASingleLine: All
7950
# AllowShortLoopsOnASingleLine: false
51+
# AlwaysBreakAfterDefinitionReturnType: None
52+
# AlwaysBreakAfterReturnType: None
8053
# AlwaysBreakBeforeMultilineStrings: false
54+
# AlwaysBreakTemplateDeclarations: MultiLine
8155
# AttributeMacros:
8256
# - __capability
8357
# BinPackArguments: true
@@ -102,21 +76,17 @@ AllowAllParametersOfDeclarationOnNextLine: false
10276
# SplitEmptyFunction: true
10377
# SplitEmptyRecord: true
10478
# SplitEmptyNamespace: true
105-
# BreakAdjacentStringLiterals: true
106-
# BreakAfterAttributes: Leave
79+
# BreakAfterAttributes: Never
10780
# BreakAfterJavaFieldAnnotations: false
108-
# BreakAfterReturnType: None
10981
# BreakArrays: true
11082
# BreakBeforeBinaryOperators: None
11183
# BreakBeforeBraces: Attach
11284
# BreakBeforeConceptDeclarations: Always
11385
# BreakBeforeInlineASMColon: OnlyMultiline
11486
# BreakBeforeTernaryOperators: true
11587
BreakConstructorInitializers: AfterColon
116-
# BreakFunctionDefinitionParameters: false
11788
# BreakInheritanceList: BeforeColon
11889
# BreakStringLiterals: true
119-
# BreakTemplateDeclarations: MultiLine
12090
ColumnLimit: 0
12191
# CommentPragmas: '^ IWYU pragma:'
12292
# CompactNamespaces: false
@@ -174,16 +144,13 @@ JavaImportGroups:
174144
- javax
175145
# JavaScriptQuotes: Leave
176146
# JavaScriptWrapImports: true
177-
KeepEmptyLines:
178-
AtEndOfFile: false
179-
AtStartOfBlock: false
180-
AtStartOfFile: false
147+
# KeepEmptyLinesAtEOF: false
148+
KeepEmptyLinesAtTheStartOfBlocks: false
181149
# LambdaBodyIndentation: Signature
182150
# Language: Cpp
183151
# LineEnding: DeriveLF
184152
# MacroBlockBegin: ''
185153
# MacroBlockEnd: ''
186-
# MainIncludeChar: Quote
187154
# MaxEmptyLinesToKeep: 1
188155
# NamespaceIndentation: None
189156
# ObjCBinPackProtocolList: Auto
@@ -198,7 +165,6 @@ PackConstructorInitializers: NextLine
198165
# PenaltyBreakComment: 300
199166
# PenaltyBreakFirstLessLess: 120
200167
# PenaltyBreakOpenParenthesis: 0
201-
# PenaltyBreakScopeResolution: 500
202168
# PenaltyBreakString: 1000
203169
# PenaltyBreakTemplateDeclaration: 10
204170
# PenaltyExcessCharacter: 1000000
@@ -215,7 +181,6 @@ RemoveSemicolon: true
215181
# RequiresExpressionIndentation: OuterScope
216182
# SeparateDefinitionBlocks: Leave
217183
# ShortNamespaceLines: 1
218-
# SkipMacroDefinitionBody: false
219184
# SortIncludes: CaseSensitive
220185
# SortJavaStaticImport: Before
221186
# SortUsingDeclarations: LexicographicNumeric
@@ -229,14 +194,14 @@ RemoveSemicolon: true
229194
# SpaceBeforeCtorInitializerColon: true
230195
# SpaceBeforeInheritanceColon: true
231196
# SpaceBeforeJsonColon: false
197+
# SpaceBeforeParens: ControlStatements
232198
# SpaceBeforeParensOptions:
233199
# AfterControlStatements: true
234200
# AfterForeachMacros: true
235201
# AfterFunctionDeclarationName: false
236202
# AfterFunctionDefinitionName: false
237203
# AfterIfMacros: true
238204
# AfterOverloadedOperator: false
239-
# AfterPlacementOperator: true
240205
# AfterRequiresInClause: false
241206
# AfterRequiresInExpression: false
242207
# BeforeNonEmptyParentheses: false
@@ -251,7 +216,6 @@ SpacesInLineCommentPrefix:
251216
Maximum: -1
252217
# SpacesInParens: Never
253218
# SpacesInParensOptions:
254-
# ExceptDoubleParentheses: false
255219
# InConditionalStatements: false
256220
# InCStyleCasts: false
257221
# InEmptyParentheses: false
@@ -264,7 +228,6 @@ Standard: c++20
264228
# - Q_UNUSED
265229
# - QT_REQUIRE_VERSION
266230
TabWidth: 4
267-
# TableGenBreakInsideDAGArg: DontBreak
268231
UseTab: Always
269232
# VerilogBreakBetweenInstancePorts: true
270233
# WhitespaceSensitiveMacros:

misc/utility/.clang-format-glsl

+1-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ JavaImportGroups:
3030
- com.google
3131
- java
3232
- javax
33-
KeepEmptyLines:
34-
AtEndOfFile: false
35-
AtStartOfBlock: false
36-
AtStartOfFile: false
33+
KeepEmptyLinesAtTheStartOfBlocks: false
3734
ObjCBlockIndentWidth: 4
3835
PackConstructorInitializers: NextLine
3936
RemoveSemicolon: false # Differs from base .clang-format

0 commit comments

Comments
 (0)