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

Merge pull request #118552 from Meorge/bugfix/untyped-decl-only-on-func-identifier

Browse Source 
GDScript: Use function's header as range for UNTYPED_DECLARATION warning
This commit is contained in:
Thaddeus Crews
2026-06-25 08:32:26 -05:00
parent 02abdd89c6 ff35cf75a9
commit 745cdef631
3 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gdscript/gdscript_parser.cpp
+33 -13
View File
@@ -251,14 +251,18 @@ void GDScriptParser::push_error(const String &p_message, const Node *p_origin) {
}
void GDScriptParser::push_error(const String &p_message, const GDScriptTokenizer::Token &p_origin) {
panic_mode = true;
push_error(p_message, p_origin.start_line, p_origin.start_column, p_origin.end_line, p_origin.end_column);
}
void GDScriptParser::push_error(const String &p_message, int p_start_line, int p_start_column, int p_end_line, int p_end_column) {
panic_mode = true;
ParserError err;
err.message = p_message;
err.start_line = p_origin.start_line;
err.start_column = p_origin.start_column;
err.end_line = p_origin.end_line;
err.end_column = p_origin.end_column;
err.start_line = p_start_line;
err.start_column = p_start_column;
err.end_line = p_end_line;
err.end_column = p_end_column;
errors.push_back(err);
}
@@ -266,6 +270,10 @@ void GDScriptParser::push_error(const String &p_message, const GDScriptTokenizer
#ifdef DEBUG_ENABLED
void GDScriptParser::push_warning(const Node *p_source, GDScriptWarning::Code p_code, const Vector<String> &p_symbols) {
ERR_FAIL_NULL(p_source);
push_warning(p_source->start_line, p_source->start_column, p_source->end_line, p_source->end_column, p_code, p_symbols);
}
void GDScriptParser::push_warning(int p_start_line, int p_start_column, int p_end_line, int p_end_column, GDScriptWarning::Code p_code, const Vector<String> &p_symbols) {
ERR_FAIL_INDEX(p_code, GDScriptWarning::WARNING_MAX);
if (is_project_ignoring_warnings || is_script_ignoring_warnings) {
@@ -278,7 +286,10 @@ void GDScriptParser::push_warning(const Node *p_source, GDScriptWarning::Code p_
}
PendingWarning pw;
pw.source = p_source;
pw.start_line = p_start_line;
pw.start_column = p_start_column;
pw.end_line = p_end_line;
pw.end_column = p_end_column;
pw.code = p_code;
pw.treated_as_error = warn_level == GDScriptWarning::ERROR;
pw.symbols = p_symbols;
@@ -288,23 +299,23 @@ void GDScriptParser::push_warning(const Node *p_source, GDScriptWarning::Code p_
void GDScriptParser::apply_pending_warnings() {
for (const PendingWarning &pw : pending_warnings) {
if (warning_ignored_lines[pw.code].has(pw.source->start_line)) {
if (warning_ignored_lines[pw.code].has(pw.start_line)) {
continue;
}
if (warning_ignore_start_lines[pw.code] <= pw.source->start_line) {
if (warning_ignore_start_lines[pw.code] <= pw.start_line) {
continue;
}
GDScriptWarning warning;
warning.code = pw.code;
warning.symbols = pw.symbols;
warning.start_line = pw.source->start_line;
warning.start_column = pw.source->start_column;
warning.end_line = pw.source->end_line;
warning.end_column = pw.source->end_column;
warning.start_line = pw.start_line;
warning.start_column = pw.start_column;
warning.end_line = pw.end_line;
warning.end_column = pw.end_column;
if (pw.treated_as_error) {
push_error(warning.get_message() + String(" (Warning treated as error.)"), pw.source);
push_error(warning.get_message() + String(" (Warning treated as error.)"), pw.start_line, pw.start_column, pw.end_line, pw.end_column);
continue;
}
@@ -1405,6 +1416,9 @@ void GDScriptParser::parse_property_setter(VariableNode *p_variable) {
consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected ")" after parameter name.)*");
consume(GDScriptTokenizer::Token::COLON, R"*(Expected ":" after ")".)*");
function->header_end_line = previous.start_line;
function->header_end_column = previous.start_column;
FunctionNode *previous_function = current_function;
current_function = function;
if (p_variable->setter_parameter != nullptr) {
@@ -1441,6 +1455,9 @@ void GDScriptParser::parse_property_getter(VariableNode *p_variable) {
consume(GDScriptTokenizer::Token::COLON, R"(Expected ":" or "(" after "get".)");
}
function->header_end_line = previous.start_line;
function->header_end_column = previous.start_column;
IdentifierNode *identifier = alloc_node<IdentifierNode>();
complete_extents(identifier);
identifier->name = "@" + p_variable->identifier->name + "_getter";
@@ -1766,6 +1783,9 @@ bool GDScriptParser::parse_function_signature(FunctionNode *p_function, SuiteNod
}
#endif // TOOLS_ENABLED
p_function->header_end_line = previous.end_line;
p_function->header_end_column = previous.end_column;
// TODO: Improve token consumption so it synchronizes to a statement boundary. This way we can get into the function body with unrecognized tokens.
if (p_type == "lambda") {
return consume(GDScriptTokenizer::Token::COLON, R"(Expected ":" after lambda declaration.)");