From 7f0d26b0214e923aa76327d5be5107f6aa0f05d8 Mon Sep 17 00:00:00 2001
From: Egor Tensin <egor@tensin.name>
Date: Fri, 12 Jun 2026 17:45:47 +0200
Subject: unify my .clang-format files

---
 .clang-format            | 11 +++++++++--
 .github/workflows/ci.yml |  7 +++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.clang-format b/.clang-format
index 49884a4..cc61b8a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -2,19 +2,26 @@
 Language: Cpp
 BasedOnStyle: Chromium
 
+IndentWidth: 4
+
 AccessModifierOffset: -4
+AlignConsecutiveMacros: AcrossComments
 AllowShortFunctionsOnASingleLine: Empty
+BinPackArguments: false
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeComma
+BreakStringLiterals: false
 ColumnLimit: 100
 IncludeBlocks: Regroup
-IndentWidth: 4
 SpacesBeforeTrailingComments: 1
+WrapNamespaceBodyWithEmptyLines: Always
 
 IncludeCategories:
   - Regex: '^".+'
     Priority: 1
   - Regex: '^<winapi\/'
     Priority: 2
-  - Regex: '^<boost\/|^<SafeInt\.'
+  - Regex: '^<boost\/'
     Priority: 3
   - Regex: '^<.*\.h>$'
     Priority: 4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 382c829..0adfd41 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,8 +17,15 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
+      - name: Set up clang-format
+        uses: egor-tensin/setup-clang@v2
+        with:
+          # To use the latest clang-format features:
+          version: 22
       - name: Run clang-format
         uses: egor-tensin/clang-format@v1
+        with:
+          version: 22
 
   build:
     strategy:
-- 
cgit v1.3