seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style: Mark clang-format 16 as supported for pre-commit hook

Browse Source 
It only introduced a difference in a .glsl file, which I've worked
around by removing an empty line. This keeps formatting consistent
between clang-format 15 and 16.

Also added a change in the 3-to-4 project converter to fix bogus
formatting in clang-format < 17.
This commit is contained in:
Rémi Verschelde
2023-12-06 13:12:18 +01:00
parent 2f73a059ce
commit 49f4860ce3
4 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -604,8 +604,7 @@ layout(std140) uniform GlobalShaderUniformData { //ubo:1
vec4 global_shader_uniforms[MAX_GLOBAL_SHADER_UNIFORMS];
};
/* Material Uniforms */
/* Material Uniforms */
#ifdef MATERIAL_UNIFORMS_USED
/* clang-format off */

45
editor/project_converter_3_to_4.cpp
View File

@ -1044,15 +1044,15 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
// get_object_of_execution
{
{ String base = "var roman = kieliszek.";
String base = "var roman = kieliszek.";
String expected = "kieliszek.";
String got = get_object_of_execution(base);
if (got != expected) {
ERR_PRINT(vformat("Failed to get proper data from get_object_of_execution. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", base, expected, expected.size(), got, got.size()));
}
valid = valid && (got == expected);
}
{
}
{
String base = "r.";
String expected = "r.";
String got = get_object_of_execution(base);
@ -1060,8 +1060,8 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
ERR_PRINT(vformat("Failed to get proper data from get_object_of_execution. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", base, expected, expected.size(), got, got.size()));
}
valid = valid && (got == expected);
}
{
}
{
String base = "mortadela(";
String expected = "";
String got = get_object_of_execution(base);
@ -1069,8 +1069,8 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
ERR_PRINT(vformat("Failed to get proper data from get_object_of_execution. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", base, expected, expected.size(), got, got.size()));
}
valid = valid && (got == expected);
}
{
}
{
String base = "var node = $world/ukraine/lviv.";
String expected = "$world/ukraine/lviv.";
String got = get_object_of_execution(base);
@ -1078,10 +1078,10 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
ERR_PRINT(vformat("Failed to get proper data from get_object_of_execution. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", base, expected, expected.size(), got, got.size()));
}
valid = valid && (got == expected);
}
}
// get_starting_space
{
}
// get_starting_space
{
String base = "\t\t\t var roman = kieliszek.";
String expected = "\t\t\t";
String got = get_starting_space(base);
@ -1089,9 +1089,10 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
ERR_PRINT(vformat("Failed to get proper data from get_object_of_execution. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", base, expected, expected.size(), got, got.size()));
}
valid = valid && (got == expected);
}
// Parse Arguments
{
}
// Parse Arguments
{
String line = "( )";
Vector<String> got_vector = parse_arguments(line);
String got = "";
@ -1103,8 +1104,8 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
ERR_PRINT(vformat("Failed to get proper data from parse_arguments. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", line, expected, expected.size(), got, got.size()));
}
valid = valid && (got == expected);
}
{
}
{
String line = "(a , b , c)";
Vector<String> got_vector = parse_arguments(line);
String got = "";
@ -1116,8 +1117,8 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
ERR_PRINT(vformat("Failed to get proper data from parse_arguments. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", line, expected, expected.size(), got, got.size()));
}
valid = valid && (got == expected);
}
{
}
{
String line = "(a , \"b,\" , c)";
Vector<String> got_vector = parse_arguments(line);
String got = "";
@ -1129,8 +1130,8 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
ERR_PRINT(vformat("Failed to get proper data from parse_arguments. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", line, expected, expected.size(), got, got.size()));
}
valid = valid && (got == expected);
}
{
}
{
String line = "(a , \"(,),,,,\" , c)";
Vector<String> got_vector = parse_arguments(line);
String got = "";
@ -1142,9 +1143,9 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
ERR_PRINT(vformat("Failed to get proper data from parse_arguments. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", line, expected, expected.size(), got, got.size()));
}
valid = valid && (got == expected);
}
}
return valid;
return valid;
}
// Validate in all arrays if names don't do cyclic renames "Node" -> "Node2D" | "Node2D" -> "2DNode"

2
misc/hooks/README.md
View File

@ -29,7 +29,7 @@ so they should work out of the box on Linux/macOS.
##### clang-format
- 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
##### 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
# clang-format version as CI.
RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="13"
RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="15"
RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="16"
if [ ! -x "$CLANG_FORMAT" ] ; then
message="Error: clang-format executable not found. Please install clang-format $RECOMMENDED_CLANG_FORMAT_MAJOR_MAX."