From: Ondřej Surý <ondrej@isc.org>
Date: Mon, 9 Mar 2020 14:26:54 +0000 (+0100)
Subject: Improve the #include block sorting
X-Git-Tag: v9.17.1~63^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5071c47fbdfe5621dc4b1ab77bc2e5e5dd3b76d3;p=thirdparty%2Fbind9.git

Improve the #include block sorting

The IncludeCategories was incomplete, it missed pk11/ and dst/ headers
and the rule that put "" header after all <> headers was broken.
---

diff --git a/.clang-format b/.clang-format
index 3e13625f085..3ed176aeb7a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -33,23 +33,35 @@ PointerBindsToType: false
 IncludeBlocks: Regroup
 IncludeCategories:
   - Regex:           '^<isc/'
-    Priority:        2
+    Priority:        5
+  - Regex:           '^<(pk11|pkcs11)/'
+    Priority:        10
   - Regex:           '^<dns/'
-    Priority:        3
-  - Regex:           '^<iscccc/'
-    Priority:        4
+    Priority:        15
+  - Regex:           '^<dst/'
+    Priority:        20
+  - Regex:           '^<isccc/'
+    Priority:        25
   - Regex:           '^<isccfg/'
-    Priority:        5
+    Priority:        30
   - Regex:           '^<ns/'
-    Priority:        6
-  - Regex:           '^<bind9/)'
-    Priority:        7
-  - Regex:           '^(<[^/]*)/)'
-    Priority:        8
-  - Regex:           '<[[:alnum:].]+>'
+    Priority:        35
+  - Regex:           '^<irs/'
+    Priority:        40
+  - Regex:           '^<bind9/'
+    Priority:        45
+  - Regex:           '^<(dig|named|rndc|confgen|dlz)/'
+    Priority:        50
+  - Regex:           '^<dlz_'
+    Priority:        55
+  - Regex:           '^".*"'
+    Priority:        99
+  - Regex:           '<openssl/'
+    Priority:        1
+  - Regex:           '<(mysql|protobuf-c)/'
     Priority:        1
-  - Regex:           '".*"'
-    Priority:        9
+  - Regex:           '.*'
+    Priority:        0
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakAssignment: 30