diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-25 15:58:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-25 15:58:08 +0200 |
| commit | bfac9b35385eddd3e3034674ae3fbd309ee64843 (patch) | |
| tree | d0dd0ad8682653044228bcdfb33c47a733c27cd1 /modules/gdscript/gdscript_editor.cpp | |
| parent | ab3d7f29a83670063f616ea9825231914bb08124 (diff) | |
| parent | 13c372b5228f6f17a23aadb8fc59230c5a08c176 (diff) | |
Merge pull request #39015 from ThakeeNathees/dict-key-autocomplete-regression-fix
regression: dictionary key no autocomplete fix
Diffstat (limited to 'modules/gdscript/gdscript_editor.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_editor.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 7433c4a5bc..50d8289fd1 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -2082,7 +2082,11 @@ static void _find_identifiers_in_base(const GDScriptCompletionContext &p_context if (!p_only_functions) { List<PropertyInfo> members; - tmp.get_property_list(&members); + if (p_base.value.get_type() != Variant::NIL) { + p_base.value.get_property_list(&members); + } else { + tmp.get_property_list(&members); + } for (List<PropertyInfo>::Element *E = members.front(); E; E = E->next()) { if (String(E->get().name).find("/") == -1) { |