diff --git a/.editorconfig b/.editorconfig
index 7ec8c33e7..cc987b518 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,3 +19,6 @@ trim_trailing_whitespace = unset
 
 [*.gradle.kts]
 indent_size = 2
+
+[.gitmodules]
+indent_style = tab
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 709357c11..2feebebea 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: editorconfig-checker/action-editorconfig-checker@main
+      - uses: editorconfig-checker/action-editorconfig-checker@v2
       - run: editorconfig-checker
   commitlint:
     name: Lint commits for semantic-release
diff --git a/core/src/main/antlr/SubstraitType.g4 b/core/src/main/antlr/SubstraitType.g4
index 2cb158a5b..9323a598e 100644
--- a/core/src/main/antlr/SubstraitType.g4
+++ b/core/src/main/antlr/SubstraitType.g4
@@ -99,7 +99,7 @@ SingleQuote: '\'';
 
 
 Number
-  :  '-'? Int
+  : '-'? Int
   ;
 
 Identifier
@@ -107,75 +107,75 @@ Identifier
   ;
 
 LineComment
-	:	'//' ~[\r\n]* -> channel(HIDDEN)
-	;
+  : '//' ~[\r\n]* -> channel(HIDDEN)
+  ;
 
 BlockComment
-	:	(	'/*'
-			(	'/'* BlockComment
-			|	~[/*]
-			|	'/'+ ~[/*]
-			|	'*'+ ~[/*]
-			)*
-			'*'*
-			'*/'
-		) -> channel(HIDDEN)
-	;
+  : (  '/*'
+      ( '/'* BlockComment
+      | ~[/*]
+      | '/'+ ~[/*]
+      | '*'+ ~[/*]
+      )*
+      '*'*
+      '*/'
+   ) -> channel(HIDDEN)
+  ;
 
 Whitespace
-	:	[ \t]+ -> channel(HIDDEN)
-	;
+  : [ \t]+ -> channel(HIDDEN)
+  ;
 
 Newline
-	:	(	'\r' '\n'?
-		|	'\n'
-		)
-	;
+  : ( '\r' '\n'?
+    | '\n'
+    )
+  ;
 
 
 fragment Int
-  :  '1'..'9' Digit*
-  |  '0'
+  : '1'..'9' Digit*
+  | '0'
   ;
 
 fragment Digit
-  :  '0'..'9'
+  : '0'..'9'
   ;
 
 start: expr EOF;
 
 scalarType
-	: Boolean #Boolean
-	| I8 #i8
-	| I16 #i16
-	| I32 #i32
-	| I64 #i64
-	| FP32 #fp32
-	| FP64 #fp64
-	| String #string
-	| Binary #binary
-	| Timestamp #timestamp
-	| TimestampTZ #timestampTz
-	| Date #date
-	| Time #time
-	| IntervalDay #intervalDay
-	| IntervalYear #intervalYear
-	| UUID #uuid
-	| UserDefined Identifier #userDefined
-	;
+  : Boolean #Boolean
+  | I8 #i8
+  | I16 #i16
+  | I32 #i32
+  | I64 #i64
+  | FP32 #fp32
+  | FP64 #fp64
+  | String #string
+  | Binary #binary
+  | Timestamp #timestamp
+  | TimestampTZ #timestampTz
+  | Date #date
+  | Time #time
+  | IntervalDay #intervalDay
+  | IntervalYear #intervalYear
+  | UUID #uuid
+  | UserDefined Identifier #userDefined
+  ;
 
 parameterizedType
-	: FixedChar isnull='?'? Lt len=numericParameter Gt #fixedChar
-	| VarChar isnull='?'? Lt len=numericParameter Gt #varChar
-	| FixedBinary isnull='?'? Lt len=numericParameter Gt #fixedBinary
-	| Decimal isnull='?'? Lt precision=numericParameter Comma scale=numericParameter Gt #decimal
-	| PrecisionTimestamp isnull='?'? Lt precision=numericParameter Gt #precisionTimestamp
-	| PrecisionTimestampTZ isnull='?'? Lt precision=numericParameter Gt #precisionTimestampTZ
-	| Struct isnull='?'? Lt expr (Comma expr)* Gt #struct
-	| NStruct isnull='?'? Lt Identifier expr (Comma Identifier expr)* Gt #nStruct
-	| List isnull='?'? Lt expr Gt #list
-	| Map isnull='?'? Lt key=expr Comma value=expr Gt #map
-	;
+  : FixedChar isnull='?'? Lt len=numericParameter Gt #fixedChar
+  | VarChar isnull='?'? Lt len=numericParameter Gt #varChar
+  | FixedBinary isnull='?'? Lt len=numericParameter Gt #fixedBinary
+  | Decimal isnull='?'? Lt precision=numericParameter Comma scale=numericParameter Gt #decimal
+  | PrecisionTimestamp isnull='?'? Lt precision=numericParameter Gt #precisionTimestamp
+  | PrecisionTimestampTZ isnull='?'? Lt precision=numericParameter Gt #precisionTimestampTZ
+  | Struct isnull='?'? Lt expr (Comma expr)* Gt #struct
+  | NStruct isnull='?'? Lt Identifier expr (Comma Identifier expr)* Gt #nStruct
+  | List isnull='?'? Lt expr Gt #list
+  | Map isnull='?'? Lt key=expr Comma value=expr Gt #map
+  ;
 
 numericParameter
   : Number #numericLiteral