diff options
| author | levlam <levlam@telegram.org> | 2018-10-14 04:01:02 +0300 |
|---|---|---|
| committer | levlam <levlam@telegram.org> | 2018-10-14 04:01:02 +0300 |
| commit | f5ea140bc2ce2c27b0ab7ee851338ff97e766c1b (patch) | |
| tree | d340ed452635effe2c54c18c43bd4fc0939466f7 /.clang-format | |
| parent | 24a66bf9e7d5169d445668561ebf902742603abd (diff) | |
Update clang-format to 8.0.
GitOrigin-RevId: 170be47e4b47607a2bca81d2ed6b5b3d547982ca
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/.clang-format b/.clang-format index 3df452852..2f75c24a1 100644 --- a/.clang-format +++ b/.clang-format @@ -17,7 +17,7 @@ AllowShortLoopsOnASingleLine: false # true AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: true -AlwaysBreakTemplateDeclarations: true +AlwaysBreakTemplateDeclarations: Yes BinPackArguments: true BinPackParameters: true BraceWrapping: @@ -39,6 +39,7 @@ BraceWrapping: BreakBeforeBinaryOperators: None BreakBeforeBraces: Attach BreakBeforeInheritanceComma: true # false +BreakInheritanceList: BeforeComma # BeforeColon BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: true # false BreakConstructorInitializers: BeforeComma # BeforeColon @@ -55,7 +56,9 @@ DerivePointerAlignment: true DisableFormat: false ExperimentalAutoDetectBinPacking: false FixNamespaceComments: true -ForEachMacros: [ Q_FOREACH_THIS_LIST_MUST_BE_NON_EMPTY ] +ForEachMacros: + - Q_FOREACH_THIS_LIST_MUST_BE_NON_EMPTY +IncludeBlocks: Preserve IndentCaseLabels: true IndentPPDirectives: None IndentWidth: 2 @@ -67,14 +70,16 @@ MacroBlockBegin: '' MacroBlockEnd: '' MaxEmptyLinesToKeep: 1 NamespaceIndentation: None +# ObjCBinPackProtocolList: Never # ObjCBlockIndentWidth: 2 # ObjCSpaceAfterProperty: false -# ObjCSpaceBeforeProtocolList: false +# ObjCSpaceBeforeProtocolList: true PenaltyBreakAssignment: 2 PenaltyBreakBeforeFirstCallParameter: 1 PenaltyBreakComment: 300 PenaltyBreakFirstLessLess: 120 PenaltyBreakString: 1000 +PenaltyBreakTemplateDeclaration: 10 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 200 PointerAlignment: Left @@ -84,7 +89,11 @@ SortUsingDeclarations: false # true SpaceAfterCStyleCast: false SpaceAfterTemplateKeyword: true SpaceBeforeAssignmentOperators: true +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true SpaceBeforeParens: ControlStatements +SpaceBeforeRangeBasedForLoopColon: true SpaceInEmptyParentheses: false SpacesBeforeTrailingComments: 2 SpacesInAngles: false |