summaryrefslogtreecommitdiffstats
path: root/editor/project_converter_3_to_4.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-12-06 13:12:18 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-12-06 13:26:53 +0100
commit49f4860ce3e4122e17c869229701f7d86aa6956c (patch)
tree27c9dc9a7f00663854def367f6d085604ff98e20 /editor/project_converter_3_to_4.cpp
parent2f73a059cefadcd944b6874f2557ec82e46a562d (diff)
downloadredot-engine-49f4860ce3e4122e17c869229701f7d86aa6956c.tar.gz
Style: Mark clang-format 16 as supported for pre-commit hook
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.
Diffstat (limited to 'editor/project_converter_3_to_4.cpp')
-rw-r--r--editor/project_converter_3_to_4.cpp199
1 files changed, 100 insertions, 99 deletions
diff --git a/editor/project_converter_3_to_4.cpp b/editor/project_converter_3_to_4.cpp
index bea865af13..be1022533e 100644
--- a/editor/project_converter_3_to_4.cpp
+++ b/editor/project_converter_3_to_4.cpp
@@ -1044,107 +1044,108 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
// get_object_of_execution
{
- { 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()));
+ 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);
+ 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 = "mortadela(";
+ String expected = "";
+ 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 = "var node = $world/ukraine/lviv.";
+ String expected = "$world/ukraine/lviv.";
+ 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);
+ }
+
+ // get_starting_space
+ {
+ String base = "\t\t\t var roman = kieliszek.";
+ String expected = "\t\t\t";
+ String got = get_starting_space(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);
}
- valid = valid && (got == expected);
-}
-{
- String base = "r.";
- String expected = "r.";
- 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 = "mortadela(";
- String expected = "";
- 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 = "var node = $world/ukraine/lviv.";
- String expected = "$world/ukraine/lviv.";
- 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);
-}
-}
-// get_starting_space
-{
- String base = "\t\t\t var roman = kieliszek.";
- String expected = "\t\t\t";
- String got = get_starting_space(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);
-}
-// Parse Arguments
-{
- String line = "( )";
- Vector<String> got_vector = parse_arguments(line);
- String got = "";
- String expected = "";
- for (String &part : got_vector) {
- got += part + "|||";
- }
- if (got != expected) {
- 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 = "";
- String expected = "a|||b|||c|||";
- for (String &part : got_vector) {
- got += part + "|||";
- }
- if (got != expected) {
- 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 = "";
- String expected = "a|||\"b,\"|||c|||";
- for (String &part : got_vector) {
- got += part + "|||";
- }
- if (got != expected) {
- 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 = "";
- String expected = "a|||\"(,),,,,\"|||c|||";
- for (String &part : got_vector) {
- got += part + "|||";
- }
- if (got != expected) {
- 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;
+ // Parse Arguments
+ {
+ String line = "( )";
+ Vector<String> got_vector = parse_arguments(line);
+ String got = "";
+ String expected = "";
+ for (String &part : got_vector) {
+ got += part + "|||";
+ }
+ if (got != expected) {
+ 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 = "";
+ String expected = "a|||b|||c|||";
+ for (String &part : got_vector) {
+ got += part + "|||";
+ }
+ if (got != expected) {
+ 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 = "";
+ String expected = "a|||\"b,\"|||c|||";
+ for (String &part : got_vector) {
+ got += part + "|||";
+ }
+ if (got != expected) {
+ 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 = "";
+ String expected = "a|||\"(,),,,,\"|||c|||";
+ for (String &part : got_vector) {
+ got += part + "|||";
+ }
+ if (got != expected) {
+ 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;
}
// Validate in all arrays if names don't do cyclic renames "Node" -> "Node2D" | "Node2D" -> "2DNode"