commit 1aedab2391cd883e95ebde0129fcaf88d7f16233
author Patrick Venture <venture@google.com> Mon Sep 10 14:41:45 2018 -0700
committer Patrick Venture <venture@google.com> Mon Sep 10 14:45:39 2018 -0700
tree eea23a255f0d3ef8ee0007982e910623716b80ac
parent 004fb909202e39b34cb72d31390facd525b04c9b

update clang-format

Change-Id: If3508ffd09d7bd11fbf13bf449cc3c39efea90bb
Signed-off-by: Patrick Venture <venture@google.com>

.clang-format

diff --git a/.clang-format b/.clang-format
index 8ad55d0..ea71ad6 100644
--- a/.clang-format
+++ b/.clang-format
@@ -42,12 +42,26 @@
 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 @@
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
 ReflowComments:  true
-SortIncludes:    false
+SortIncludes:    true
+SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements