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

Fix priority of annotated type vs initializer type

Browse Source
This commit is contained in:
cdemirer
2022-07-06 04:25:44 +03:00
parent 1d06fec535
commit f280975bf1
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/gdscript_editor.cpp
View File

@ -2028,7 +2028,10 @@ static bool _guess_identifier_type_from_base(GDScriptParser::CompletionContext &
return true;
case GDScriptParser::ClassNode::Member::VARIABLE:
if (!is_static) {
if (member.variable->initializer) {
if (member.variable->get_datatype().is_set() && !member.variable->get_datatype().is_variant()) {
r_type.type = member.variable->get_datatype();
return true;
} else if (member.variable->initializer) {
const GDScriptParser::ExpressionNode *init = member.variable->initializer;
if (init->is_constant) {
r_type.value = init->reduced_value;
@ -2050,9 +2053,6 @@ static bool _guess_identifier_type_from_base(GDScriptParser::CompletionContext &
r_type.type = init->get_datatype();
return true;
}
} else if (member.variable->get_datatype().is_set() && !member.variable->get_datatype().is_variant()) {
r_type.type = member.variable->get_datatype();
return true;
}
}
// TODO: Check assignments in constructor.