diff options
author | Patrick Venture <venture@google.com> | 2018-08-31 09:33:09 -0700 |
---|---|---|
committer | Patrick Venture <venture@google.com> | 2018-09-04 16:43:17 -0700 |
commit | 3d6d3182ee0b0e88b81fbbbe5c91dea3e99425a9 (patch) | |
tree | e4ce167e617e988157a6ea8bfa9de579ebfcf0b8 /.clang-format | |
parent | ac8039592ad4b58edbf79900bf41a1faabea3fa2 (diff) | |
download | phosphor-dbus-monitor-3d6d3182ee0b0e88b81fbbbe5c91dea3e99425a9.tar.gz phosphor-dbus-monitor-3d6d3182ee0b0e88b81fbbbe5c91dea3e99425a9.zip |
update .clang-format
Added the header inclusion order to the .clang-format file generated
these changes.
Change-Id: I4f51a20f469de431ee6a5ba78e3f4da39c980fab
Signed-off-by: Patrick Venture <venture@google.com>
Diffstat (limited to '.clang-format')
-rw-r--r-- | .clang-format | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/.clang-format b/.clang-format index bbc1bb1..ea71ad6 100644 --- a/.clang-format +++ b/.clang-format @@ -17,7 +17,7 @@ AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: false +AlwaysBreakTemplateDeclarations: true BinPackArguments: true BinPackParameters: true BraceWrapping: @@ -42,12 +42,26 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 Cpp11BracedListStyle: true -DerivePointerAlignment: true +DerivePointerAlignment: false PointerAlignment: Left DisableFormat: false ExperimentalAutoDetectBinPacking: false FixNamespaceComments: true ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +IncludeBlocks: Regroup +IncludeCategories: + - Regex: '^[<"](gtest|gmock)' + Priority: 5 + - Regex: '^"config.h"' + Priority: -1 + - Regex: '^".*\.hpp"' + Priority: 1 + - Regex: '^<.*\.h>' + Priority: 2 + - Regex: '^<.*' + Priority: 3 + - Regex: '.*' + Priority: 4 IndentCaseLabels: true IndentWidth: 4 IndentWrappedFunctionNames: true @@ -65,9 +79,9 @@ PenaltyBreakFirstLessLess: 120 PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 -PointerAlignment: Right ReflowComments: true -SortIncludes: false +SortIncludes: true +SortUsingDeclarations: true SpaceAfterCStyleCast: false SpaceBeforeAssignmentOperators: true SpaceBeforeParens: ControlStatements |