godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Merge pull request #69423 from KoBeWi/parenture

Browse Source 
Improve parent signature error
This commit is contained in:
Rémi Verschelde
2022-12-01 18:10:31 +01:00
parent 96796c1518 d1e4146462
commit 4821de146e
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/gdscript/gdscript_analyzer.cpp
View File

@@ -1216,11 +1216,7 @@ void GDScriptAnalyzer::resolve_function_signature(GDScriptParser::FunctionNode *
if (!valid) { if (!valid) {
// Compute parent signature as a string to show in the error message. // Compute parent signature as a string to show in the error message.
String parent_signature = parent_return_type.is_hard_type() ? parent_return_type.to_string() : "Variant"; String parent_signature = p_function->identifier->name.operator String() + "(";
if (parent_signature == "null") {
parent_signature = "void";
}
parent_signature += " " + p_function->identifier->name.operator String() + "(";
int j = 0; int j = 0;
for (const GDScriptParser::DataType &par_type : parameters_types) { for (const GDScriptParser::DataType &par_type : parameters_types) {
if (j > 0) { if (j > 0) {
@@ -1237,7 +1233,15 @@ void GDScriptAnalyzer::resolve_function_signature(GDScriptParser::FunctionNode *
j++; j++;
} }
parent_signature += ")"; parent_signature += ") -> ";
const String return_type = parent_return_type.is_hard_type() ? parent_return_type.to_string() : "Variant";
if (return_type == "null") {
parent_signature += "void";
} else {
parent_signature += return_type;
}
push_error(vformat(R"(The function signature doesn't match the parent. Parent signature is "%s".)", parent_signature), p_function); push_error(vformat(R"(The function signature doesn't match the parent. Parent signature is "%s".)", parent_signature), p_function);
} }
} }

2
modules/gdscript/tests/scripts/analyzer/errors/function_dont_match_parent_signature_parameter_count_less.out
View File

@@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR GDTEST_ANALYZER_ERROR
The function signature doesn't match the parent. Parent signature is "int my_function(int)". The function signature doesn't match the parent. Parent signature is "my_function(int) -> int".

2
modules/gdscript/tests/scripts/analyzer/errors/function_dont_match_parent_signature_parameter_count_more.out
View File

@@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR GDTEST_ANALYZER_ERROR
The function signature doesn't match the parent. Parent signature is "int my_function(int)". The function signature doesn't match the parent. Parent signature is "my_function(int) -> int".

2
modules/gdscript/tests/scripts/analyzer/errors/function_dont_match_parent_signature_parameter_default_values.out
View File

@@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR GDTEST_ANALYZER_ERROR
The function signature doesn't match the parent. Parent signature is "int my_function(int = default)". The function signature doesn't match the parent. Parent signature is "my_function(int = default) -> int".

2
modules/gdscript/tests/scripts/analyzer/errors/function_dont_match_parent_signature_parameter_type.out
View File

@@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR GDTEST_ANALYZER_ERROR
The function signature doesn't match the parent. Parent signature is "int my_function(int)". The function signature doesn't match the parent. Parent signature is "my_function(int) -> int".

2
modules/gdscript/tests/scripts/analyzer/errors/function_dont_match_parent_signature_return_type.out
View File

@@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR GDTEST_ANALYZER_ERROR
The function signature doesn't match the parent. Parent signature is "int my_function()". The function signature doesn't match the parent. Parent signature is "my_function() -> int".