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

Fix GDScript autocompletion with `as` or typed variables 

Fixes #31818, fixes #33434
This commit is contained in:
Bojidar Marinov 2019-12-12 01:16:23 +02:00
parent cd9d513285
commit a665b3878b
No known key found for this signature in database
GPG Key ID: 4D546A8F1E091856
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/gdscript/gdscript_editor.cpp
View File

@ -744,6 +744,14 @@ static bool _guess_expression_type(GDScriptCompletionContext &p_context, const G
r_type.type.kind = GDScriptParser::DataType::BUILTIN; r_type.type.kind = GDScriptParser::DataType::BUILTIN;
r_type.type.builtin_type = Variant::ARRAY; r_type.type.builtin_type = Variant::ARRAY;
} break; } break;
case GDScriptParser::Node::TYPE_CAST: {
const GDScriptParser::CastNode *cn = static_cast<const GDScriptParser::CastNode *>(p_expression);
GDScriptCompletionIdentifier value;
if (_guess_expression_type(p_context, cn->source_node, r_type)) {
r_type.type = cn->get_datatype();
found = true;
}
} break;
case GDScriptParser::Node::TYPE_OPERATOR: { case GDScriptParser::Node::TYPE_OPERATOR: {
const GDScriptParser::OperatorNode *op = static_cast<const GDScriptParser::OperatorNode *>(p_expression); const GDScriptParser::OperatorNode *op = static_cast<const GDScriptParser::OperatorNode *>(p_expression);
switch (op->op) { switch (op->op) {
@ -1232,6 +1240,9 @@ static bool _guess_identifier_type(GDScriptCompletionContext &p_context, const S
c.line = last_assign_line; c.line = last_assign_line;
r_type.assigned_expression = last_assigned_expression; r_type.assigned_expression = last_assigned_expression;
if (_guess_expression_type(c, last_assigned_expression, r_type)) { if (_guess_expression_type(c, last_assigned_expression, r_type)) {
if (var_type.has_type) {
r_type.type = var_type;
}
return true; return true;
} }
} }