Skip to content

Commit a3af622

Browse files
authored
mloskot's proposal with initial tweaks to this .clang-format
This is intermediate commit to clearly show the .clang-format tweaks that I'd like to propose to @lpranam 's original.
1 parent 321e72c commit a3af622

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.clang-format

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Language: Cpp
44
AccessModifierOffset: -4
55
AlignAfterOpenBracket: AlwaysBreak
66
AlignConsecutiveMacros: AcrossEmptyLinesAndComments
7-
AlignConsecutiveAssignments: AcrossEmptyLinesAndComments
7+
AlignConsecutiveAssignments: None
88
AlignConsecutiveBitFields: AcrossEmptyLinesAndComments
99
AlignConsecutiveDeclarations: None
1010
AlignEscapedNewlines: Right
11-
AlignOperands: true
11+
AlignOperands: AlignAfterOperator
1212
AlignTrailingComments: true
1313
AllowAllArgumentsOnNextLine: true
1414
AllowAllConstructorInitializersOnNextLine: false
@@ -45,7 +45,7 @@ BraceWrapping:
4545
SplitEmptyFunction: true
4646
SplitEmptyRecord: true
4747
SplitEmptyNamespace: true
48-
BreakBeforeBinaryOperators: None
48+
BreakBeforeBinaryOperators: All
4949
BreakBeforeBraces: Custom
5050
BreakBeforeInheritanceComma: true
5151
BreakInheritanceList: BeforeComma
@@ -70,7 +70,7 @@ ForEachMacros:
7070
- foreach
7171
- Q_FOREACH
7272
- BOOST_FOREACH
73-
IncludeBlocks: Preserve
73+
IncludeBlocks: Regroup
7474
IncludeCategories:
7575
- Regex: '^<boost/gil'
7676
Priority: 1
@@ -85,7 +85,7 @@ IncludeIsMainSourceRegex: ''
8585
IndentCaseLabels: false
8686
IndentCaseBlocks: false
8787
IndentGotoLabels: true
88-
IndentPPDirectives: None
88+
IndentPPDirectives: AfterHash
8989
IndentExternBlock: AfterExternBlock
9090
IndentWidth: 4
9191
IndentWrappedFunctionNames: true
@@ -109,7 +109,7 @@ PenaltyBreakFirstLessLess: 120
109109
PenaltyBreakString: 10
110110
PenaltyBreakTemplateDeclaration: 10
111111
PenaltyExcessCharacter: 100
112-
PenaltyReturnTypeOnItsOwnLine: 100
112+
PenaltyReturnTypeOnItsOwnLine: 500
113113
PointerAlignment: Left
114114
ReflowComments: false
115115
SortIncludes: true

0 commit comments

Comments
 (0)