diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-02 18:00:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 18:00:48 +0200 |
| commit | d6aa2858b4e25fe82f8667d4c5fbc5e3772c6dab (patch) | |
| tree | ced9e7797cad01f0715c382247e1dcbb6575f480 | |
| parent | b0931806c2a085e84ecc4d7989436edc83cd70a8 (diff) | |
| parent | f9d95309024c7b7dac5c12b891cb90982f566565 (diff) | |
Merge pull request #28609 from bojidar-bg/27152-indirect-code-completion
Fix slight issues with autocompletion and member lists in GDScript
| -rw-r--r-- | modules/gdscript/gdscript.cpp | 2 | ||||
| -rw-r--r-- | modules/gdscript/gdscript_editor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index eada389c51..33e99cb82f 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -226,7 +226,7 @@ void GDScript::get_script_method_list(List<MethodInfo> *p_list) const { const GDScript *current = this; while (current) { - for (const Map<StringName, GDScriptFunction *>::Element *E = member_functions.front(); E; E = E->next()) { + for (const Map<StringName, GDScriptFunction *>::Element *E = current->member_functions.front(); E; E = E->next()) { GDScriptFunction *func = E->get(); MethodInfo mi; mi.name = E->key(); diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index bcf3140fa6..d91e32249e 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -1951,7 +1951,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionContext &p_context } else { base_type.has_type = script->get_instance_base_type() != StringName(); base_type.kind = GDScriptParser::DataType::NATIVE; - base_type.script_type = script->get_instance_base_type(); + base_type.native_type = script->get_instance_base_type(); } } else { return; |