From 30b1abd6e6763937e7145ff0886dbb138bba61b2 Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 7 Sep 2016 20:56:01 -0700 Subject: [PATCH] .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 --- .clang-format | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 67d2f6240..d91cf89aa 100644 --- 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 @@ AllowShortFunctionsOnASingleLine: All 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 @@ DerivePointerAlignment: false 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 @@ PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 200 PointerAlignment: Right +ReflowComments: true +SortIncludes: false SpaceAfterCStyleCast: false SpaceBeforeAssignmentOperators: true SpaceBeforeParens: ControlStatements