Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2023-01-05 23:02:41 +0100
committerMartin Hořeňovský2023-01-05 23:02:51 +0100
commit04382af4c640d801d332191528d11bd7ae5819f3 (patch)
treeb6f601d052ebad28ad123e8995570d75002e3759
parentac93f1943762f6fc92f0dc5bac0d720a33a27530 (diff)
downloadcatch3-04382af4c640d801d332191528d11bd7ae5819f3.tar.gz
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.
-rw-r--r--.clang-format41
1 files 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: '<catch2/.*\.hpp>'
+ - Regex: <catch2/.*\.hpp>
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