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

Merge pull request #85239 from HolonProduction/global-class-property-location

Browse source 
Handle global classes when resolving property location
This commit is contained in:
Yuri Sizov 2024-01-25 16:26:50 +01:00
commit 9579dc6313
1 changed files with 56 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
modules/gdscript/gdscript_editor.cpp
View file

@ -552,6 +552,19 @@ static int _get_property_location(const StringName &p_class, const StringName &p
return depth | ScriptLanguage::LOCATION_PARENT_MASK; return depth | ScriptLanguage::LOCATION_PARENT_MASK;
} }
static int _get_property_location(Ref<Script> p_script, const StringName &p_property) {
int depth = 0;
Ref<Script> scr = p_script;
while (scr.is_valid()) {
if (scr->get_member_line(p_property) != -1) {
return depth | ScriptLanguage::LOCATION_PARENT_MASK;
}
depth++;
scr = scr->get_base_script();
}
return depth + _get_property_location(p_script->get_instance_base_type(), p_property);
}
static int _get_constant_location(const StringName &p_class, const StringName &p_constant) { static int _get_constant_location(const StringName &p_class, const StringName &p_constant) {
if (!ClassDB::has_integer_constant(p_class, p_constant)) { if (!ClassDB::has_integer_constant(p_class, p_constant)) {
return ScriptLanguage::LOCATION_OTHER; return ScriptLanguage::LOCATION_OTHER;
@ -567,6 +580,19 @@ static int _get_constant_location(const StringName &p_class, const StringName &p
return depth | ScriptLanguage::LOCATION_PARENT_MASK; return depth | ScriptLanguage::LOCATION_PARENT_MASK;
} }
static int _get_constant_location(Ref<Script> p_script, const StringName &p_constant) {
int depth = 0;
Ref<Script> scr = p_script;
while (scr.is_valid()) {
if (scr->get_member_line(p_constant) != -1) {
return depth | ScriptLanguage::LOCATION_PARENT_MASK;
}
depth++;
scr = scr->get_base_script();
}
return depth + _get_constant_location(p_script->get_instance_base_type(), p_constant);
}
static int _get_signal_location(const StringName &p_class, const StringName &p_signal) { static int _get_signal_location(const StringName &p_class, const StringName &p_signal) {
if (!ClassDB::has_signal(p_class, p_signal)) { if (!ClassDB::has_signal(p_class, p_signal)) {
return ScriptLanguage::LOCATION_OTHER; return ScriptLanguage::LOCATION_OTHER;
@ -582,6 +608,19 @@ static int _get_signal_location(const StringName &p_class, const StringName &p_s
return depth | ScriptLanguage::LOCATION_PARENT_MASK; return depth | ScriptLanguage::LOCATION_PARENT_MASK;
} }
static int _get_signal_location(Ref<Script> p_script, const StringName &p_signal) {
int depth = 0;
Ref<Script> scr = p_script;
while (scr.is_valid()) {
if (scr->get_member_line(p_signal) != -1) {
return depth | ScriptLanguage::LOCATION_PARENT_MASK;
}
depth++;
scr = scr->get_base_script();
}
return depth + _get_signal_location(p_script->get_instance_base_type(), p_signal);
}
static int _get_method_location(const StringName &p_class, const StringName &p_method) { static int _get_method_location(const StringName &p_class, const StringName &p_method) {
if (!ClassDB::has_method(p_class, p_method)) { if (!ClassDB::has_method(p_class, p_method)) {
return ScriptLanguage::LOCATION_OTHER; return ScriptLanguage::LOCATION_OTHER;
@ -597,6 +636,19 @@ static int _get_method_location(const StringName &p_class, const StringName &p_m
return depth | ScriptLanguage::LOCATION_PARENT_MASK; return depth | ScriptLanguage::LOCATION_PARENT_MASK;
} }
static int _get_method_location(Ref<Script> p_script, const StringName &p_method) {
int depth = 0;
Ref<Script> scr = p_script;
while (scr.is_valid()) {
if (scr->get_member_line(p_method) != -1) {
return depth | ScriptLanguage::LOCATION_PARENT_MASK;
}
depth++;
scr = scr->get_base_script();
}
return depth + _get_method_location(p_script->get_instance_base_type(), p_method);
}
static int _get_enum_constant_location(const StringName &p_class, const StringName &p_enum_constant) { static int _get_enum_constant_location(const StringName &p_class, const StringName &p_enum_constant) {
if (!ClassDB::get_integer_constant_enum(p_class, p_enum_constant)) { if (!ClassDB::get_integer_constant_enum(p_class, p_enum_constant)) {
return ScriptLanguage::LOCATION_OTHER; return ScriptLanguage::LOCATION_OTHER;
@ -1089,7 +1141,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
if (E.name.contains("/")) { if (E.name.contains("/")) {
continue; continue;
} }
int location = p_recursion_depth + _get_property_location(scr->get_class_name(), E.name); int location = p_recursion_depth + _get_property_location(scr, E.name);
ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_MEMBER, location); ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_MEMBER, location);
r_result.insert(option.display, option); r_result.insert(option.display, option);
} }
@ -1097,7 +1149,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
List<MethodInfo> signals; List<MethodInfo> signals;
scr->get_script_signal_list(&signals); scr->get_script_signal_list(&signals);
for (const MethodInfo &E : signals) { for (const MethodInfo &E : signals) {
int location = p_recursion_depth + _get_signal_location(scr->get_class_name(), E.name); int location = p_recursion_depth + _get_signal_location(scr, E.name);
ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_SIGNAL, location); ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_SIGNAL, location);
r_result.insert(option.display, option); r_result.insert(option.display, option);
} }
@ -1105,7 +1157,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
HashMap<StringName, Variant> constants; HashMap<StringName, Variant> constants;
scr->get_constants(&constants); scr->get_constants(&constants);
for (const KeyValue<StringName, Variant> &E : constants) { for (const KeyValue<StringName, Variant> &E : constants) {
int location = p_recursion_depth + _get_constant_location(scr->get_class_name(), E.key); int location = p_recursion_depth + _get_constant_location(scr, E.key);
ScriptLanguage::CodeCompletionOption option(E.key.operator String(), ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT, location); ScriptLanguage::CodeCompletionOption option(E.key.operator String(), ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT, location);
r_result.insert(option.display, option); r_result.insert(option.display, option);
} }
@ -1117,7 +1169,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
if (E.name.begins_with("@")) { if (E.name.begins_with("@")) {
continue; continue;
} }
int location = p_recursion_depth + _get_method_location(scr->get_class_name(), E.name); int location = p_recursion_depth + _get_method_location(scr, E.name);
ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION, location); ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION, location);
if (E.arguments.size()) { if (E.arguments.size()) {
option.insert_text += "("; option.insert_text += "(";