Mercurial > vim
changeset 32844:5d3c0f914f26 v9.0.1734
patch 9.0.1734: :runtime completion fails for multiple args
Commit: https://github.com/vim/vim/commit/be5cdd1d634c2dfc7e415499fb18f4d246a8721c
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu Aug 17 23:48:58 2023 +0200
patch 9.0.1734: :runtime completion fails for multiple args
Problem: :runtime completion fails for multiple args
Solution: Make it work
closes: #12616
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 18 Aug 2023 00:00:05 +0200 |
parents | 2066721afa0e |
children | e8eca84950e1 |
files | src/scriptfile.c src/testdir/test_packadd.vim src/version.c |
diffstat | 3 files changed, 44 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -289,6 +289,15 @@ set_context_in_runtime_cmd(expand_T *xp, char_u *p = skiptowhite(arg); runtime_expand_flags = *p != NUL ? get_runtime_cmd_flags(&arg, p - arg) : 0; + // Skip to the last argument. + while (*(p = skiptowhite_esc(arg)) != NUL) + { + if (runtime_expand_flags == 0) + // When there are multiple arguments and [where] is not specified, + // use an unrelated non-zero flag to avoid expanding [where]. + runtime_expand_flags = DIP_ALL; + arg = skipwhite(p); + } xp->xp_context = EXPAND_RUNTIME; xp->xp_pattern = arg; }
--- a/src/testdir/test_packadd.vim +++ b/src/testdir/test_packadd.vim @@ -433,9 +433,9 @@ func Test_runtime_completion() call writefile([], optdir . '/../Aunrelated') exe 'set rtp=' . &packpath . '/runtime' - func Check_runtime_completion(arg, arg1, res) + func Check_runtime_completion(arg, arg_prev, res) call feedkeys(':runtime ' .. a:arg .. "\<C-A>\<C-B>\"\<CR>", 'xt') - call assert_equal('"runtime ' .. a:arg1 .. join(a:res), @:) + call assert_equal('"runtime ' .. a:arg_prev .. join(a:res), @:) call assert_equal(a:res, getcompletion(a:arg, 'runtime')) endfunc @@ -449,39 +449,70 @@ func Test_runtime_completion() \ ['PACK']) call Check_runtime_completion('A', '', \ ['Aextra/', 'Arunfoo.vim', 'ALL']) + call Check_runtime_completion('Other.vim ', 'Other.vim ', + \ ['Aextra/', 'Arunfoo.vim']) call Check_runtime_completion('Aextra/', '', \ ['Aextra/Arunbar.vim', 'Aextra/Arunbaz/']) + call Check_runtime_completion('Other.vim Aextra/', 'Other.vim ', + \ ['Aextra/Arunbar.vim', 'Aextra/Arunbaz/']) call Check_runtime_completion('START ', 'START ', \ ['Aextra/', 'Astartfoo.vim']) + call Check_runtime_completion('START Other.vim ', 'START Other.vim ', + \ ['Aextra/', 'Astartfoo.vim']) call Check_runtime_completion('START A', 'START ', \ ['Aextra/', 'Astartfoo.vim']) + call Check_runtime_completion('START Other.vim A', 'START Other.vim ', + \ ['Aextra/', 'Astartfoo.vim']) call Check_runtime_completion('START Aextra/', 'START ', \ ['Aextra/Astartbar.vim', 'Aextra/Astartbaz/']) + call Check_runtime_completion('START Other.vim Aextra/', 'START Other.vim ', + \ ['Aextra/Astartbar.vim', 'Aextra/Astartbaz/']) call Check_runtime_completion('OPT ', 'OPT ', \ ['Aextra/', 'Aoptfoo.vim']) + call Check_runtime_completion('OPT Other.vim ', 'OPT Other.vim ', + \ ['Aextra/', 'Aoptfoo.vim']) call Check_runtime_completion('OPT A', 'OPT ', \ ['Aextra/', 'Aoptfoo.vim']) + call Check_runtime_completion('OPT Other.vim A', 'OPT Other.vim ', + \ ['Aextra/', 'Aoptfoo.vim']) call Check_runtime_completion('OPT Aextra/', 'OPT ', \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/']) + call Check_runtime_completion('OPT Other.vim Aextra/', 'OPT Other.vim ', + \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/']) call Check_runtime_completion('PACK ', 'PACK ', \ ['Aextra/', 'Aoptfoo.vim', 'Astartfoo.vim']) + call Check_runtime_completion('PACK Other.vim ', 'PACK Other.vim ', + \ ['Aextra/', 'Aoptfoo.vim', 'Astartfoo.vim']) call Check_runtime_completion('PACK A', 'PACK ', \ ['Aextra/', 'Aoptfoo.vim', 'Astartfoo.vim']) + call Check_runtime_completion('PACK Other.vim A', 'PACK Other.vim ', + \ ['Aextra/', 'Aoptfoo.vim', 'Astartfoo.vim']) call Check_runtime_completion('PACK Aextra/', 'PACK ', \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/', \ 'Aextra/Astartbar.vim', 'Aextra/Astartbaz/']) + call Check_runtime_completion('PACK Other.vim Aextra/', 'PACK Other.vim ', + \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/', + \ 'Aextra/Astartbar.vim', 'Aextra/Astartbaz/']) call Check_runtime_completion('ALL ', 'ALL ', \ ['Aextra/', 'Aoptfoo.vim', 'Arunfoo.vim', 'Astartfoo.vim']) + call Check_runtime_completion('ALL Other.vim ', 'ALL Other.vim ', + \ ['Aextra/', 'Aoptfoo.vim', 'Arunfoo.vim', 'Astartfoo.vim']) call Check_runtime_completion('ALL A', 'ALL ', \ ['Aextra/', 'Aoptfoo.vim', 'Arunfoo.vim', 'Astartfoo.vim']) + call Check_runtime_completion('ALL Other.vim A', 'ALL Other.vim ', + \ ['Aextra/', 'Aoptfoo.vim', 'Arunfoo.vim', 'Astartfoo.vim']) call Check_runtime_completion('ALL Aextra/', 'ALL ', \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/', \ 'Aextra/Arunbar.vim', 'Aextra/Arunbaz/', \ 'Aextra/Astartbar.vim', 'Aextra/Astartbaz/']) + call Check_runtime_completion('ALL Other.vim Aextra/', 'ALL Other.vim ', + \ ['Aextra/Aoptbar.vim', 'Aextra/Aoptbaz/', + \ 'Aextra/Arunbar.vim', 'Aextra/Arunbaz/', + \ 'Aextra/Astartbar.vim', 'Aextra/Astartbaz/']) delfunc Check_runtime_completion endfunc