From: Aman Gupta <redacted>
Date: Sun, 20 Jul 2025 11:42:34 +0000 (+0800)
Subject: Clang-format: local files first + fix BinPacking (#14779)
X-Git-Tag: upstream/0.0.6073~128
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=938b785764683c298e7805e712f8728489cc2f18;p=pkg%2Fggml%2Fsources%2Fllama.cpp

Clang-format: local files first + fix BinPacking (#14779)
---

diff --git a/.clang-format b/.clang-format
index 45232b80..47d96b6b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -22,8 +22,8 @@ AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: Inline
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakBeforeMultilineStrings: true
-BinPackArguments: true
-BinPackParameters: true # OnePerLine
+BinPackArguments: false
+BinPackParameters: false # OnePerLine
 BitFieldColonSpacing: Both
 BreakBeforeBraces: Custom # Attach
 BraceWrapping:
@@ -70,15 +70,18 @@ ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^<.*\.h>'
+  - Regex:           '".*"'
     Priority:        1
     SortPriority:    0
-  - Regex:           '^<.*'
+  - Regex:           '^<.*\.h>'
     Priority:        2
     SortPriority:    0
-  - Regex:           '.*'
+  - Regex:           '^<.*'
     Priority:        3
     SortPriority:    0
+  - Regex:           '.*'
+    Priority:        4
+    SortPriority:    0
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IncludeIsMainSourceRegex: ''
 IndentAccessModifiers: false