godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Try and show all the properties added with _get_property_list() when triggering completion.

Browse Source 
Closes https://github.com/godotengine/godot/issues/25097
This commit is contained in:
MrCdK
2019-04-17 13:06:28 +02:00
parent 5323d24fad
commit 9e9c16c1e5
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/gdscript/gdscript_editor.cpp
View File

@@ -1936,11 +1936,20 @@ static void _find_identifiers_in_base(const GDScriptCompletionContext &p_context
Ref<GDScript> script = base_type.script_type; Ref<GDScript> script = base_type.script_type;
if (script.is_valid()) { if (script.is_valid()) {
if (!_static && !p_only_functions) { if (!_static && !p_only_functions) {
if (p_context.base && p_context.base->get_script_instance()) {
List<PropertyInfo> members;
p_context.base->get_script_instance()->get_property_list(&members);
for (List<PropertyInfo>::Element *E = members.front(); E; E = E->next()) {
ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_MEMBER);
r_result.insert(option.display, option);
}
} else {
for (const Set<StringName>::Element *E = script->get_members().front(); E; E = E->next()) { for (const Set<StringName>::Element *E = script->get_members().front(); E; E = E->next()) {
ScriptCodeCompletionOption option(E->get().operator String(), ScriptCodeCompletionOption::KIND_MEMBER); ScriptCodeCompletionOption option(E->get().operator String(), ScriptCodeCompletionOption::KIND_MEMBER);
r_result.insert(option.display, option); r_result.insert(option.display, option);
} }
} }
}
if (!p_only_functions) { if (!p_only_functions) {
for (const Map<StringName, Variant>::Element *E = script->get_constants().front(); E; E = E->next()) { for (const Map<StringName, Variant>::Element *E = script->get_constants().front(); E; E = E->next()) {
ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CONSTANT); ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CONSTANT);