From 12da8fd6a1bbf2de4347510d712d6009bf5bc6b0 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Wed, 18 Sep 2024 12:30:54 +0100 Subject: [PATCH] Tweak clang-format --- roles/home-cli/files/clang-format | 151 +++++++++++------------------- 1 file changed, 56 insertions(+), 95 deletions(-) diff --git a/roles/home-cli/files/clang-format b/roles/home-cli/files/clang-format index 239400a..7039550 100644 --- a/roles/home-cli/files/clang-format +++ b/roles/home-cli/files/clang-format @@ -1,15 +1,6 @@ -# clang-format 14 --- -BasedOnStyle: LLVM +BasedOnStyle: InheritParentConfig -#BreakAfterAttributes: Always # clang-format 16 -#IndentRequiresClause: false # clang-format 15 -#InsertNewlineAtEOF: true # clang-format 16 -#InsertBraces: true # clang-format 15 -#RemoveParentheses: MultipleParentheses # clang-format 17 -#RequiresClausePosition: OwnLine # clang-format 15 -#RequiresExpressionIndentation: OuterScope # clang-format 16 -#SpacesInParens: Never # clang-format 17 AccessModifierOffset: -4 AlignAfterOpenBracket: DontAlign AlignArrayOfStructures: None @@ -19,103 +10,99 @@ AlignConsecutiveDeclarations: None AlignConsecutiveMacros: None AlignEscapedNewlines: DontAlign AlignOperands: DontAlign -AlignTrailingComments: true +AlignTrailingComments: false AllowAllArgumentsOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: Empty AllowShortCaseLabelsOnASingleLine: false AllowShortEnumsOnASingleLine: false -AllowShortFunctionsOnASingleLine: None +AllowShortFunctionsOnASingleLine: Empty AllowShortIfStatementsOnASingleLine: Never AllowShortLambdasOnASingleLine: Inline AllowShortLoopsOnASingleLine: false AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakBeforeMultilineStrings: true AlwaysBreakTemplateDeclarations: Yes -BinPackArguments: true -BinPackParameters: true +BinPackArguments: false +BinPackParameters: false BitFieldColonSpacing: Both -BreakAfterJavaFieldAnnotations: false +BraceWrapping: + AfterCaseLabel: false + AfterClass: false + AfterControlStatement: Never + AfterEnum: false + AfterExternBlock: false + AfterFunction: true + AfterNamespace: false + AfterStruct: false + AfterUnion: false + BeforeCatch: false + BeforeElse: false + BeforeLambdaBody: false + BeforeWhile: false + IndentBraces: false + SplitEmptyFunction: false + SplitEmptyNamespace: false + SplitEmptyRecord: false BreakBeforeBinaryOperators: None BreakBeforeBraces: Custom -BreakBeforeConceptDeclarations: true -BreakBeforeInheritanceComma: false +BreakBeforeConceptDeclarations: false BreakBeforeTernaryOperators: false -BreakConstructorInitializers: BeforeColon -BreakConstructorInitializersBeforeComma: false -BreakInheritanceList: BeforeColon -BreakStringLiterals: true +BreakConstructorInitializers: AfterColon +BreakInheritanceList: AfterColon +BreakStringLiterals: false ColumnLimit: 100 CompactNamespaces: false -ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 2 Cpp11BracedListStyle: true -DeriveLineEnding: true -DerivePointerAlignment: true -DisableFormat: false +DeriveLineEnding: false +DerivePointerAlignment: false EmptyLineAfterAccessModifier: Never -EmptyLineBeforeAccessModifier: LogicalBlock -ExperimentalAutoDetectBinPacking: false -FixNamespaceComments: true +EmptyLineBeforeAccessModifier: Always +FixNamespaceComments: false IncludeBlocks: Regroup -IncludeIsMainRegex: "" -IncludeIsMainSourceRegex: "" IndentAccessModifiers: false IndentCaseBlocks: false IndentCaseLabels: false -IndentExternBlock: AfterExternBlock -IndentGotoLabels: true +IndentExternBlock: Indent +IndentGotoLabels: false IndentPPDirectives: None IndentRequires: false IndentWidth: 4 IndentWrappedFunctionNames: false -InsertTrailingCommas: None -JavaScriptQuotes: Leave -JavaScriptWrapImports: true -KeepEmptyLinesAtTheStartOfBlocks: true +KeepEmptyLinesAtTheStartOfBlocks: false LambdaBodyIndentation: Signature -MacroBlockBegin: "" -MacroBlockEnd: "" MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -ObjCBinPackProtocolList: Auto -ObjCBlockIndentWidth: 2 -ObjCBreakBeforeNestedBlockParam: true -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PPIndentWidth: -1 -PackConstructorInitializers: BinPack -PenaltyBreakAssignment: 2 -PenaltyBreakBeforeFirstCallParameter: 19 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakOpenParenthesis: 0 -PenaltyBreakString: 1000 -PenaltyBreakTemplateDeclaration: 10 -PenaltyExcessCharacter: 1000000 -PenaltyIndentedWhitespace: 0 -PenaltyReturnTypeOnItsOwnLine: 60 +NamespaceIndentation: All +PackConstructorInitializers: Never PointerAlignment: Left -QualifierAlignment: Leave -ReferenceAlignment: Pointer -ReflowComments: true +QualifierAlignment: Left +ReferenceAlignment: Left +ReflowComments: false RemoveBracesLLVM: false -SeparateDefinitionBlocks: Leave +SeparateDefinitionBlocks: Always ShortNamespaceLines: 1 SortIncludes: CaseSensitive -SortJavaStaticImport: Before SortUsingDeclarations: true SpaceAfterCStyleCast: false SpaceAfterLogicalNot: false -SpaceAfterTemplateKeyword: true -SpaceAroundPointerQualifiers: Default +SpaceAfterTemplateKeyword: false +SpaceAroundPointerQualifiers: Before SpaceBeforeAssignmentOperators: true SpaceBeforeCaseColon: false SpaceBeforeCpp11BracedList: false SpaceBeforeCtorInitializerColon: true SpaceBeforeInheritanceColon: true -SpaceBeforeParens: ControlStatements +SpaceBeforeParens: Custom +SpaceBeforeParensOptions: + AfterControlStatements: true + AfterForeachMacros: false + AfterFunctionDeclarationName: false + AfterFunctionDefinitionName: false + AfterIfMacros: false + AfterOverloadedOperator: false + BeforeNonEmptyParentheses: false SpaceBeforeRangeBasedForLoopColon: true SpaceBeforeSquareBrackets: false SpaceInEmptyBlock: false @@ -124,38 +111,12 @@ SpacesBeforeTrailingComments: 2 SpacesInAngles: Never SpacesInCStyleCastParentheses: false SpacesInConditionalStatement: false -SpacesInContainerLiterals: true +SpacesInContainerLiterals: false +SpacesInLineCommentPrefix: + Minimum: 1 SpacesInParentheses: false SpacesInSquareBrackets: false Standard: Latest TabWidth: 8 -UseCRLF: false UseTab: Never - -BraceWrapping: - AfterCaseLabel: false - AfterClass: false - AfterControlStatement: Never - AfterEnum: false - AfterFunction: true - AfterNamespace: false - AfterStruct: false - AfterUnion: false - AfterExternBlock: false - BeforeCatch: true - BeforeElse: true - BeforeLambdaBody: false - BeforeWhile: false - IndentBraces: false - SplitEmptyFunction: false - SplitEmptyRecord: false - SplitEmptyNamespace: false - -SpaceBeforeParensOptions: - AfterControlStatements: true - AfterForeachMacros: true - AfterFunctionDeclarationName: false - AfterFunctionDefinitionName: false - AfterIfMacros: true - AfterOverloadedOperator: false - BeforeNonEmptyParentheses: false +...