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

Merge pull request #72592 from EricEzaM/67008-autocomplete-crash-virtual-fn 

Fix crash in gdscript when autocompleting virtual function and signature does not match base.
This commit is contained in:
Rémi Verschelde 2023-02-02 13:59:57 +01:00
parent 8978196a48 9b93bdb4e7
commit 50022484a3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/gdscript/gdscript_editor.cpp
View File

@ -1953,17 +1953,19 @@ static bool _guess_identifier_type(GDScriptParser::CompletionContext &p_context,
case GDScriptParser::DataType::CLASS: case GDScriptParser::DataType::CLASS:
if (base_type.class_type->has_function(p_context.current_function->identifier->name)) { if (base_type.class_type->has_function(p_context.current_function->identifier->name)) {
GDScriptParser::FunctionNode *parent_function = base_type.class_type->get_member(p_context.current_function->identifier->name).function; GDScriptParser::FunctionNode *parent_function = base_type.class_type->get_member(p_context.current_function->identifier->name).function;
const GDScriptParser::ParameterNode *parameter = parent_function->parameters[parent_function->parameters_indices[p_identifier]]; if (parent_function->parameters_indices.has(p_identifier)) {
if ((!id_type.is_set() || id_type.is_variant()) && parameter->get_datatype().is_hard_type()) { const GDScriptParser::ParameterNode *parameter = parent_function->parameters[parent_function->parameters_indices[p_identifier]];
id_type = parameter->get_datatype(); if ((!id_type.is_set() || id_type.is_variant()) && parameter->get_datatype().is_hard_type()) {
} id_type = parameter->get_datatype();
if (parameter->initializer) { }
GDScriptParser::CompletionContext c = p_context; if (parameter->initializer) {
c.current_function = parent_function; GDScriptParser::CompletionContext c = p_context;
c.current_class = base_type.class_type; c.current_function = parent_function;
c.base = nullptr; c.current_class = base_type.class_type;
if (_guess_expression_type(c, parameter->initializer, r_type)) { c.base = nullptr;
return true; if (_guess_expression_type(c, parameter->initializer, r_type)) {
return true;
}
} }
} }
} }