Update godot engine

godot/.clang-format

@@ -1,248 +1,199 @@
 # Commented out parameters are those with the same value as base LLVM style.
 # We can uncomment them if we want to change their value, or enforce the
-# chosen value in case the base style changes (last sync: Clang 18.1.8).
-BasedOnStyle: LLVM
+# chosen value in case the base style changes (last sync: Clang 14.0).
+---
+### General config, applies to all languages ###
+BasedOnStyle:  LLVM
 AccessModifierOffset: -4
 AlignAfterOpenBracket: DontAlign
 # AlignArrayOfStructures: None
-# AlignConsecutiveAssignments:
-#   Enabled: false
-#   AcrossEmptyLines: false
-#   AcrossComments: false
-#   AlignCompound: false
-#   AlignFunctionPointers: false
-#   PadOperators: true
-# AlignConsecutiveBitFields:
-#   Enabled: false
-#   AcrossEmptyLines: false
-#   AcrossComments: false
-#   AlignCompound: false
-#   AlignFunctionPointers: false
-#   PadOperators: false
-# AlignConsecutiveDeclarations:
-#   Enabled: false
-#   AcrossEmptyLines: false
-#   AcrossComments: false
-#   AlignCompound: false
-#   AlignFunctionPointers: false
-#   PadOperators: false
-# AlignConsecutiveMacros:
-#   Enabled: false
-#   AcrossEmptyLines: false
-#   AcrossComments: false
-#   AlignCompound: false
-#   AlignFunctionPointers: false
-#   PadOperators: false
-# AlignConsecutiveShortCaseStatements:
-#   Enabled: false
-#   AcrossEmptyLines: false
-#   AcrossComments: false
-#   AlignCaseColons: false
+# AlignConsecutiveMacros: None
+# AlignConsecutiveAssignments: None
+# AlignConsecutiveBitFields: None
+# AlignConsecutiveDeclarations: None
 # AlignEscapedNewlines: Right
-AlignOperands: DontAlign
-AlignTrailingComments:
-  Kind: Never
-  OverEmptyLines: 0
+AlignOperands:   DontAlign
+AlignTrailingComments: false
 # AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: false
-# AllowBreakBeforeNoexceptSpecifier: Never
+# AllowShortEnumsOnASingleLine: true
 # AllowShortBlocksOnASingleLine: Never
 # AllowShortCaseLabelsOnASingleLine: false
-# AllowShortCompoundRequirementOnASingleLine: true
-# AllowShortEnumsOnASingleLine: true
 # AllowShortFunctionsOnASingleLine: All
-# AllowShortIfStatementsOnASingleLine: Never
 # AllowShortLambdasOnASingleLine: All
+# AllowShortIfStatementsOnASingleLine: Never
 # AllowShortLoopsOnASingleLine: false
+# AlwaysBreakAfterDefinitionReturnType: None
 # AlwaysBreakAfterReturnType: None
 # AlwaysBreakBeforeMultilineStrings: false
 # AlwaysBreakTemplateDeclarations: MultiLine
 # AttributeMacros:
 #   - __capability
 # BinPackArguments: true
 # BinPackParameters: true
-# BitFieldColonSpacing: Both
 # BraceWrapping:
-#   AfterCaseLabel: false
-#   AfterClass: false
+#   AfterCaseLabel:  false
+#   AfterClass:      false
 #   AfterControlStatement: Never
-#   AfterEnum: false
-#   AfterFunction: false
-#   AfterNamespace: false
+#   AfterEnum:       false
+#   AfterFunction:   false
+#   AfterNamespace:  false
 #   AfterObjCDeclaration: false
-#   AfterStruct: false
-#   AfterUnion: false
+#   AfterStruct:     false
+#   AfterUnion:      false
 #   AfterExternBlock: false
-#   BeforeCatch: false
-#   BeforeElse: false
+#   BeforeCatch:     false
+#   BeforeElse:      false
 #   BeforeLambdaBody: false
-#   BeforeWhile: false
-#   IndentBraces: false
+#   BeforeWhile:     false
+#   IndentBraces:    false
 #   SplitEmptyFunction: true
 #   SplitEmptyRecord: true
 #   SplitEmptyNamespace: true
-# BreakAdjacentStringLiterals: true
-# BreakAfterAttributes: Leave
-# BreakAfterJavaFieldAnnotations: false
-# BreakArrays: true
 # BreakBeforeBinaryOperators: None
+# BreakBeforeConceptDeclarations: true
 # BreakBeforeBraces: Attach
-# BreakBeforeConceptDeclarations: Always
-# BreakBeforeInlineASMColon: OnlyMultiline
+# BreakBeforeInheritanceComma: false
+# BreakInheritanceList: BeforeColon
 # BreakBeforeTernaryOperators: true
+# BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: AfterColon
-# BreakInheritanceList: BeforeColon
 # BreakStringLiterals: true
-ColumnLimit: 0
-# CommentPragmas: '^ IWYU pragma:'
+ColumnLimit:     0
+# CommentPragmas:  '^ IWYU pragma:'
+# QualifierAlignment: Leave
 # CompactNamespaces: false
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
 Cpp11BracedListStyle: false
+# DeriveLineEnding: true
 # DerivePointerAlignment: false
-# DisableFormat: false
+# DisableFormat:   false
 # EmptyLineAfterAccessModifier: Never
 # EmptyLineBeforeAccessModifier: LogicalBlock
 # ExperimentalAutoDetectBinPacking: false
+# PackConstructorInitializers: BinPack
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+# AllowAllConstructorInitializersOnNextLine: true
 # FixNamespaceComments: true
 # ForEachMacros:
 #   - foreach
 #   - Q_FOREACH
 #   - BOOST_FOREACH
 # IfMacros:
 #   - KJ_IF_MAYBE
-# IncludeBlocks: Preserve
+# IncludeBlocks:   Preserve
 IncludeCategories:
-  - Regex: ^".*"$
-    Priority: 1
-  - Regex: ^<.*\.h>$
-    Priority: 2
-  - Regex: ^<.*>$
-    Priority: 3
-# IncludeIsMainRegex: (Test)?$
+  - Regex:           '".*"'
+    Priority:        1
+  - Regex:           '^<.*\.h>'
+    Priority:        2
+  - Regex:           '^<.*'
+    Priority:        3
+# IncludeIsMainRegex: '(Test)?$'
 # IncludeIsMainSourceRegex: ''
 # IndentAccessModifiers: false
-# IndentCaseBlocks: false
 IndentCaseLabels: true
-# IndentExternBlock: AfterExternBlock
+# IndentCaseBlocks: false
 # IndentGotoLabels: true
 # IndentPPDirectives: None
-# IndentRequiresClause: true
-IndentWidth: 4
+# IndentExternBlock: AfterExternBlock
+# IndentRequires:  false
+IndentWidth:     4
 # IndentWrappedFunctionNames: false
-# InsertBraces: false
-# InsertNewlineAtEOF: false
 # InsertTrailingCommas: None
-# IntegerLiteralSeparator:
-#   Binary: 0
-#   BinaryMinDigits: 0
-#   Decimal: 0
-#   DecimalMinDigits: 0
-#   Hex: 0
-#   HexMinDigits: 0
-JavaImportGroups:
-  - org.godotengine
-  - android
-  - androidx
-  - com.android
-  - com.google
-  - java
-  - javax
 # JavaScriptQuotes: Leave
 # JavaScriptWrapImports: true
-# KeepEmptyLinesAtEOF: false
 KeepEmptyLinesAtTheStartOfBlocks: false
 # LambdaBodyIndentation: Signature
-# Language: Cpp
-# LineEnding: DeriveLF
 # MacroBlockBegin: ''
-# MacroBlockEnd: ''
+# MacroBlockEnd:   ''
 # MaxEmptyLinesToKeep: 1
 # NamespaceIndentation: None
-# ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 4
-# ObjCBreakBeforeNestedBlockParam: true
-# ObjCSpaceAfterProperty: false
-# ObjCSpaceBeforeProtocolList: true
-# PPIndentWidth: -1
-PackConstructorInitializers: NextLine
 # PenaltyBreakAssignment: 2
 # PenaltyBreakBeforeFirstCallParameter: 19
 # PenaltyBreakComment: 300
 # PenaltyBreakFirstLessLess: 120
 # PenaltyBreakOpenParenthesis: 0
-# PenaltyBreakScopeResolution: 500
 # PenaltyBreakString: 1000
 # PenaltyBreakTemplateDeclaration: 10
 # PenaltyExcessCharacter: 1000000
-# PenaltyIndentedWhitespace: 0
 # PenaltyReturnTypeOnItsOwnLine: 60
+# PenaltyIndentedWhitespace: 0
 # PointerAlignment: Right
-# QualifierAlignment: Leave
+# PPIndentWidth:   -1
 # ReferenceAlignment: Pointer
-# ReflowComments: true
+# ReflowComments:  true
 # RemoveBracesLLVM: false
-# RemoveParentheses: Leave
-RemoveSemicolon: true
-# RequiresClausePosition: OwnLine
-# RequiresExpressionIndentation: OuterScope
 # SeparateDefinitionBlocks: Leave
 # ShortNamespaceLines: 1
-# SkipMacroDefinitionBody: false
-# SortIncludes: CaseSensitive
+# SortIncludes:    CaseSensitive
 # SortJavaStaticImport: Before
-# SortUsingDeclarations: LexicographicNumeric
+# SortUsingDeclarations: true
 # SpaceAfterCStyleCast: false
 # SpaceAfterLogicalNot: false
 # SpaceAfterTemplateKeyword: true
-# SpaceAroundPointerQualifiers: Default
 # SpaceBeforeAssignmentOperators: true
 # SpaceBeforeCaseColon: false
 # SpaceBeforeCpp11BracedList: false
 # SpaceBeforeCtorInitializerColon: true
 # SpaceBeforeInheritanceColon: true
-# SpaceBeforeJsonColon: false
+# SpaceBeforeParens: ControlStatements
 # SpaceBeforeParensOptions:
 #   AfterControlStatements: true
 #   AfterForeachMacros: true
-#   AfterFunctionDeclarationName: false
 #   AfterFunctionDefinitionName: false
-#   AfterIfMacros: true
+#   AfterFunctionDeclarationName: false
+#   AfterIfMacros:   true
 #   AfterOverloadedOperator: false
-#   AfterPlacementOperator: true
-#   AfterRequiresInClause: false
-#   AfterRequiresInExpression: false
 #   BeforeNonEmptyParentheses: false
+# SpaceAroundPointerQualifiers: Default
 # SpaceBeforeRangeBasedForLoopColon: true
-# SpaceBeforeSquareBrackets: false
 # SpaceInEmptyBlock: false
+# SpaceInEmptyParentheses: false
 # SpacesBeforeTrailingComments: 1
-# SpacesInAngles: Never
+# SpacesInAngles:  Never
+# SpacesInConditionalStatement: false
 # SpacesInContainerLiterals: true
+# SpacesInCStyleCastParentheses: false
 ## Godot TODO: We'll want to use a min of 1, but we need to see how to fix
 ## our comment capitalization at the same time.
 SpacesInLineCommentPrefix:
-  Minimum: 0
-  Maximum: -1
-# SpacesInParens: Never
-# SpacesInParensOptions:
-#   InConditionalStatements: false
-#   InCStyleCasts: false
-#   InEmptyParentheses: false
-#   Other: false
+  Minimum:         0
+  Maximum:         -1
+# SpacesInParentheses: false
 # SpacesInSquareBrackets: false
-Standard: c++20
+# SpaceBeforeSquareBrackets: false
+# BitFieldColonSpacing: Both
 # StatementAttributeLikeMacros:
 #   - Q_EMIT
 # StatementMacros:
 #   - Q_UNUSED
 #   - QT_REQUIRE_VERSION
-TabWidth: 4
-UseTab: Always
-# VerilogBreakBetweenInstancePorts: true
+TabWidth:        4
+# UseCRLF:         false
+UseTab:          Always
 # WhitespaceSensitiveMacros:
+#   - STRINGIZE
+#   - PP_STRINGIZE
 #   - BOOST_PP_STRINGIZE
-#   - CF_SWIFT_NAME
 #   - NS_SWIFT_NAME
-#   - PP_STRINGIZE
-#   - STRINGIZE
+#   - CF_SWIFT_NAME
+---
+### C++ specific config ###
+Language:        Cpp
+Standard:        c++17
+---
+### ObjC specific config ###
+Language:        ObjC
+# ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 4
+# ObjCBreakBeforeNestedBlockParam: true
+# ObjCSpaceAfterProperty: false
+# ObjCSpaceBeforeProtocolList: true
+---
+### Java specific config ###
+Language:        Java
+# BreakAfterJavaFieldAnnotations: false
+JavaImportGroups: ['org.godotengine', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax']
+...

godot/.clang-tidy

@@ -1,12 +1,14 @@
-Checks:
-  - -*
-  - cppcoreguidelines-pro-type-member-init
-  - modernize-redundant-void-arg
-  - modernize-use-bool-literals
-  - modernize-use-default-member-init
-  - modernize-use-nullptr
-  - readability-braces-around-statements
-  - readability-redundant-member-init
+---
+Checks: >-
+  -*,
+  cppcoreguidelines-pro-type-member-init,
+  modernize-redundant-void-arg,
+  modernize-use-bool-literals,
+  modernize-use-default-member-init,
+  modernize-use-nullptr,
+  readability-braces-around-statements,
+  readability-redundant-member-init
+WarningsAsErrors: ''
 HeaderFileExtensions: ['', h, hh, hpp, hxx, inc, glsl]
 ImplementationFileExtensions: [c, cc, cpp, cxx, m, mm, java]
 HeaderFilterRegex: (core|doc|drivers|editor|main|modules|platform|scene|servers|tests)/
@@ -17,3 +19,4 @@ CheckOptions:
   modernize-use-bool-literals.IgnoreMacros: false
   modernize-use-default-member-init.IgnoreMacros: false
   modernize-use-default-member-init.UseAssignment: true
+...

godot/.git-blame-ignore-revs

@@ -54,12 +54,3 @@ df61dc4b2bd54a5a40c515493c76f5a458e5b541
 
 # Enforce template syntax `typename` over `class`
 9903e6779b70fc03aae70a37b9cf053f4f355b91
-
-# Style: Apply new `clang-format` fixes
-b37fc1014abf7adda70dc30b0822d775b3a4433f
-
-# Set clang-format `RemoveSemicolon` rule to `true`
-0d350e71086fffce0553811739aae9f6ad66136c
-
-# Style: Apply clang-tidy fixes (superficial)
-bb5f390fb9b466be35a5df7651323d7e66afca31

godot/.gitattributes

@@ -1,6 +1,6 @@
 # Properly detect languages on Github
-*.h linguist-language=C++
-*.inc linguist-language=C++
+*.h linguist-language=cpp
+*.inc linguist-language=cpp
 thirdparty/* linguist-vendored
 
 # Normalize EOL for all files that Git considers text files