diff options
| author | naohiro ono <obcat@icloud.com> | 2021-09-12 15:45:10 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-09-12 15:45:10 +0200 |
| commit | dfe04dbff5863f6c089da8831d7ac2a3421a44b7 (patch) | |
| tree | 4adc6720e23e1d34892e9c49acab5134b24af80e /src | |
| parent | f1e8876fa2359b572d262772747405d3616db670 (diff) | |
patch 8.2.3431: completion for :disas sorts local functions firstv8.2.3431
Problem: Completion for :disas sorts local functions first.
Solution: Sort local functions last, like with :delfunc. (Naohiro Ono,
closes #8860)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmdexpand.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_cmdline.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/cmdexpand.c b/src/cmdexpand.c index 6c92957692..c36c21a3d8 100644 --- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -2262,7 +2262,8 @@ ExpandGeneric( { if (xp->xp_context == EXPAND_EXPRESSION || xp->xp_context == EXPAND_FUNCTIONS - || xp->xp_context == EXPAND_USER_FUNC) + || xp->xp_context == EXPAND_USER_FUNC + || xp->xp_context == EXPAND_DISASSEMBLE) // <SNR> functions should be sorted to the end. qsort((void *)*file, (size_t)*num_file, sizeof(char_u *), sort_func_compare); diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 15ec7d8a35..a0f3ffda42 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -854,6 +854,11 @@ func Test_cmdline_complete_various() call feedkeys(":disas s:WeirdF\<C-A>\<C-B>\"\<CR>", 'xt') call assert_match('"disas <SNR>\d\+_WeirdFunc', @:) + call feedkeys(":disas \<S-Tab>\<C-B>\"\<CR>", 'xt') + call assert_match('"disas <SNR>\d\+_', @:) + call feedkeys(":disas debug \<S-Tab>\<C-B>\"\<CR>", 'xt') + call assert_match('"disas debug <SNR>\d\+_', @:) + " completion for the :match command call feedkeys(":match Search /pat/\<C-A>\<C-B>\"\<CR>", 'xt') call assert_equal("\"match Search /pat/\<C-A>", @:) diff --git a/src/version.c b/src/version.c index fe111e5936..053648a558 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3431, +/**/ 3430, /**/ 3429, |