From 04382af4c640d801d332191528d11bd7ae5819f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Thu, 5 Jan 2023 23:02:41 +0100 Subject: [PATCH] Slightly better clang-format Notably clang-format will no longer try to place template header onto the same line as the function declaration. Sadly it will still do it for attributes, because it took until clang-format 16 for it to get the relevant option. --- .clang-format | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.clang-format b/.clang-format index f67a5862..9efb854d 100644 --- a/.clang-format +++ b/.clang-format @@ -4,41 +4,42 @@ Standard: c++14 # Note that we cannot use IncludeIsMainRegex functionality, because it # does not support includes in angle brackets (<>) -SortIncludes: True +SortIncludes: true IncludeBlocks: Regroup IncludeCategories: - - Regex: '' + - Regex: Priority: 1 - - Regex: '<.*/.*\.hpp>' + - Regex: <.*/.*\.hpp> Priority: 2 - - Regex: '<.*>' + - Regex: <.*> Priority: 3 - AllowShortBlocksOnASingleLine: Always AllowShortEnumsOnASingleLine: false AllowShortFunctionsOnASingleLine: All AllowShortIfStatementsOnASingleLine: WithoutElse AllowShortLambdasOnASingleLine: Inline -AccessModifierOffset: '-4' +AccessModifierOffset: "-4" AlignEscapedNewlines: Left -AllowAllConstructorInitializersOnNextLine: 'true' -BinPackArguments: 'false' -BinPackParameters: 'false' +AllowAllConstructorInitializersOnNextLine: "true" +BinPackArguments: "false" +BinPackParameters: "false" BreakConstructorInitializers: AfterColon -ConstructorInitializerAllOnOneLineOrOnePerLine: 'true' -DerivePointerAlignment: 'false' -FixNamespaceComments: 'true' -IndentCaseLabels: 'false' +ConstructorInitializerAllOnOneLineOrOnePerLine: "true" +DerivePointerAlignment: "false" +FixNamespaceComments: "true" +IndentCaseLabels: "false" IndentPPDirectives: AfterHash -IndentWidth: '4' +IndentWidth: "4" NamespaceIndentation: All PointerAlignment: Left -SpaceBeforeCtorInitializerColon: 'false' -SpaceInEmptyParentheses: 'false' -SpacesInParentheses: 'true' -TabWidth: '4' +SpaceBeforeCtorInitializerColon: "false" +SpaceInEmptyParentheses: "false" +SpacesInParentheses: "true" +TabWidth: "4" UseTab: Never - -... +AlwaysBreakTemplateDeclarations: Yes +SpaceAfterTemplateKeyword: true +SortUsingDeclarations: true +ReflowComments: true