|
@@ -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;
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
}
|