Configure clang-format

Author: Avasam

.clang-format

@@ -1,20 +1,20 @@
 # A clang-format style that approximates Python's PEP 7
 # Useful for IDE integration
+# https://clang.llvm.org/docs/ClangFormatStyleOptions.html#configurable-format-style-options
+Language: Cpp
 BasedOnStyle: Google
-AllowShortIfStatementsOnASingleLine: false
+
 AlignAfterOpenBracket: Align
+AllowShortIfStatementsOnASingleLine: false
+AlwaysBreakAfterReturnType: None # Don't break after return type
 BreakBeforeBraces: Stroustrup
 ColumnLimit: 120
 DerivePointerAlignment: false
 IndentWidth: 4
-Language: Cpp
 PointerAlignment: Right
 ReflowComments: true
+SortIncludes: false # Sorting includes breaks build
 SpaceBeforeParens: ControlStatements
 SpacesInParentheses: false
 TabWidth: 4
 UseTab: Never
-# sorting includes breaks build
-SortIncludes: false
-# don't break after return type
-AlwaysBreakAfterReturnType: None

.github/workflows/main.yml

@@ -110,14 +110,18 @@ jobs:
           python-version: "3.8"
           cache: pip
           cache-dependency-path: .github/workflows/main.yml
-      - run: pip install pycln
+      - run: pip install clang-format pycln
       - run: pycln . --config=pycln.toml --check
       - uses: chartboost/ruff-action@v1
         with:
           version: "0.4.5"
       - uses: psf/black@stable
         with:
           options: "--fast --check --diff --verbose"
+      - run: | # Too many files to fit in a single command, exclude vendored Scintilla and mapi_headers
+          clang-format --Werror --dry-run $(git ls-files '*.cpp')
+          clang-format --Werror --dry-run $(git ls-files '*.h' ':!:Pythonwin/Scintilla/' ':!:com/win32comext/mapi/src/mapi_headers/')
+        shell: powershell
 
   mypy:
     runs-on: windows-2019

.pre-commit-config.yaml

@@ -34,6 +34,14 @@ repos:
     hooks:
       - id: black
         verbose: true
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v18.1.5
+    hooks:
+      - id: clang-format
+        # Supports a lot more filetypes, but only tagging those we use
+        # https://github.com/pre-commit/mirrors-clang-format/blob/main/.pre-commit-hooks.yaml#L6
+        types: [c++]
+
 
 # Vendored
 exclude: ^(com/win32comext/mapi/src/mapi_headers/|Pythonwin/Scintilla/).*$

win32/test/test_win32gui.py

@@ -72,7 +72,7 @@ def enum_callback_sle(cls, handle, data):
 
     @classmethod
     def enum_callback_exc(cls, handle, data):
-        raise ValueError()
+        raise ValueError
 
     @classmethod
     def enum_callback(cls, handle, data):