asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix completion for the raw get_node call

Browse source
This commit is contained in:
Yuri Rubinsky 2022-12-06 10:29:55 +03:00
parent f3e6750a7e
commit 20660bb23a
1 changed files with 48 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
modules/gdscript/gdscript_editor.cpp
View file

@ -2512,50 +2512,62 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
} }
static bool _get_subscript_type(GDScriptParser::CompletionContext &p_context, const GDScriptParser::SubscriptNode *p_subscript, GDScriptParser::DataType &r_base_type, Variant *r_base = nullptr) { static bool _get_subscript_type(GDScriptParser::CompletionContext &p_context, const GDScriptParser::SubscriptNode *p_subscript, GDScriptParser::DataType &r_base_type, Variant *r_base = nullptr) {
if (p_subscript->base->type == GDScriptParser::Node::IDENTIFIER && p_context.base != nullptr) { if (p_context.base == nullptr) {
const GDScriptParser::GetNodeNode *get_node = nullptr; return false;
const GDScriptParser::IdentifierNode *identifier_node = static_cast<GDScriptParser::IdentifierNode *>(p_subscript->base); }
const GDScriptParser::GetNodeNode *get_node = nullptr;
switch (identifier_node->source) { switch (p_subscript->base->type) {
case GDScriptParser::IdentifierNode::Source::MEMBER_VARIABLE: { case GDScriptParser::Node::GET_NODE: {
if (p_context.current_class != nullptr) { get_node = static_cast<GDScriptParser::GetNodeNode *>(p_subscript->base);
const StringName &member_name = identifier_node->name; } break;
const GDScriptParser::ClassNode *current_class = p_context.current_class;
if (current_class->has_member(member_name)) { case GDScriptParser::Node::IDENTIFIER: {
const GDScriptParser::ClassNode::Member &member = current_class->get_member(member_name); const GDScriptParser::IdentifierNode *identifier_node = static_cast<GDScriptParser::IdentifierNode *>(p_subscript->base);
if (member.type == GDScriptParser::ClassNode::Member::VARIABLE) { switch (identifier_node->source) {
const GDScriptParser::VariableNode *variable = static_cast<GDScriptParser::VariableNode *>(member.variable); case GDScriptParser::IdentifierNode::Source::MEMBER_VARIABLE: {
if (p_context.current_class != nullptr) {
const StringName &member_name = identifier_node->name;
const GDScriptParser::ClassNode *current_class = p_context.current_class;
if (variable->initializer && variable->initializer->type == GDScriptParser::Node::GET_NODE) { if (current_class->has_member(member_name)) {
get_node = static_cast<GDScriptParser::GetNodeNode *>(variable->initializer); const GDScriptParser::ClassNode::Member &member = current_class->get_member(member_name);
if (member.type == GDScriptParser::ClassNode::Member::VARIABLE) {
const GDScriptParser::VariableNode *variable = static_cast<GDScriptParser::VariableNode *>(member.variable);
if (variable->initializer && variable->initializer->type == GDScriptParser::Node::GET_NODE) {
get_node = static_cast<GDScriptParser::GetNodeNode *>(variable->initializer);
}
} }
} }
} }
} } break;
} break; case GDScriptParser::IdentifierNode::Source::LOCAL_VARIABLE: {
case GDScriptParser::IdentifierNode::Source::LOCAL_VARIABLE: { if (identifier_node->next != nullptr && identifier_node->next->type == GDScriptParser::ClassNode::Node::GET_NODE) {
if (identifier_node->next != nullptr && identifier_node->next->type == GDScriptParser::ClassNode::Node::GET_NODE) { get_node = static_cast<GDScriptParser::GetNodeNode *>(identifier_node->next);
get_node = static_cast<GDScriptParser::GetNodeNode *>(identifier_node->next); }
} } break;
} break; default: {
default: } break;
break;
}
if (get_node != nullptr) {
const Object *node = p_context.base->call("get_node_or_null", NodePath(get_node->full_path));
if (node != nullptr) {
if (r_base != nullptr) {
*r_base = node;
}
r_base_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
r_base_type.kind = GDScriptParser::DataType::NATIVE;
r_base_type.native_type = node->get_class_name();
r_base_type.builtin_type = Variant::OBJECT;
return true;
} }
} break;
default: {
} break;
}
if (get_node != nullptr) {
const Object *node = p_context.base->call("get_node_or_null", NodePath(get_node->full_path));
if (node != nullptr) {
if (r_base != nullptr) {
*r_base = node;
}
r_base_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
r_base_type.kind = GDScriptParser::DataType::NATIVE;
r_base_type.native_type = node->get_class_name();
r_base_type.builtin_type = Variant::OBJECT;
return true;
} }
} }