Skip to content

Commit 64cdf08

Browse files
committed
CI: Various version bumps; sync with main repo
1 parent 08fd033 commit 64cdf08

File tree

13 files changed

+268
-227
lines changed

13 files changed

+268
-227
lines changed

.clang-format

Lines changed: 137 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,167 @@
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 14.0).
4-
---
5-
### General config, applies to all languages ###
6-
BasedOnStyle: LLVM
3+
# chosen value in case the base style changes (last sync: Clang 17.0.6).
4+
BasedOnStyle: LLVM
75
AccessModifierOffset: -4
86
AlignAfterOpenBracket: DontAlign
97
# AlignArrayOfStructures: None
10-
# AlignConsecutiveMacros: None
11-
# AlignConsecutiveAssignments: None
12-
# AlignConsecutiveBitFields: None
13-
# AlignConsecutiveDeclarations: None
8+
# AlignConsecutiveAssignments:
9+
# Enabled: false
10+
# AcrossEmptyLines: false
11+
# AcrossComments: false
12+
# AlignCompound: false
13+
# PadOperators: true
14+
# AlignConsecutiveBitFields:
15+
# Enabled: false
16+
# AcrossEmptyLines: false
17+
# AcrossComments: false
18+
# AlignCompound: false
19+
# PadOperators: false
20+
# AlignConsecutiveDeclarations:
21+
# Enabled: false
22+
# AcrossEmptyLines: false
23+
# AcrossComments: false
24+
# AlignCompound: false
25+
# PadOperators: false
26+
# AlignConsecutiveMacros:
27+
# Enabled: false
28+
# AcrossEmptyLines: false
29+
# AcrossComments: false
30+
# AlignCompound: false
31+
# PadOperators: false
32+
# AlignConsecutiveShortCaseStatements:
33+
# Enabled: false
34+
# AcrossEmptyLines: false
35+
# AcrossComments: false
36+
# AlignCaseColons: false
1437
# AlignEscapedNewlines: Right
15-
AlignOperands: DontAlign
16-
AlignTrailingComments: false
38+
AlignOperands: DontAlign
39+
AlignTrailingComments:
40+
Kind: Never
41+
OverEmptyLines: 0
1742
# AllowAllArgumentsOnNextLine: true
1843
AllowAllParametersOfDeclarationOnNextLine: false
19-
# AllowShortEnumsOnASingleLine: true
2044
# AllowShortBlocksOnASingleLine: Never
2145
# AllowShortCaseLabelsOnASingleLine: false
22-
# AllowShortFunctionsOnASingleLine: All
23-
# AllowShortLambdasOnASingleLine: All
46+
# AllowShortEnumsOnASingleLine: true
47+
AllowShortFunctionsOnASingleLine: Inline
2448
# AllowShortIfStatementsOnASingleLine: Never
49+
# AllowShortLambdasOnASingleLine: All
2550
# AllowShortLoopsOnASingleLine: false
2651
# AlwaysBreakAfterDefinitionReturnType: None
2752
# AlwaysBreakAfterReturnType: None
2853
# AlwaysBreakBeforeMultilineStrings: false
2954
# AlwaysBreakTemplateDeclarations: MultiLine
30-
# AttributeMacros:
31-
# - __capability
55+
AttributeMacros:
56+
- _ALWAYS_INLINE_
57+
- _FORCE_INLINE_
58+
- _NO_INLINE_
3259
# BinPackArguments: true
3360
# BinPackParameters: true
61+
# BitFieldColonSpacing: Both
3462
# BraceWrapping:
35-
# AfterCaseLabel: false
36-
# AfterClass: false
63+
# AfterCaseLabel: false
64+
# AfterClass: false
3765
# AfterControlStatement: Never
38-
# AfterEnum: false
39-
# AfterFunction: false
40-
# AfterNamespace: false
66+
# AfterEnum: false
67+
# AfterFunction: false
68+
# AfterNamespace: false
4169
# AfterObjCDeclaration: false
42-
# AfterStruct: false
43-
# AfterUnion: false
70+
# AfterStruct: false
71+
# AfterUnion: false
4472
# AfterExternBlock: false
45-
# BeforeCatch: false
46-
# BeforeElse: false
73+
# BeforeCatch: false
74+
# BeforeElse: false
4775
# BeforeLambdaBody: false
48-
# BeforeWhile: false
49-
# IndentBraces: false
76+
# BeforeWhile: false
77+
# IndentBraces: false
5078
# SplitEmptyFunction: true
5179
# SplitEmptyRecord: true
5280
# SplitEmptyNamespace: true
81+
# BreakAfterAttributes: Never
82+
# BreakAfterJavaFieldAnnotations: false
83+
# BreakArrays: true
5384
# BreakBeforeBinaryOperators: None
54-
# BreakBeforeConceptDeclarations: true
5585
# BreakBeforeBraces: Attach
56-
# BreakBeforeInheritanceComma: false
57-
# BreakInheritanceList: BeforeColon
86+
# BreakBeforeConceptDeclarations: Always
87+
# BreakBeforeInlineASMColon: OnlyMultiline
5888
# BreakBeforeTernaryOperators: true
59-
# BreakConstructorInitializersBeforeComma: false
6089
BreakConstructorInitializers: AfterColon
90+
# BreakInheritanceList: BeforeColon
6191
# BreakStringLiterals: true
62-
ColumnLimit: 0
63-
# CommentPragmas: '^ IWYU pragma:'
64-
# QualifierAlignment: Leave
92+
ColumnLimit: 0
93+
# CommentPragmas: "^ IWYU pragma:"
6594
# CompactNamespaces: false
6695
ConstructorInitializerIndentWidth: 8
6796
ContinuationIndentWidth: 8
6897
Cpp11BracedListStyle: false
69-
# DeriveLineEnding: true
7098
# DerivePointerAlignment: false
71-
# DisableFormat: false
99+
# DisableFormat: false
72100
# EmptyLineAfterAccessModifier: Never
73101
# EmptyLineBeforeAccessModifier: LogicalBlock
74102
# ExperimentalAutoDetectBinPacking: false
75-
# PackConstructorInitializers: BinPack
76-
ConstructorInitializerAllOnOneLineOrOnePerLine: true
77-
# AllowAllConstructorInitializersOnNextLine: true
78103
# FixNamespaceComments: true
79104
# ForEachMacros:
80105
# - foreach
81106
# - Q_FOREACH
82107
# - BOOST_FOREACH
83108
# IfMacros:
84109
# - KJ_IF_MAYBE
85-
# IncludeBlocks: Preserve
110+
# IncludeBlocks: Preserve
86111
IncludeCategories:
87-
- Regex: '".*"'
88-
Priority: 1
89-
- Regex: '^<.*\.h>'
90-
Priority: 2
91-
- Regex: '^<.*'
92-
Priority: 3
93-
# IncludeIsMainRegex: '(Test)?$'
94-
# IncludeIsMainSourceRegex: ''
112+
- Regex: ^".*"$
113+
Priority: 1
114+
- Regex: ^<.*\.h>$
115+
Priority: 2
116+
- Regex: ^<.*>$
117+
Priority: 3
118+
# IncludeIsMainRegex: (Test)?$
119+
# IncludeIsMainSourceRegex: ""
95120
# IndentAccessModifiers: false
96-
IndentCaseLabels: true
97121
# IndentCaseBlocks: false
122+
IndentCaseLabels: true
123+
# IndentExternBlock: AfterExternBlock
98124
# IndentGotoLabels: true
99125
# IndentPPDirectives: None
100-
# IndentExternBlock: AfterExternBlock
101-
# IndentRequires: false
102-
IndentWidth: 4
126+
# IndentRequiresClause: true
127+
IndentWidth: 4
103128
# IndentWrappedFunctionNames: false
129+
InsertBraces: true
130+
# InsertNewlineAtEOF: false
104131
# InsertTrailingCommas: None
132+
# IntegerLiteralSeparator:
133+
# Binary: 0
134+
# BinaryMinDigits: 0
135+
# Decimal: 0
136+
# DecimalMinDigits: 0
137+
# Hex: 0
138+
# HexMinDigits: 0
139+
JavaImportGroups:
140+
- org.godotengine
141+
- android
142+
- androidx
143+
- com.android
144+
- com.google
145+
- java
146+
- javax
105147
# JavaScriptQuotes: Leave
106148
# JavaScriptWrapImports: true
149+
# KeepEmptyLinesAtEOF: false
107150
KeepEmptyLinesAtTheStartOfBlocks: false
108151
# LambdaBodyIndentation: Signature
109-
# MacroBlockBegin: ''
110-
# MacroBlockEnd: ''
152+
# Language: Cpp
153+
# LineEnding: DeriveLF
154+
# MacroBlockBegin: ""
155+
# MacroBlockEnd: ""
111156
# MaxEmptyLinesToKeep: 1
112157
# NamespaceIndentation: None
158+
# ObjCBinPackProtocolList: Auto
159+
ObjCBlockIndentWidth: 4
160+
# ObjCBreakBeforeNestedBlockParam: true
161+
# ObjCSpaceAfterProperty: false
162+
# ObjCSpaceBeforeProtocolList: true
163+
# PPIndentWidth: -1
164+
PackConstructorInitializers: NextLine
113165
# PenaltyBreakAssignment: 2
114166
# PenaltyBreakBeforeFirstCallParameter: 19
115167
# PenaltyBreakComment: 300
@@ -118,82 +170,71 @@ KeepEmptyLinesAtTheStartOfBlocks: false
118170
# PenaltyBreakString: 1000
119171
# PenaltyBreakTemplateDeclaration: 10
120172
# PenaltyExcessCharacter: 1000000
121-
# PenaltyReturnTypeOnItsOwnLine: 60
122173
# PenaltyIndentedWhitespace: 0
174+
# PenaltyReturnTypeOnItsOwnLine: 60
123175
# PointerAlignment: Right
124-
# PPIndentWidth: -1
176+
# QualifierAlignment: Leave
125177
# ReferenceAlignment: Pointer
126-
# ReflowComments: true
178+
# ReflowComments: true
127179
# RemoveBracesLLVM: false
180+
# RemoveParentheses: Leave
181+
RemoveSemicolon: true
182+
# RequiresClausePosition: OwnLine
183+
# RequiresExpressionIndentation: OuterScope
128184
# SeparateDefinitionBlocks: Leave
129185
# ShortNamespaceLines: 1
130-
# SortIncludes: CaseSensitive
186+
# SortIncludes: CaseSensitive
131187
# SortJavaStaticImport: Before
132-
# SortUsingDeclarations: true
188+
# SortUsingDeclarations: LexicographicNumeric
133189
# SpaceAfterCStyleCast: false
134190
# SpaceAfterLogicalNot: false
135191
# SpaceAfterTemplateKeyword: true
192+
# SpaceAroundPointerQualifiers: Default
136193
# SpaceBeforeAssignmentOperators: true
137194
# SpaceBeforeCaseColon: false
138195
# SpaceBeforeCpp11BracedList: false
139196
# SpaceBeforeCtorInitializerColon: true
140197
# SpaceBeforeInheritanceColon: true
198+
# SpaceBeforeJsonColon: false
141199
# SpaceBeforeParens: ControlStatements
142200
# SpaceBeforeParensOptions:
143201
# AfterControlStatements: true
144202
# AfterForeachMacros: true
145-
# AfterFunctionDefinitionName: false
146203
# AfterFunctionDeclarationName: false
147-
# AfterIfMacros: true
204+
# AfterFunctionDefinitionName: false
205+
# AfterIfMacros: true
148206
# AfterOverloadedOperator: false
207+
# AfterRequiresInClause: false
208+
# AfterRequiresInExpression: false
149209
# BeforeNonEmptyParentheses: false
150-
# SpaceAroundPointerQualifiers: Default
151210
# SpaceBeforeRangeBasedForLoopColon: true
211+
# SpaceBeforeSquareBrackets: false
152212
# SpaceInEmptyBlock: false
153-
# SpaceInEmptyParentheses: false
154213
# SpacesBeforeTrailingComments: 1
155-
# SpacesInAngles: Never
156-
# SpacesInConditionalStatement: false
214+
# SpacesInAngles: Never
157215
# SpacesInContainerLiterals: true
158-
# SpacesInCStyleCastParentheses: false
159-
## Godot TODO: We'll want to use a min of 1, but we need to see how to fix
160-
## our comment capitalization at the same time.
161216
SpacesInLineCommentPrefix:
162-
Minimum: 0
163-
Maximum: -1
164-
# SpacesInParentheses: false
217+
Minimum: 0 # We want a minimum of 1 for comments, but allow 0 for disabled code.
218+
Maximum: -1
219+
# SpacesInParens: Never
220+
# SpacesInParensOptions:
221+
# InConditionalStatements: false
222+
# InCStyleCasts: false
223+
# InEmptyParentheses: false
224+
# Other: false
165225
# SpacesInSquareBrackets: false
166-
# SpaceBeforeSquareBrackets: false
167-
# BitFieldColonSpacing: Both
226+
Standard: c++20
168227
# StatementAttributeLikeMacros:
169228
# - Q_EMIT
170229
# StatementMacros:
171230
# - Q_UNUSED
172231
# - QT_REQUIRE_VERSION
173-
TabWidth: 4
174-
# UseCRLF: false
175-
UseTab: Always
232+
TabWidth: 4
233+
UseTab: Always
234+
# VerilogBreakBetweenInstancePorts: true
176235
# WhitespaceSensitiveMacros:
177-
# - STRINGIZE
178-
# - PP_STRINGIZE
179236
# - BOOST_PP_STRINGIZE
180-
# - NS_SWIFT_NAME
181237
# - CF_SWIFT_NAME
182-
---
183-
### C++ specific config ###
184-
Language: Cpp
185-
Standard: c++17
186-
---
187-
### ObjC specific config ###
188-
Language: ObjC
189-
# ObjCBinPackProtocolList: Auto
190-
ObjCBlockIndentWidth: 4
191-
# ObjCBreakBeforeNestedBlockParam: true
192-
# ObjCSpaceAfterProperty: false
193-
# ObjCSpaceBeforeProtocolList: true
194-
---
195-
### Java specific config ###
196-
Language: Java
197-
# BreakAfterJavaFieldAnnotations: false
198-
JavaImportGroups: ['org.godotengine', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax']
199-
...
238+
# - NS_SWIFT_NAME
239+
# - PP_STRINGIZE
240+
# - STRINGIZE

.editorconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ end_of_line = lf
66
indent_size = 4
77
indent_style = tab
88
insert_final_newline = true
9+
max_line_length = 120
910
trim_trailing_whitespace = true
1011

1112
[{*.py,SConstruct}]
1213
indent_style = space
1314

14-
[*.{yml,yaml}]
15+
[{*.{yml,yaml},.clang-format}]
1516
indent_size = 2
1617
indent_style = space

.pre-commit-config.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,36 @@ exclude: |
99
1010
repos:
1111
- repo: https://github.com/pre-commit/mirrors-clang-format
12-
rev: v17.0.6
12+
rev: v20.1.0
1313
hooks:
1414
- id: clang-format
1515

1616
- repo: https://github.com/astral-sh/ruff-pre-commit
17-
rev: v0.4.4
17+
rev: v0.11.4
1818
hooks:
1919
- id: ruff
2020
args: [--fix]
21+
files: (\.py|SConstruct)$
22+
types_or: [text]
2123
- id: ruff-format
24+
files: (\.py|SConstruct)$
25+
types_or: [text]
2226

2327
- repo: https://github.com/pre-commit/mirrors-mypy
24-
rev: v0.971
28+
rev: v1.14.1 # Latest version that supports Python 3.8
2529
hooks:
2630
- id: mypy
2731
files: \.py$
2832
types_or: [text]
2933

3034
- repo: https://github.com/codespell-project/codespell
31-
rev: v2.3.0
35+
rev: v2.4.1
3236
hooks:
3337
- id: codespell
3438
additional_dependencies: [tomli]
3539

3640
- repo: https://github.com/BlankSpruce/gersemi
37-
rev: 0.18.2
41+
rev: 0.19.2
3842
hooks:
3943
- id: gersemi
4044
args: ["-i", "--no-warn-about-unknown-commands", "-l", "120"]

0 commit comments

Comments
 (0)