1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00

Style: Downgrade .clang-format arguments to 17.x

This commit is contained in:
Thaddeus Crews
2024-11-27 10:11:17 -06:00
parent bbc54692c0
commit 3c78eb1713
2 changed files with 9 additions and 49 deletions

View File

@@ -1,6 +1,6 @@
# Commented out parameters are those with the same value as base LLVM style. # 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 # 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 19.1.0). # chosen value in case the base style changes (last sync: Clang 17.0.6).
BasedOnStyle: LLVM BasedOnStyle: LLVM
AccessModifierOffset: -4 AccessModifierOffset: -4
AlignAfterOpenBracket: DontAlign AlignAfterOpenBracket: DontAlign
@@ -10,56 +10,30 @@ AlignAfterOpenBracket: DontAlign
# AcrossEmptyLines: false # AcrossEmptyLines: false
# AcrossComments: false # AcrossComments: false
# AlignCompound: false # AlignCompound: false
# AlignFunctionPointers: false
# PadOperators: true # PadOperators: true
# AlignConsecutiveBitFields: # AlignConsecutiveBitFields:
# Enabled: false # Enabled: false
# AcrossEmptyLines: false # AcrossEmptyLines: false
# AcrossComments: false # AcrossComments: false
# AlignCompound: false # AlignCompound: false
# AlignFunctionPointers: false
# PadOperators: false # PadOperators: false
# AlignConsecutiveDeclarations: # AlignConsecutiveDeclarations:
# Enabled: false # Enabled: false
# AcrossEmptyLines: false # AcrossEmptyLines: false
# AcrossComments: false # AcrossComments: false
# AlignCompound: false # AlignCompound: false
# AlignFunctionPointers: false
# PadOperators: false # PadOperators: false
# AlignConsecutiveMacros: # AlignConsecutiveMacros:
# Enabled: false # Enabled: false
# AcrossEmptyLines: false # AcrossEmptyLines: false
# AcrossComments: false # AcrossComments: false
# AlignCompound: false # AlignCompound: false
# AlignFunctionPointers: false
# PadOperators: false # PadOperators: false
# AlignConsecutiveShortCaseStatements: # AlignConsecutiveShortCaseStatements:
# Enabled: false # Enabled: false
# AcrossEmptyLines: false # AcrossEmptyLines: false
# AcrossComments: false # AcrossComments: false
# AlignCaseArrows: false
# AlignCaseColons: false # AlignCaseColons: false
# AlignConsecutiveTableGenBreakingDAGArgColons:
# Enabled: false
# AcrossEmptyLines: false
# AcrossComments: false
# AlignCompound: false
# AlignFunctionPointers: false
# PadOperators: false
# AlignConsecutiveTableGenCondOperatorColons:
# Enabled: false
# AcrossEmptyLines: false
# AcrossComments: false
# AlignCompound: false
# AlignFunctionPointers: false
# PadOperators: false
# AlignConsecutiveTableGenDefinitionColons:
# Enabled: false
# AcrossEmptyLines: false
# AcrossComments: false
# AlignCompound: false
# AlignFunctionPointers: false
# PadOperators: false
# AlignEscapedNewlines: Right # AlignEscapedNewlines: Right
AlignOperands: DontAlign AlignOperands: DontAlign
AlignTrailingComments: AlignTrailingComments:
@@ -67,17 +41,17 @@ AlignTrailingComments:
OverEmptyLines: 0 OverEmptyLines: 0
# AllowAllArgumentsOnNextLine: true # AllowAllArgumentsOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: false AllowAllParametersOfDeclarationOnNextLine: false
# AllowBreakBeforeNoexceptSpecifier: Never
# AllowShortBlocksOnASingleLine: Never # AllowShortBlocksOnASingleLine: Never
# AllowShortCaseExpressionOnASingleLine: true
# AllowShortCaseLabelsOnASingleLine: false # AllowShortCaseLabelsOnASingleLine: false
# AllowShortCompoundRequirementOnASingleLine: true
# AllowShortEnumsOnASingleLine: true # AllowShortEnumsOnASingleLine: true
# AllowShortFunctionsOnASingleLine: All # AllowShortFunctionsOnASingleLine: All
# AllowShortIfStatementsOnASingleLine: Never # AllowShortIfStatementsOnASingleLine: Never
# AllowShortLambdasOnASingleLine: All # AllowShortLambdasOnASingleLine: All
# AllowShortLoopsOnASingleLine: false # AllowShortLoopsOnASingleLine: false
# AlwaysBreakAfterDefinitionReturnType: None
# AlwaysBreakAfterReturnType: None
# AlwaysBreakBeforeMultilineStrings: false # AlwaysBreakBeforeMultilineStrings: false
# AlwaysBreakTemplateDeclarations: MultiLine
# AttributeMacros: # AttributeMacros:
# - __capability # - __capability
# BinPackArguments: true # BinPackArguments: true
@@ -102,10 +76,8 @@ AllowAllParametersOfDeclarationOnNextLine: false
# SplitEmptyFunction: true # SplitEmptyFunction: true
# SplitEmptyRecord: true # SplitEmptyRecord: true
# SplitEmptyNamespace: true # SplitEmptyNamespace: true
# BreakAdjacentStringLiterals: true # BreakAfterAttributes: Never
# BreakAfterAttributes: Leave
# BreakAfterJavaFieldAnnotations: false # BreakAfterJavaFieldAnnotations: false
# BreakAfterReturnType: None
# BreakArrays: true # BreakArrays: true
# BreakBeforeBinaryOperators: None # BreakBeforeBinaryOperators: None
# BreakBeforeBraces: Attach # BreakBeforeBraces: Attach
@@ -113,10 +85,8 @@ AllowAllParametersOfDeclarationOnNextLine: false
# BreakBeforeInlineASMColon: OnlyMultiline # BreakBeforeInlineASMColon: OnlyMultiline
# BreakBeforeTernaryOperators: true # BreakBeforeTernaryOperators: true
BreakConstructorInitializers: AfterColon BreakConstructorInitializers: AfterColon
# BreakFunctionDefinitionParameters: false
# BreakInheritanceList: BeforeColon # BreakInheritanceList: BeforeColon
# BreakStringLiterals: true # BreakStringLiterals: true
# BreakTemplateDeclarations: MultiLine
ColumnLimit: 0 ColumnLimit: 0
# CommentPragmas: '^ IWYU pragma:' # CommentPragmas: '^ IWYU pragma:'
# CompactNamespaces: false # CompactNamespaces: false
@@ -174,16 +144,13 @@ JavaImportGroups:
- javax - javax
# JavaScriptQuotes: Leave # JavaScriptQuotes: Leave
# JavaScriptWrapImports: true # JavaScriptWrapImports: true
KeepEmptyLines: # KeepEmptyLinesAtEOF: false
AtEndOfFile: false KeepEmptyLinesAtTheStartOfBlocks: false
AtStartOfBlock: false
AtStartOfFile: false
# LambdaBodyIndentation: Signature # LambdaBodyIndentation: Signature
# Language: Cpp # Language: Cpp
# LineEnding: DeriveLF # LineEnding: DeriveLF
# MacroBlockBegin: '' # MacroBlockBegin: ''
# MacroBlockEnd: '' # MacroBlockEnd: ''
# MainIncludeChar: Quote
# MaxEmptyLinesToKeep: 1 # MaxEmptyLinesToKeep: 1
# NamespaceIndentation: None # NamespaceIndentation: None
# ObjCBinPackProtocolList: Auto # ObjCBinPackProtocolList: Auto
@@ -198,7 +165,6 @@ PackConstructorInitializers: NextLine
# PenaltyBreakComment: 300 # PenaltyBreakComment: 300
# PenaltyBreakFirstLessLess: 120 # PenaltyBreakFirstLessLess: 120
# PenaltyBreakOpenParenthesis: 0 # PenaltyBreakOpenParenthesis: 0
# PenaltyBreakScopeResolution: 500
# PenaltyBreakString: 1000 # PenaltyBreakString: 1000
# PenaltyBreakTemplateDeclaration: 10 # PenaltyBreakTemplateDeclaration: 10
# PenaltyExcessCharacter: 1000000 # PenaltyExcessCharacter: 1000000
@@ -215,7 +181,6 @@ RemoveSemicolon: true
# RequiresExpressionIndentation: OuterScope # RequiresExpressionIndentation: OuterScope
# SeparateDefinitionBlocks: Leave # SeparateDefinitionBlocks: Leave
# ShortNamespaceLines: 1 # ShortNamespaceLines: 1
# SkipMacroDefinitionBody: false
# SortIncludes: CaseSensitive # SortIncludes: CaseSensitive
# SortJavaStaticImport: Before # SortJavaStaticImport: Before
# SortUsingDeclarations: LexicographicNumeric # SortUsingDeclarations: LexicographicNumeric
@@ -229,6 +194,7 @@ RemoveSemicolon: true
# SpaceBeforeCtorInitializerColon: true # SpaceBeforeCtorInitializerColon: true
# SpaceBeforeInheritanceColon: true # SpaceBeforeInheritanceColon: true
# SpaceBeforeJsonColon: false # SpaceBeforeJsonColon: false
# SpaceBeforeParens: ControlStatements
# SpaceBeforeParensOptions: # SpaceBeforeParensOptions:
# AfterControlStatements: true # AfterControlStatements: true
# AfterForeachMacros: true # AfterForeachMacros: true
@@ -236,7 +202,6 @@ RemoveSemicolon: true
# AfterFunctionDefinitionName: false # AfterFunctionDefinitionName: false
# AfterIfMacros: true # AfterIfMacros: true
# AfterOverloadedOperator: false # AfterOverloadedOperator: false
# AfterPlacementOperator: true
# AfterRequiresInClause: false # AfterRequiresInClause: false
# AfterRequiresInExpression: false # AfterRequiresInExpression: false
# BeforeNonEmptyParentheses: false # BeforeNonEmptyParentheses: false
@@ -251,7 +216,6 @@ SpacesInLineCommentPrefix:
Maximum: -1 Maximum: -1
# SpacesInParens: Never # SpacesInParens: Never
# SpacesInParensOptions: # SpacesInParensOptions:
# ExceptDoubleParentheses: false
# InConditionalStatements: false # InConditionalStatements: false
# InCStyleCasts: false # InCStyleCasts: false
# InEmptyParentheses: false # InEmptyParentheses: false
@@ -264,7 +228,6 @@ Standard: c++20
# - Q_UNUSED # - Q_UNUSED
# - QT_REQUIRE_VERSION # - QT_REQUIRE_VERSION
TabWidth: 4 TabWidth: 4
# TableGenBreakInsideDAGArg: DontBreak
UseTab: Always UseTab: Always
# VerilogBreakBetweenInstancePorts: true # VerilogBreakBetweenInstancePorts: true
# WhitespaceSensitiveMacros: # WhitespaceSensitiveMacros:

View File

@@ -30,10 +30,7 @@ JavaImportGroups:
- com.google - com.google
- java - java
- javax - javax
KeepEmptyLines: KeepEmptyLinesAtTheStartOfBlocks: false
AtEndOfFile: false
AtStartOfBlock: false
AtStartOfFile: false
ObjCBlockIndentWidth: 4 ObjCBlockIndentWidth: 4
PackConstructorInitializers: NextLine PackConstructorInitializers: NextLine
RemoveSemicolon: false # Differs from base .clang-format RemoveSemicolon: false # Differs from base .clang-format