diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-06 15:47:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-06 15:47:56 +0200 |
| commit | 48738868309b09be1cad21d73a2a9221bfd8f838 (patch) | |
| tree | a7f816516806599539991a7028e3d2e635e2b451 /modules/gdscript/gdscript_editor.cpp | |
| parent | e004412eddf129ad2c6e73a31707be198be5c412 (diff) | |
| parent | f280975bf1689e6a190f7f14d9c7dbcb61e3191d (diff) | |
Merge pull request #62760 from cdemirer/fix-annotation-initializer-conflict
Fix priority of annotated type vs initializer type
Diffstat (limited to 'modules/gdscript/gdscript_editor.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_editor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 71ee437744..c33824c8a6 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -2040,7 +2040,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; @@ -2062,9 +2065,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. |