[vim/vim] cmdexpand: allow dict items in customlist completion (PR #20100)
mattn
Extend customlist completion so each returned list item may be a Dict with word (required) plus optional abbr, kind, menu, and info keys, surfaced through the cmdline pum the same way complete() does in insert mode. String items keep working as before.
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/20100
Commit Summary
- 55358fc cmdexpand: allow dict items in customlist completion
- 2148c60 cmdexpand: support "abbr" in customlist dict items
File Changes
(4 files)
- M runtime/doc/map.txt (16)
- M src/cmdexpand.c (139)
- M src/structs.h (11)
- M src/testdir/test_cmdline.vim (47)
Patch Links:
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
mattn
@mattn pushed 1 commit.
- a209c49 docs: fix dangling |+popup| reference, use |+popupwin|
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
mattn
@mattn pushed 1 commit.
- 72e991d fix leak of customlist abbr/kind/menu/info on re-entry
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maxim Kim
habamax left a comment (vim/vim#20100)That would be a great improvement! Thank you!
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
@chrisbra commented on this pull request.
Thanks, but I have some comments, see below
In src/cmdexpand.c:
> + if (xp->xp_files_kind != NULL)
+ {
+ FreeWild(numMatches, xp->xp_files_kind);
+ xp->xp_files_kind = NULL;
+ }
+ if (xp->xp_files_menu != NULL)
+ {
+ FreeWild(numMatches, xp->xp_files_menu);
+ xp->xp_files_menu = NULL;
+ }
+ if (xp->xp_files_info != NULL)
+ {
+ FreeWild(numMatches, xp->xp_files_info);
+ xp->xp_files_info = NULL;
+ }
+ }
That part is duplicated 3 times. Can you move it into a helper function?
In src/cmdexpand.c:
> - p = vim_strsave(li->li_tv.vval.v_string); if (p == NULL) break;
So if we went into the VAR_DICT case above and allocating to p fails, this leaks abbr, kind, menu and info.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.