summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2019-04-17 13:06:46 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2019-04-17 13:06:46 +0200
commit936ab104abbf037af9405e397829a11467e1baa9 (patch)
treed9df9e7fb5c25090cce47d0b253f1fc2f4f12272
parent701ec37b6908b900fea2df9c746af8ca8aab284f (diff)
update clang-format
-rw-r--r--contrib/conf/editors/clang-format12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/conf/editors/clang-format b/contrib/conf/editors/clang-format
index d4e90ad90..fd47fb654 100644
--- a/contrib/conf/editors/clang-format
+++ b/contrib/conf/editors/clang-format
@@ -23,8 +23,8 @@ BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterClass: false
- AfterControlStatement: false
- AfterEnum: false
+ AfterControlStatement: true
+ AfterEnum: true
AfterFunction: true
AfterNamespace: false
AfterObjCDeclaration: false
@@ -32,12 +32,12 @@ BraceWrapping:
AfterUnion: true
AfterExternBlock: false
BeforeCatch: false
- BeforeElse: false
+ BeforeElse: true
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: All
+BreakBeforeBinaryOperators: None
BreakBeforeBraces: Custom
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
@@ -86,7 +86,7 @@ ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakBeforeFirstCallParameter: 9999999
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
@@ -97,7 +97,7 @@ PointerAlignment: Right
ReflowComments: true
SortIncludes: false
SortUsingDeclarations: true
-SpaceAfterCStyleCast: false
+SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: true
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true