diff options
author | Yee Cheng Chin <ychin.git@gmail.com> | 2023-09-29 20:42:32 +0200 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2023-09-29 20:42:32 +0200 |
commit | 900894b09a95398dfc75599e9f0aa2ea25723384 (patch) | |
tree | 62d287cb3235349c75c60884f280e3c5f47beb5e /src/popupwin.c | |
parent | 3695d0e41ba26db074dd5680564a6f87d522fb61 (diff) |
patch 9.0.1958: cannot complete option valuesv9.0.1958
Problem: cannot complete option values
Solution: Add completion functions for several options
Add cmdline tab-completion for setting string options
Add tab-completion for setting string options on the cmdline using
`:set=` (along with `:set+=` and `:set-=`).
The existing tab completion for setting options currently only works
when nothing is typed yet, and it only fills in with the existing value,
e.g. when the user does `:set diffopt=<Tab>` it will be completed to
`set diffopt=internal,filler,closeoff` and nothing else. This isn't too
useful as a user usually wants auto-complete to suggest all the possible
values, such as 'iblank', or 'algorithm:patience'.
For set= and set+=, this adds a new optional callback function for each
option that can be invoked when doing completion. This allows for each
option to have control over how completion works. For example, in
'diffopt', it will suggest the default enumeration, but if `algorithm:`
is selected, it will further suggest different algorithm types like
'meyers' and 'patience'. When using set=, the existing option value will
be filled in as the first choice to preserve the existing behavior. When
using set+= this won't happen as it doesn't make sense.
For flag list options (e.g. 'mouse' and 'guioptions'), completion will
take into account existing typed values (and in the case of set+=, the
existing option value) to make sure it doesn't suggest duplicates.
For set-=, there is a new `ExpandSettingSubtract` function which will
handle flag list and comma-separated options smartly, by only suggesting
values that currently exist in the option.
Note that Vim has some existing code that adds special handling for
'filetype', 'syntax', and misc dir options like 'backupdir'. This change
preserves them as they already work, instead of converting to the new
callback API for each option.
closes: #13182
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
Diffstat (limited to 'src/popupwin.c')
-rw-r--r-- | src/popupwin.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/popupwin.c b/src/popupwin.c index a8ac39d27f..de604858c4 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -1803,6 +1803,7 @@ parse_popup_option(win_T *wp, int is_preview) dig = e + 1; x = getdigits(&dig); + // Note: Keep this in sync with p_popup_option_values. if (STRNCMP(s, "height:", 7) == 0) { if (dig != p) @@ -1840,6 +1841,7 @@ parse_popup_option(win_T *wp, int is_preview) } else if (STRNCMP(s, "border:", 7) == 0) { + // Note: Keep this in sync with p_popup_option_border_values. char_u *arg = s + 7; int on = STRNCMP(arg, "on", 2) == 0 && arg + 2 == p; int off = STRNCMP(arg, "off", 3) == 0 && arg + 3 == p; @@ -1858,6 +1860,7 @@ parse_popup_option(win_T *wp, int is_preview) } else if (STRNCMP(s, "align:", 6) == 0) { + // Note: Keep this in sync with p_popup_option_align_values. char_u *arg = s + 6; int item = STRNCMP(arg, "item", 4) == 0 && arg + 4 == p; int menu = STRNCMP(arg, "menu", 4) == 0 && arg + 4 == p; |