godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #85837 from akien-mga/clang-format-16 

Style: Mark clang-format 16 as supported for pre-commit hook
This commit is contained in:
Rémi Verschelde 2024-01-05 12:04:44 +01:00
parent 1e676e4a0a 49f4860ce3
commit e72e63a6b5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gles3/shaders/scene.glsl
View File

@ -608,7 +608,6 @@ layout(std140) uniform GlobalShaderUniformData { //ubo:1
}; };
/* Material Uniforms */ /* Material Uniforms */
#ifdef MATERIAL_UNIFORMS_USED #ifdef MATERIAL_UNIFORMS_USED
/* clang-format off */ /* clang-format off */

5
editor/project_converter_3_to_4.cpp
View File

@ -1045,7 +1045,7 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
// get_object_of_execution // get_object_of_execution
{ {
{ String base = "var roman = kieliszek."; String base = "var roman = kieliszek.";
String expected = "kieliszek."; String expected = "kieliszek.";
String got = get_object_of_execution(base); String got = get_object_of_execution(base);
if (got != expected) { if (got != expected) {
@ -1080,7 +1080,7 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
} }
valid = valid && (got == expected); valid = valid && (got == expected);
} }
}
// get_starting_space // get_starting_space
{ {
String base = "\t\t\t var roman = kieliszek."; String base = "\t\t\t var roman = kieliszek.";
@ -1091,6 +1091,7 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
} }
valid = valid && (got == expected); valid = valid && (got == expected);
} }
// Parse Arguments // Parse Arguments
{ {
String line = "( )"; String line = "( )";

2
misc/hooks/README.md
View File

@ -29,7 +29,7 @@ so they should work out of the box on Linux/macOS.
##### clang-format ##### clang-format
- Download LLVM for Windows (version 13 or later) from - Download LLVM for Windows (version 13 or later) from
<https://releases.llvm.org/download.html> <https://github.com/llvm/llvm-project/releases>
- Make sure LLVM is added to the `PATH` during installation - Make sure LLVM is added to the `PATH` during installation
##### black ##### black

2
misc/hooks/pre-commit-clang-format
View File

@ -80,7 +80,7 @@ fi
# To get consistent formatting, we recommend contributors to use the same # To get consistent formatting, we recommend contributors to use the same
# clang-format version as CI. # clang-format version as CI.
RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="13" RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="13"
RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="15" RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="16"
if [ ! -x "$CLANG_FORMAT" ] ; then if [ ! -x "$CLANG_FORMAT" ] ; then
message="Error: clang-format executable not found. Please install clang-format $RECOMMENDED_CLANG_FORMAT_MAJOR_MAX." message="Error: clang-format executable not found. Please install clang-format $RECOMMENDED_CLANG_FORMAT_MAJOR_MAX."