summaryrefslogtreecommitdiffstats
path: root/_clang-format
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2014-06-05 20:04:47 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2014-06-05 20:04:47 +0000
commit8cbb50cebdbfe9adb985aeeff4335ebd07a66dc1 (patch)
treef3f78553ba6b8e7c96714fb287c036aabd7e87bd /_clang-format
parentMake family-name comparisons case insensitive. (diff)
downloadinkscape-8cbb50cebdbfe9adb985aeeff4335ebd07a66dc1.tar.gz
inkscape-8cbb50cebdbfe9adb985aeeff4335ebd07a66dc1.zip
update clang format spec for latest clangformat version
(bzr r13341.1.48)
Diffstat (limited to '_clang-format')
-rw-r--r--_clang-format9
1 files changed, 9 insertions, 0 deletions
diff --git a/_clang-format b/_clang-format
index 913819284..560efa208 100644
--- a/_clang-format
+++ b/_clang-format
@@ -5,11 +5,14 @@ ConstructorInitializerIndentWidth: 4
AlignEscapedNewlinesLeft: false
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
AlwaysBreakTemplateDeclarations: true
AlwaysBreakBeforeMultilineStrings: false
BreakBeforeBinaryOperators: false
+BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
BinPackParameters: true
ColumnLimit: 120
@@ -18,8 +21,11 @@ DerivePointerBinding: false
ExperimentalAutoDetectBinPacking: false
IndentCaseLabels: true
MaxEmptyLinesToKeep: 3
+KeepEmptyLinesAtTheStartOfBlocks: true
NamespaceIndentation: None
+ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 60
PenaltyBreakString: 1000
PenaltyBreakFirstLessLess: 120
@@ -35,9 +41,12 @@ UseTab: Never
BreakBeforeBraces: Stroustrup
IndentFunctionDeclarationAfterType: false
SpacesInParentheses: false
+SpacesInAngles: false
SpaceInEmptyParentheses: false
SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
SpaceAfterControlStatementKeyword: true
+ContinuationIndentWidth: 4
SpaceBeforeAssignmentOperators: true
...