diff --git a/.clang-format b/.clang-format index c6d26b29a79f8b1be3be3d4fc9424a9bfb1f3813..72bcff11e269f4d82303c102c27e1669d1a6fdca 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