Skip to content

Commit 7c1b110

Browse files
committed
Fix wrong clang formatting
1 parent b268fbb commit 7c1b110

File tree

2 files changed

+52
-42
lines changed

2 files changed

+52
-42
lines changed

.clang-format

+42-42
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
Language: Cpp
2+
Language: Cpp
33
# BasedOnStyle: LLVM
44
AccessModifierOffset: -2
55
AlignAfterOpenBracket: Align
@@ -16,7 +16,8 @@ AlignConsecutiveBitFields:
1616
AlignConsecutiveDeclarations: None
1717
AlignEscapedNewlines: Right
1818
AlignOperands: Align
19-
InsertBraces: true # Control statements must have curly brackets
19+
SortIncludes: false
20+
InsertBraces: true # Control statements must have curly brackets
2021
AlignTrailingComments: true
2122
AllowAllArgumentsOnNextLine: true
2223
AllowAllParametersOfDeclarationOnNextLine: true
@@ -36,21 +37,21 @@ AttributeMacros:
3637
BinPackArguments: true
3738
BinPackParameters: true
3839
BraceWrapping:
39-
AfterCaseLabel: false
40-
AfterClass: false
40+
AfterCaseLabel: false
41+
AfterClass: false
4142
AfterControlStatement: Never
42-
AfterEnum: false
43-
AfterFunction: false
44-
AfterNamespace: false
43+
AfterEnum: false
44+
AfterFunction: false
45+
AfterNamespace: false
4546
AfterObjCDeclaration: false
46-
AfterStruct: false
47-
AfterUnion: false
47+
AfterStruct: false
48+
AfterUnion: false
4849
AfterExternBlock: false
49-
BeforeCatch: false
50-
BeforeElse: false
50+
BeforeCatch: false
51+
BeforeElse: false
5152
BeforeLambdaBody: false
52-
BeforeWhile: false
53-
IndentBraces: false
53+
BeforeWhile: false
54+
IndentBraces: false
5455
SplitEmptyFunction: true
5556
SplitEmptyRecord: true
5657
SplitEmptyNamespace: true
@@ -64,21 +65,21 @@ BreakConstructorInitializersBeforeComma: false
6465
BreakConstructorInitializers: BeforeColon
6566
BreakAfterJavaFieldAnnotations: false
6667
BreakStringLiterals: true
67-
ColumnLimit: 120
68-
CommentPragmas: '^ IWYU pragma:'
68+
ColumnLimit: 120
69+
CommentPragmas: "^ IWYU pragma:"
6970
QualifierAlignment: Leave
7071
CompactNamespaces: false
7172
ConstructorInitializerIndentWidth: 4
7273
ContinuationIndentWidth: 4
7374
Cpp11BracedListStyle: true
7475
DeriveLineEnding: true
7576
DerivePointerAlignment: false
76-
DisableFormat: false
77+
DisableFormat: false
7778
EmptyLineAfterAccessModifier: Never
7879
EmptyLineBeforeAccessModifier: LogicalBlock
7980
ExperimentalAutoDetectBinPacking: false
8081
PackConstructorInitializers: BinPack
81-
BasedOnStyle: ''
82+
BasedOnStyle: ""
8283
ConstructorInitializerAllOnOneLineOrOnePerLine: false
8384
AllowAllConstructorInitializersOnNextLine: true
8485
FixNamespaceComments: true
@@ -88,32 +89,32 @@ ForEachMacros:
8889
- BOOST_FOREACH
8990
IfMacros:
9091
- KJ_IF_MAYBE
91-
IncludeBlocks: Preserve
92+
IncludeBlocks: Preserve
9293
IncludeCategories:
93-
- Regex: '^<(.*)>'
94-
Priority: 0
95-
- Regex: '^"(.*)"'
96-
Priority: 1
97-
- Regex: '(.*)'
98-
Priority: 2
99-
IncludeIsMainRegex: '(Test)?$'
100-
IncludeIsMainSourceRegex: ''
94+
- Regex: "^<(.*)>"
95+
Priority: 0
96+
- Regex: '^"(.*)"'
97+
Priority: 1
98+
- Regex: "(.*)"
99+
Priority: 2
100+
IncludeIsMainRegex: "(Test)?$"
101+
IncludeIsMainSourceRegex: ""
101102
IndentAccessModifiers: false
102103
IndentCaseLabels: true
103104
IndentCaseBlocks: false
104105
IndentGotoLabels: true
105106
IndentPPDirectives: None
106107
IndentExternBlock: AfterExternBlock
107-
IndentRequires: true
108-
IndentWidth: 4
108+
IndentRequires: true
109+
IndentWidth: 4
109110
IndentWrappedFunctionNames: false
110111
InsertTrailingCommas: None
111112
JavaScriptQuotes: Leave
112113
JavaScriptWrapImports: true
113114
KeepEmptyLinesAtTheStartOfBlocks: true
114115
LambdaBodyIndentation: Signature
115-
MacroBlockBegin: ''
116-
MacroBlockEnd: ''
116+
MacroBlockBegin: ""
117+
MacroBlockEnd: ""
117118
MaxEmptyLinesToKeep: 1
118119
NamespaceIndentation: None
119120
ObjCBinPackProtocolList: Auto
@@ -132,13 +133,12 @@ PenaltyExcessCharacter: 1000000
132133
PenaltyReturnTypeOnItsOwnLine: 60
133134
PenaltyIndentedWhitespace: 0
134135
PointerAlignment: Left
135-
PPIndentWidth: -1
136+
PPIndentWidth: -1
136137
ReferenceAlignment: Pointer
137-
ReflowComments: false
138+
ReflowComments: false
138139
RemoveBracesLLVM: false
139140
SeparateDefinitionBlocks: Always
140141
ShortNamespaceLines: 1
141-
SortIncludes: CaseSensitive
142142
SortJavaStaticImport: Before
143143
SortUsingDeclarations: true
144144
SpaceAfterCStyleCast: false
@@ -152,34 +152,34 @@ SpaceBeforeParensOptions:
152152
AfterForeachMacros: true
153153
AfterFunctionDefinitionName: false
154154
AfterFunctionDeclarationName: false
155-
AfterIfMacros: true
155+
AfterIfMacros: true
156156
AfterOverloadedOperator: false
157157
BeforeNonEmptyParentheses: false
158158
SpaceAroundPointerQualifiers: Default
159159
SpaceBeforeRangeBasedForLoopColon: true
160160
SpaceInEmptyBlock: false
161161
SpaceInEmptyParentheses: false
162162
SpacesBeforeTrailingComments: 1
163-
SpacesInAngles: Never
163+
SpacesInAngles: Never
164164
SpacesInConditionalStatement: false
165165
SpacesInContainerLiterals: true
166166
SpacesInCStyleCastParentheses: false
167167
SpacesInLineCommentPrefix:
168-
Minimum: 1
169-
Maximum: -1
168+
Minimum: 1
169+
Maximum: -1
170170
SpacesInParentheses: false
171171
SpacesInSquareBrackets: false
172172
SpaceBeforeSquareBrackets: false
173173
BitFieldColonSpacing: Both
174-
Standard: Latest
174+
Standard: Latest
175175
StatementAttributeLikeMacros:
176176
- Q_EMIT
177177
StatementMacros:
178178
- Q_UNUSED
179179
- QT_REQUIRE_VERSION
180-
TabWidth: 8
181-
UseCRLF: false
182-
UseTab: Never
180+
TabWidth: 8
181+
UseCRLF: false
182+
UseTab: Never
183183
WhitespaceSensitiveMacros:
184184
- STRINGIZE
185185
- PP_STRINGIZE
@@ -189,5 +189,5 @@ WhitespaceSensitiveMacros:
189189
SpaceBeforeCpp11BracedList: false
190190
SpaceBeforeCtorInitializerColon: true
191191
SpaceBeforeInheritanceColon: true
192-
...
192+
---
193193

CMakePresets.json

+10
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,15 @@
2626
"CMAKE_BUILD_TYPE": "Debug"
2727
}
2828
}
29+
],
30+
"buildPresets": [
31+
{
32+
"name": "Win32-Debug",
33+
"configurePreset": "Win32-Debug"
34+
},
35+
{
36+
"name": "Win64-Debug",
37+
"configurePreset": "Win64-Debug"
38+
}
2939
]
3040
}

0 commit comments

Comments
 (0)