diff options
author | poohcom1 <pooh677@gmail.com> | 2022-12-11 14:17:27 +0700 |
---|---|---|
committer | poohcom1 <pooh677@gmail.com> | 2022-12-11 14:17:27 +0700 |
commit | 1845d927dc41fe62417c50eab96fe1f26ee5f09a (patch) | |
tree | 6682b49d2d972393113ba8e1ca79f3e7477d3ae0 /modules/gdscript | |
parent | a4131b61b10cb3a7fe0e1e76ed11dfebfa55e7e6 (diff) |
Fix autocomplete on functions returning variants
- When guessing return type, check type hints before last return value
Diffstat (limited to 'modules/gdscript')
-rw-r--r-- | modules/gdscript/gdscript_editor.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 693863ab38..79387d1bf6 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -2272,6 +2272,11 @@ static bool _guess_method_return_type_from_base(GDScriptParser::CompletionContex if (base_type.class_type->has_function(p_method)) { const GDScriptParser::FunctionNode *method = base_type.class_type->get_member(p_method).function; if (!is_static || method->is_static) { + if (method->get_datatype().is_set() && !method->get_datatype().is_variant()) { + r_type.type = method->get_datatype(); + return true; + } + int last_return_line = -1; const GDScriptParser::ExpressionNode *last_returned_value = nullptr; GDScriptParser::CompletionContext c = p_context; @@ -2285,10 +2290,6 @@ static bool _guess_method_return_type_from_base(GDScriptParser::CompletionContex if (_guess_expression_type(c, last_returned_value, r_type)) { return true; } - if (method->get_datatype().is_set() && !method->get_datatype().is_variant()) { - r_type.type = method->get_datatype(); - return true; - } } } } |