Switch clang-format IncludeBlocks to Preserve.

clang-format now reorders includes. It used to simply sort within blocks, but later it added a "regroup" option. The regroup option is a bit aggressive and does not take into account our project headers being referenced in <system/header.h> style. (It also won't be able to recognize the header corresponding to the source file, but perhaps we should drop that rule.) For now, just revert it to Preserve. Change-Id: Ief82b5c3f91c16a8def14f91ef6bf6cde502bb79 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/42265 Reviewed-by: Adam Langley <[email protected]>
ENQT-GmbH · Jul 23, 2020 · 54858b6 · 54858b6
1 parent d054e1b
commit 54858b6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.clang-format b/.clang-format
@@ -4,4 +4,8 @@ AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 DerivePointerAlignment: false
 PointerAlignment: Right
+# TODO(davidben): The default for Google style is now Regroup, but the default
+# IncludeCategories does not recognize <openssl/header.h>. We should
+# reconfigure IncludeCategories to match. For now, keep it at Preserve.
+IncludeBlocks: Preserve