From c914063fd0eb8c02d8362b86a61933c656a938bc Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sat, 19 Feb 2022 10:50:10 -0800 Subject: listener: restore and improve method completion. The recent autoload changes have degraded method completion, which didn't work well in the first place. Test case: with this change you can type term.(go[Tab] to complete to term.(go-raw or term.(go-cbreak. * parser.c (find_matching_syms): Do not use the get_slot_syms function for finding method and slot symbols. Just use get_visible_syms, like for other bindings. Instead, in the switch statement in the loop, for the 'M' (method) and 'S' (slot) completion types, we use the static_slot_types and slot_types functions to inquire whether a symbol has a binding. And these two functions do something important: unlike get_slot_syms, they trigger autoload. * struct.c (get_slot_syms): Function removed. * struct.h (get_slot_syms): Declaration removed. --- struct.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'struct.c') diff --git a/struct.c b/struct.c index f38e306f..d68b222e 100644 --- a/struct.c +++ b/struct.c @@ -1951,46 +1951,6 @@ val method_name(val fun) return nil; } -val get_slot_syms(val package, val is_current, val method_only) -{ - val result_hash = make_hash(hash_weak_none, nil); - struct hash_iter sthi; - val sth_cell; - - us_hash_iter_init(&sthi, struct_type_hash); - - while ((sth_cell = hash_iter_next(&sthi))) { - val stype = us_cdr(sth_cell); - val sl_iter; - struct struct_type *st = coerce(struct struct_type *, stype->co.handle); - - for (sl_iter = st->slots; sl_iter; sl_iter = cdr(sl_iter)) { - val slot = car(sl_iter); - - if (gethash(result_hash, slot)) - continue; - - if (!is_current && symbol_package(slot) != package) - continue; - - if (!symbol_visible(package, slot)) - continue; - - if (method_only) { - loc ptr = lookup_static_slot(st, slot); - if (nullocp(ptr)) - continue; - if (!functionp(deref(ptr))) - continue; - } - - sethash(result_hash, slot, t); - } - } - - return result_hash; -} - val slot_types(val slot) { uses_or2; -- cgit v1.2.3