From 5a89d7011b1802e3acb7644c2c48abcf03a7a041 Mon Sep 17 00:00:00 2001
From: Felix Weiglhofer <weiglhofer@fias.uni-frankfurt.de>
Date: Mon, 13 Nov 2023 15:08:31 +0100
Subject: [PATCH] Update clang-format.
---
.clang-format | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.clang-format b/.clang-format
index c6d26b29a7..72bcff11e2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,5 @@
---
-AccessModifierOffset: -2
+AccessModifierOffset: -1
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: true
@@ -14,11 +14,11 @@ AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: Always
+AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: true
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Always
+AllowShortIfStatementsOnASingleLine: Never # Or WithoutElse?
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: false
@@ -80,6 +80,8 @@ IncludeCategories:
Priority: 1
- Regex: '^("|<).*/Cbm'
Priority: 1
+ - Regex: '".*"'
+ Priority: 1
- Regex: '^("|<).*slice'
Priority: 2
- Regex: '^("|<)Monitor.hpp'
@@ -130,7 +132,7 @@ SpaceAfterCStyleCast: true
#SpaceAfterLogicalNot: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: true
+SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
--
GitLab