Merge pull request #28609 from bojidar-bg/27152-indirect-code-completion

Fix slight issues with autocompletion and member lists in GDScript
This commit is contained in:
Rémi Verschelde 2019-05-02 18:00:48 +02:00 committed by GitHub
commit d6aa2858b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -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();

View file

@ -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;