Merge branch 'develop-BA-FS26' into 'develop'HEADdevelop

Merge of BA-FS26 branch into develop

See merge request teachos/kernel!49

1 files changed, 25 insertions, 9 deletions

diff --git a/.clang-format b/.clang-format
index e54cb03..57204cc 100644
--- a/.clang-format
+++ b/.clang-format
@@ -55,23 +55,39 @@ DerivePointerAlignment: "false"
 FixNamespaceComments: "true"
 IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: 'kapi/[[:alnum:]._\/]+\.hpp'
+    # Platform Headers
+  - Regex: 'arch/[[:alnum:]._\/]+\.hpp'
     Priority: 100
-  - Regex: 'x86_64/[[:alnum:]._\/]+\.hpp'
-    Priority: 110
-  - Regex: '"[[:alnum:]._\/]+\.hpp"'
-    Priority: 300
-  - Regex: '<kstd/[[:alnum:]._\/]+>'
-    Priority: 400
-  - Regex: '<[[:alnum:]._\/]+\.hpp>'
+    # Kernel Headers
+  - Regex: 'kernel/[[:alnum:]._\/]+\.hpp'
+    Priority: 125
+    # KAPI Headers
+  - Regex: 'kapi/[[:alnum:]._\/]+\.hpp'
+    Priority: 150
+    # Library Headers
+  - Regex: 'acpi/[[:alnum:]._\/]+\.hpp'
+    Priority: 200
+  - Regex: 'elf/[[:alnum:]._\/]+\.hpp'
+    Priority: 210
+  - Regex: 'kstd/[[:alnum:]._\/]+(\.hpp)?'
+    Priority: 220
+  - Regex: 'multiboot2/[[:alnum:]._\/]+\.hpp'
+    Priority: 230
+    # Catch2 Headers
+  - Regex: 'catch2/[[:alnum:]._\/]+\.hpp'
     Priority: 600
-  - Regex: '<[[:alnum:]._]+(?!\.(h|hpp))>'
+    # Standard Headers
+  - Regex: '<[[:alnum:]._]+>'
     Priority: 900
+    # Local Headers
+  - Regex: '".*"'
+    Priority: 10
 IndentCaseLabels: "true"
 IndentPPDirectives: None
 IndentWidth: "2"
 KeepEmptyLinesAtTheStartOfBlocks: "false"
 Language: Cpp
+MainIncludeChar: "Any"
 MaxEmptyLinesToKeep: "1"
 NamespaceIndentation: All
 PointerAlignment: Middle