From e6414421491c04855c02b15beab9cded38d140eb Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 23 Jan 2025 11:38:03 -0500
Subject: [PATCH] clang-format.bash: update to clang-format-18

The `.clang-format` configuration needs no changes to make the
version 18 format close to what version 15 produced before.

Issue: #26123
---
 .clang-format                       | 2 +-
 .gitattributes                      | 2 +-
 Help/dev/source.rst                 | 2 +-
 Utilities/.gitattributes            | 2 +-
 Utilities/Scripts/clang-format.bash | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.clang-format b/.clang-format
index 813a84d87c..8cac3e161b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,5 @@
 ---
-# This configuration requires clang-format version 15 exactly.
+# This configuration requires clang-format version 18 exactly.
 BasedOnStyle: Mozilla
 AlignOperands: false
 AllowShortFunctionsOnASingleLine: InlineOnly
diff --git a/.gitattributes b/.gitattributes
index 5e2a5460c6..7aac159123 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,7 +4,7 @@
 .editorconfig    export-ignore
 
 # Custom attribute to mark sources as using our C code style.
-[attr]our-c-style  whitespace=tab-in-indent  format.clang-format=15
+[attr]our-c-style  whitespace=tab-in-indent  format.clang-format=18
 
 # Custom attribute to mark sources as generated.
 # Do not perform whitespace checks.  Do not format.
diff --git a/Help/dev/source.rst b/Help/dev/source.rst
index 6bacd09420..c3c55a3282 100644
--- a/Help/dev/source.rst
+++ b/Help/dev/source.rst
@@ -9,7 +9,7 @@ See documentation on `CMake Development`_ for more information.
 C++ Code Style
 ==============
 
-We use `clang-format`_ version **15** to define our style for C++ code in
+We use `clang-format`_ version **18** to define our style for C++ code in
 the CMake source tree.  See the `.clang-format`_ configuration file for our
 style settings.  Use the `Utilities/Scripts/clang-format.bash`_ script to
 format source code.  It automatically runs ``clang-format`` on the set of
diff --git a/Utilities/.gitattributes b/Utilities/.gitattributes
index c43b55d14f..b6c6212023 100644
--- a/Utilities/.gitattributes
+++ b/Utilities/.gitattributes
@@ -5,4 +5,4 @@ SetupForDevelopment.sh  export-ignore
 # Do not format third-party sources.
 /KWIML/**       -format.clang-format
 /cm*/**         -format.clang-format
-/cmcurl/curltest.c format.clang-format=15
+/cmcurl/curltest.c format.clang-format=18
diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash
index 27ed40f8d4..88d8f1ee22 100755
--- a/Utilities/Scripts/clang-format.bash
+++ b/Utilities/Scripts/clang-format.bash
@@ -78,7 +78,7 @@ test "$#" = 0 || die "$usage"
 
 # Find a default tool.
 tools='
-  clang-format-15
+  clang-format-18
   clang-format
 '
 if test "x$clang_format" = "x"; then
@@ -96,8 +96,8 @@ if ! type -p "$clang_format" >/dev/null; then
     exit 1
 fi
 
-if ! "$clang_format" --version | grep 'clang-format version 15' >/dev/null 2>/dev/null; then
-    echo "clang-format version 15 is required (exactly)"
+if ! "$clang_format" --version | grep 'clang-format version 18' >/dev/null 2>/dev/null; then
+    echo "clang-format version 18 is required (exactly)"
     exit 1
 fi
 
@@ -116,7 +116,7 @@ $git_ls |
 
   # Select sources with our attribute.
   git check-attr --stdin format.clang-format |
-    sed -n '/: format\.clang-format: \(set\|15\)$/ {s/:[^:]*:[^:]*$//p}'  |
+    sed -n '/: format\.clang-format: \(set\|18\)$/ {s/:[^:]*:[^:]*$//p}'  |
 
   # Update sources in-place.
   xargs -d '\n' "$clang_format" -i