Update formatting setup

Author: st0012

.clang-format

@@ -1,11 +1,75 @@
 ---
-BasedOnStyle: LLVM
+# Explicitly define all formatting options to ensure consistency across clang-format versions
 Language: Cpp
+# Don't base on any style to avoid version-specific behaviors
+# BasedOnStyle: LLVM
 
+# Indentation
 UseTab: Never
 IndentWidth: 2
+TabWidth: 2
+BreakBeforeBraces: Attach
+IndentCaseLabels: false
+NamespaceIndentation: None
+ContinuationIndentWidth: 2
+IndentPPDirectives: None
+IndentWrappedFunctionNames: false
+AccessModifierOffset: -2
+
+# Alignment
+AlignAfterOpenBracket: DontAlign
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: false
+AlignEscapedNewlines: Left
+AlignOperands: false
+AlignTrailingComments: true
+DerivePointerAlignment: false
+PointerAlignment: Right
+
+# Wrapping and Breaking
 ColumnLimit: 0
-SortIncludes: Never
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: No
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: false
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
 Cpp11BracedListStyle: false
+ReflowComments: false
+SortIncludes: Never
+
+# The one rule we want to enable
 SpaceAfterCStyleCast: true
-AllowShortIfStatementsOnASingleLine: Always
+
+# Other Spaces
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInParentheses: false
+SpacesInSquareBrackets: false

.github/workflows/clang-format.yml

@@ -30,7 +30,14 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libdb-dev curl autoconf automake m4 libtool clang-format
+          sudo apt-get install -y libdb-dev curl autoconf automake m4 libtool
+      - name: Install clang-format from LLVM
+        run: |
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+          sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main"
+          sudo apt-get update
+          sudo apt-get install -y clang-format
+          clang-format --version
       - name: Install Re2c
         run: |
           cd /tmp
@@ -50,5 +57,6 @@ jobs:
           bin/setup
       - name: Check C code formatting
         run: |
+          clang-format --version
           bundle exec rake templates
           bundle exec rake format:c_check

Rakefile

@@ -106,8 +106,17 @@ namespace :format do
 
     needs_format = false
     files.each do |file|
-      unless system("clang-format --dry-run -Werror -style=file #{file} >/dev/null 2>&1")
+      formatted = `clang-format -style=file #{file}`
+      original = File.read(file)
+
+      if formatted != original
         puts "❌ #{file} needs formatting"
+        puts "Diff:"
+        # Save formatted version to temp file and run diff
+        temp_file = "#{file}.formatted"
+        File.write(temp_file, formatted)
+        system("diff -u #{file} #{temp_file}")
+        File.unlink(temp_file)
         needs_format = true
       end
     end