Add rules to order headers

Author: glynos

.clang-format

@@ -75,7 +75,7 @@ DerivePointerAlignment: false
 PointerAlignment: Left
 ReferenceAlignment: Left
 ReflowComments: true
-SortIncludes: false
+SortIncludes: CaseSensitive
 SortUsingDeclarations: false
 MaxEmptyLinesToKeep: 1
 
@@ -93,7 +93,24 @@ IndentRequiresClause: true
 SpaceAroundPointerQualifiers: Default
 
 # Include formatting
-IncludeBlocks: Preserve
+IncludeBlocks: Regroup
+IncludeCategories:
+  # 1. Main header (e.g., foo.cpp includes foo.hpp first)
+  - Regex:           '^".*\.hpp"$'
+    Priority:        1
+    SortPriority:    1
+  # 2. C++ standard library
+  - Regex:           '^<[^/]+>$'
+    Priority:        2
+    SortPriority:    2
+  # 3. Third-party libraries (uni-algo, catch2, nlohmann)
+  - Regex:           '^<(uni|catch2|nlohmann)/'
+    Priority:        3
+    SortPriority:    3
+  # 4. Project headers (skyr/...)
+  - Regex:           '^<skyr/'
+    Priority:        4
+    SortPriority:    4
 
 # Namespace formatting
 CompactNamespaces: false

include/skyr/concepts/url_concepts.hpp

@@ -6,9 +6,9 @@
 #ifndef SKYR_CONCEPTS_URL_CONCEPTS_HPP
 #define SKYR_CONCEPTS_URL_CONCEPTS_HPP
 
-#include <type_traits>
 #include <string>
 #include <string_view>
+#include <type_traits>
 
 namespace skyr {
 template <class T, class charT>

include/skyr/containers/static_vector.hpp

@@ -6,12 +6,12 @@
 #ifndef SKYR_CONTAINERS_STATIC_VECTOR_HPP
 #define SKYR_CONTAINERS_STATIC_VECTOR_HPP
 
-#include <cstdlib>
 #include <array>
-#include <type_traits>
-#include <optional>
 #include <cassert>
+#include <cstdlib>
 #include <new>
+#include <optional>
+#include <type_traits>
 
 namespace skyr {
 ///

include/skyr/core/check_input.hpp

@@ -6,10 +6,10 @@
 #ifndef SKYR_CORE_CHECK_INPUT_HPP
 #define SKYR_CORE_CHECK_INPUT_HPP
 
-#include <locale>
-#include <string>
 #include <algorithm>
 #include <iterator>
+#include <locale>
+#include <string>
 
 namespace skyr {
 constexpr static auto is_c0_control_or_space = [](auto byte) {

include/skyr/core/host.hpp

@@ -6,19 +6,19 @@
 #ifndef SKYR_CORE_HOST_HPP
 #define SKYR_CORE_HOST_HPP
 
-#include <variant>
-#include <string>
-#include <cassert>
 #include <algorithm>
+#include <cassert>
 #include <expected>
-#include <algorithm>
 #include <ranges>
+#include <string>
+#include <variant>
+
 #include <skyr/core/errors.hpp>
+#include <skyr/domain/domain.hpp>
 #include <skyr/network/ipv4_address.hpp>
 #include <skyr/network/ipv6_address.hpp>
-#include <skyr/percent_encoding/percent_encoded_char.hpp>
 #include <skyr/percent_encoding/percent_decode.hpp>
-#include <skyr/domain/domain.hpp>
+#include <skyr/percent_encoding/percent_encoded_char.hpp>
 
 namespace skyr {
 /// Represents a domain name in a [URL host](https://url.spec.whatwg.org/#host-representation)

include/skyr/core/parse.hpp

@@ -6,13 +6,14 @@
 #ifndef SKYR_CORE_PARSE_HPP
 #define SKYR_CORE_PARSE_HPP
 
-#include <system_error>
-#include <optional>
 #include <expected>
-#include <skyr/core/url_record.hpp>
-#include <skyr/core/errors.hpp>
+#include <optional>
+#include <system_error>
+
 #include <skyr/core/check_input.hpp>
+#include <skyr/core/errors.hpp>
 #include <skyr/core/url_parser_context.hpp>
+#include <skyr/core/url_record.hpp>
 
 namespace skyr {
 namespace details {

include/skyr/core/parse_path.hpp

@@ -8,6 +8,7 @@
 
 #include <string>
 #include <vector>
+
 #include <skyr/core/parse.hpp>
 
 namespace skyr {

include/skyr/core/parse_query.hpp

@@ -6,9 +6,10 @@
 #ifndef SKYR_CORE_PARSE_QUERY_HPP
 #define SKYR_CORE_PARSE_QUERY_HPP
 
+#include <ranges>
 #include <string>
 #include <vector>
-#include <ranges>
+
 #include <skyr/core/parse.hpp>
 
 namespace skyr {

include/skyr/core/schemes.hpp

@@ -6,9 +6,9 @@
 #ifndef SKYR_CORE_URL_SCHEMES_HPP
 #define SKYR_CORE_URL_SCHEMES_HPP
 
-#include <string_view>
 #include <cstdint>
 #include <optional>
+#include <string_view>
 
 namespace skyr {
 /// \param scheme

include/skyr/core/serialize.hpp

@@ -8,6 +8,7 @@
 
 #include <format>
 #include <ranges>
+
 #include <skyr/core/url_record.hpp>
 
 namespace skyr {