Format clang-format [#CLICKHOUSE-2]

This commit is contained in:
Alexey Milovidov 2018-05-06 09:06:09 +03:00
parent a5dd90c35e
commit d765173568

View File

@ -1,24 +1,21 @@
--- BasedOnStyle: WebKit
BasedOnStyle: WebKit Language: Cpp
Language: Cpp
AlignAfterOpenBracket: false AlignAfterOpenBracket: false
BreakBeforeBraces: Custom BreakBeforeBraces: Custom
BraceWrapping: { BraceWrapping:
AfterClass: 'true' AfterClass: true
AfterControlStatement: 'true' AfterControlStatement: true
AfterEnum : 'true' AfterEnum: true
AfterFunction : 'true' AfterFunction: true
AfterNamespace : 'true' AfterNamespace: true
AfterStruct : 'true' AfterStruct: true
AfterUnion : 'true' AfterUnion: true
BeforeCatch : 'true' BeforeCatch: true
BeforeElse : 'true' BeforeElse: true
IndentBraces : 'false' IndentBraces: false
}
BreakConstructorInitializersBeforeComma: false BreakConstructorInitializersBeforeComma: false
Cpp11BracedListStyle: true Cpp11BracedListStyle: true
ColumnLimit: 140 ColumnLimit: 140
ConstructorInitializerAllOnOneLineOrOnePerLine: true ConstructorInitializerAllOnOneLineOrOnePerLine: true
ExperimentalAutoDetectBinPacking: true ExperimentalAutoDetectBinPacking: true
UseTab: Never UseTab: Never
@ -28,36 +25,35 @@ Standard: Cpp11
PointerAlignment: Middle PointerAlignment: Middle
MaxEmptyLinesToKeep: 2 MaxEmptyLinesToKeep: 2
KeepEmptyLinesAtTheStartOfBlocks: false KeepEmptyLinesAtTheStartOfBlocks: false
#AllowShortFunctionsOnASingleLine: Inline
AllowShortFunctionsOnASingleLine: Empty AllowShortFunctionsOnASingleLine: Empty
AlwaysBreakTemplateDeclarations: true AlwaysBreakTemplateDeclarations: true
IndentCaseLabels: true IndentCaseLabels: true
#SpaceAfterTemplateKeyword: true SpaceAfterTemplateKeyword: true
SortIncludes: true SortIncludes: true
IncludeCategories: IncludeCategories:
- Regex: '^<[a-z_]+>' - Regex: '^<[a-z_]+>'
Priority: 1 Priority: 1
- Regex: '^<[a-z_]+.h>' - Regex: '^<[a-z_]+.h>'
Priority: 2 Priority: 2
- Regex: '^["<](common|ext|mysqlxx|daemon|zkutil)/' - Regex: '^["<](common|ext|mysqlxx|daemon|zkutil)/'
Priority: 90 Priority: 90
- Regex: '^["<](DB)/' - Regex: '^["<](DB)/'
Priority: 100 Priority: 100
- Regex: '^["<](Poco)/' - Regex: '^["<](Poco)/'
Priority: 50 Priority: 50
- Regex: '^"' - Regex: '^"'
Priority: 110 Priority: 110
- Regex: '/' - Regex: '/'
Priority: 30 Priority: 30
- Regex: '.*' - Regex: '.*'
Priority: 40 Priority: 40
ReflowComments: false ReflowComments: false
AlignEscapedNewlinesLeft: true AlignEscapedNewlinesLeft: true
# Not changed: # Not changed:
AccessModifierOffset: -4 AccessModifierOffset: -4
AlignConsecutiveAssignments: false AlignConsecutiveAssignments: false
AlignOperands: false AlignOperands: false
AlignTrailingComments: false AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false AllowShortBlocksOnASingleLine: false
@ -70,16 +66,15 @@ BinPackArguments: false
BinPackParameters: false BinPackParameters: false
BreakBeforeBinaryOperators: All BreakBeforeBinaryOperators: All
BreakBeforeTernaryOperators: true BreakBeforeTernaryOperators: true
CommentPragmas: '^ IWYU pragma:' CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerIndentWidth: 4 ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4 ContinuationIndentWidth: 4
DerivePointerAlignment: false DerivePointerAlignment: false
DisableFormat: false DisableFormat: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] IndentWidth: 4
IndentWidth: 4
IndentWrappedFunctionNames: false IndentWrappedFunctionNames: false
MacroBlockBegin: '' MacroBlockBegin: ''
MacroBlockEnd: '' MacroBlockEnd: ''
NamespaceIndentation: Inner NamespaceIndentation: Inner
ObjCBlockIndentWidth: 4 ObjCBlockIndentWidth: 4
ObjCSpaceAfterProperty: true ObjCSpaceAfterProperty: true
@ -99,5 +94,3 @@ SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false SpacesInCStyleCastParentheses: false
SpacesInParentheses: false SpacesInParentheses: false
SpacesInSquareBrackets: false SpacesInSquareBrackets: false
...