godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #62760 from cdemirer/fix-annotation-initializer-conflict

Browse Source 
Fix priority of annotated type vs initializer type
This commit is contained in:
Rémi Verschelde
2022-07-06 15:47:56 +02:00
committed by GitHub
parent e004412edd f280975bf1
commit 4873886830
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_analyzer.cpp
View File

@@ -655,7 +655,8 @@ void GDScriptAnalyzer::resolve_class_interface(GDScriptParser::ClassNode *p_clas
} else { } else {
ERR_PRINT("Parser bug (please report): tried to assign unset node without an identifier."); ERR_PRINT("Parser bug (please report): tried to assign unset node without an identifier.");
} }
} else { }
if (member.variable->datatype_specifier != nullptr) { if (member.variable->datatype_specifier != nullptr) {
datatype = specified_type; datatype = specified_type;
@@ -692,7 +693,6 @@ void GDScriptAnalyzer::resolve_class_interface(GDScriptParser::ClassNode *p_clas
} }
datatype.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED; datatype.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED;
} }
}
datatype.is_constant = false; datatype.is_constant = false;
member.variable->set_datatype(datatype); member.variable->set_datatype(datatype);

8
modules/gdscript/gdscript_editor.cpp
View File

@@ -2040,7 +2040,10 @@ static bool _guess_identifier_type_from_base(GDScriptParser::CompletionContext &
return true; return true;
case GDScriptParser::ClassNode::Member::VARIABLE: case GDScriptParser::ClassNode::Member::VARIABLE:
if (!is_static) { 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; const GDScriptParser::ExpressionNode *init = member.variable->initializer;
if (init->is_constant) { if (init->is_constant) {
r_type.value = init->reduced_value; 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(); r_type.type = init->get_datatype();
return true; 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. // TODO: Check assignments in constructor.