Clang format check not properly working for code behind compiler directives

[SaschaWillems]

I've been battling Clang format for a larger PR and it seems that the Clang format check is not properly working for code that is guarded by a compiler define.

E.g. this code:

#ifdef SOMETHING
#else
	VkRenderPassBeginInfo render_pass_begin_info    = vkb::initializers::render_pass_begin_info();
	render_pass_begin_info.renderPass               = render_pass;
	render_pass_begin_info.renderArea.offset.x      = 0;
	render_pass_begin_info.renderArea.offset.y      = 0;
	render_pass_begin_info.renderArea.extent.width  = width;
	render_pass_begin_info.renderArea.extent.height = height;
	render_pass_begin_info.clearValueCount          = 5;
	render_pass_begin_info.pClearValues             = clear_values;
	render_pass_begin_info.framebuffer              = framebuffers[current_image_index];
#endif

Triggers a Clang format CI failrure, even though the formatting was chnaged like that Clang format itself. And this looks exactly like our formatting guidelines

Reverting this by hand to look like this:

#ifdef SOMETHING
#else
	VkRenderPassBeginInfo render_pass_begin_info = vkb::initializers::render_pass_begin_info();
	render_pass_begin_info.renderPass = render_pass;
	render_pass_begin_info.renderArea.offset.x = 0;
	render_pass_begin_info.renderArea.offset.y = 0;
	render_pass_begin_info.renderArea.extent.width = width;
	render_pass_begin_info.renderArea.extent.height = height;
	render_pass_begin_info.clearValueCount = 5;
	render_pass_begin_info.pClearValues = clear_values;
	render_pass_begin_info.framebuffer = framebuffers[current_image_index];

Fixes CI.

IMO that's wrong and needs to be fixed, otherwise every time I do a local Clang format for files changed I need to wait for CI to fail, decipher a cryptic message and manually fix stuff again.

[gpx1000]

Give this patch a try; see if it works for your needs.

Index: .clang-format
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.clang-format b/.clang-format
--- a/.clang-format	(revision f5daf09c2514b1bd30ffdf3e12fd6eaf857b69ca)
+++ b/.clang-format	(date 1780290022608)
@@ -3,8 +3,16 @@
 # BasedOnStyle:  LLVM
 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: true
-AlignConsecutiveDeclarations: true
+AlignConsecutiveAssignments:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: true
+  AlignCompound: true
+  PadOperators: true
+AlignConsecutiveDeclarations:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: true
 AlignEscapedNewlines: Left
 AlignOperands:   true
 AlignTrailingComments: true

Index: .pre-commit-config.yaml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
--- a/.pre-commit-config.yaml	(revision f5daf09c2514b1bd30ffdf3e12fd6eaf857b69ca)
+++ b/.pre-commit-config.yaml	(date 1780289935777)
@@ -7,7 +7,7 @@
     -   id: check-added-large-files
     -   id: trailing-whitespace
 -   repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 'v15.0.7'
+    rev: 'v18.1.8'
     hooks:
     -   id: clang-format
         'types_or': [c++, c]

[SaschaWillems]

Sorry for the late reply. Not sure what patch format that is, but trying to apply this via git tells me it's corrupt:

error: corrupt patch at line 27

Any ideas?