Skip to content
This repository was archived by the owner on Apr 24, 2022. It is now read-only.

Commit 621bb1d

Browse files
committedFeb 3, 2018
Update clang-format with Clang5
1 parent 8b28b7d commit 621bb1d

File tree

1 file changed

+22
-4
lines changed

1 file changed

+22
-4
lines changed
 

‎.clang-format

+22-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ AccessModifierOffset: -4
55
AlignAfterOpenBracket: DontAlign
66
AlignConsecutiveAssignments: false
77
AlignConsecutiveDeclarations: false
8-
AlignEscapedNewlinesLeft: true
8+
AlignEscapedNewlines: Left
99
AlignOperands: true
1010
AlignTrailingComments: true
1111
AllowAllParametersOfDeclarationOnNextLine: false
@@ -14,13 +14,12 @@ AllowShortCaseLabelsOnASingleLine: false
1414
AllowShortFunctionsOnASingleLine: Inline
1515
AllowShortIfStatementsOnASingleLine: false
1616
AllowShortLoopsOnASingleLine: false
17+
AlwaysBreakAfterDefinitionReturnType: None
1718
AlwaysBreakAfterReturnType: None
1819
AlwaysBreakBeforeMultilineStrings: true
1920
AlwaysBreakTemplateDeclarations: true
2021
BinPackArguments: true
2122
BinPackParameters: true
22-
BreakBeforeBinaryOperators: None
23-
BreakBeforeBraces: Custom
2423
BraceWrapping:
2524
AfterClass: true
2625
AfterControlStatement: true
@@ -34,18 +33,31 @@ BraceWrapping:
3433
BeforeElse: true
3534
IndentBraces: false
3635
SplitEmptyFunction: false
36+
SplitEmptyRecord: true
37+
SplitEmptyNamespace: true
38+
BreakBeforeBinaryOperators: None
39+
BreakBeforeBraces: Custom
40+
BreakBeforeInheritanceComma: false
3741
BreakBeforeTernaryOperators: false
42+
BreakConstructorInitializersBeforeComma: false
3843
BreakConstructorInitializers: BeforeColon
44+
BreakAfterJavaFieldAnnotations: false
45+
BreakStringLiterals: true
3946
ColumnLimit: 100
4047
CommentPragmas: '^ IWYU pragma:'
48+
CompactNamespaces: false
4149
ConstructorInitializerAllOnOneLineOrOnePerLine: true
4250
ConstructorInitializerIndentWidth: 2
4351
ContinuationIndentWidth: 4
4452
Cpp11BracedListStyle: true
4553
DerivePointerAlignment: false
4654
DisableFormat: false
4755
ExperimentalAutoDetectBinPacking: false
48-
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
56+
FixNamespaceComments: true
57+
ForEachMacros:
58+
- foreach
59+
- Q_FOREACH
60+
- BOOST_FOREACH
4961
IncludeCategories:
5062
- Regex: '^".*'
5163
Priority: 1
@@ -57,9 +69,12 @@ IncludeCategories:
5769
Priority: 99
5870
- Regex: '.*'
5971
Priority: 4
72+
IncludeIsMainRegex: '(Test)?$'
6073
IndentCaseLabels: false
6174
IndentWidth: 4
6275
IndentWrappedFunctionNames: false
76+
JavaScriptQuotes: Leave
77+
JavaScriptWrapImports: true
6378
KeepEmptyLinesAtTheStartOfBlocks: false
6479
MacroBlockBegin: ''
6580
MacroBlockEnd: ''
@@ -78,7 +93,9 @@ PenaltyReturnTypeOnItsOwnLine: 200
7893
PointerAlignment: Left
7994
ReflowComments: true
8095
SortIncludes: true
96+
SortUsingDeclarations: true
8197
SpaceAfterCStyleCast: false
98+
SpaceAfterTemplateKeyword: true
8299
SpaceBeforeAssignmentOperators: true
83100
SpaceBeforeParens: ControlStatements
84101
SpaceInEmptyParentheses: false
@@ -92,3 +109,4 @@ Standard: Auto
92109
TabWidth: 4
93110
UseTab: Never
94111
...
112+

0 commit comments

Comments
 (0)
This repository has been archived.