ref: 30b1abd6e6763937e7145ff0886dbb138bba61b2
parent: ee01b78ddd88a9156d6b926fc932d3cdfc070df9
author: James Zern <jzern@google.com>
date: Wed Sep 7 16:56:01 EDT 2016
.clang-format: update to 3.8.1 based on --style=Google with the following differences: 3a4 > # Generated with clang-format 3.8.1 13c14 < AllowShortCaseLabelsOnASingleLine: false --- > AllowShortCaseLabelsOnASingleLine: true 41c42 < ConstructorInitializerAllOnOneLineOrOnePerLine: true --- > ConstructorInitializerAllOnOneLineOrOnePerLine: false 44,45c45,46 < Cpp11BracedListStyle: true < DerivePointerAlignment: true --- > Cpp11BracedListStyle: false > DerivePointerAlignment: false 73c74 < PointerAlignment: Left --- > PointerAlignment: Right 75c76 < SortIncludes: true --- > SortIncludes: false SortIncludes will like be enabled in a future commit Change-Id: I5c404f44081b65354e7f526411c91fbbe31ac5af
--- a/.clang-format
+++ b/.clang-format
@@ -1,10 +1,11 @@
---
Language: Cpp
# BasedOnStyle: Google
-# Generated with clang-format 3.7.1
+# Generated with clang-format 3.8.1
AccessModifierOffset: -1
-AlignAfterOpenBracket: true
+AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
AlignEscapedNewlinesLeft: true
AlignOperands: true
AlignTrailingComments: true
@@ -15,10 +16,23 @@
AllowShortIfStatementsOnASingleLine: true
AllowShortLoopsOnASingleLine: true
AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: true
+BraceWrapping:
+ AfterClass: false
+ AfterControlStatement: false
+ AfterEnum: false
+ AfterFunction: false
+ AfterNamespace: false
+ AfterObjCDeclaration: false
+ AfterStruct: false
+ AfterUnion: false
+ BeforeCatch: false
+ BeforeElse: false
+ IndentBraces: false
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
@@ -33,6 +47,13 @@
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories:
+ - Regex: '^<.*\.h>'
+ Priority: 1
+ - Regex: '^<.*'
+ Priority: 2
+ - Regex: '.*'
+ Priority: 3
IndentCaseLabels: true
IndentWidth: 2
IndentWrappedFunctionNames: false
@@ -51,6 +72,8 @@
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Right
+ReflowComments: true
+SortIncludes: false
SpaceAfterCStyleCast: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements