diff options
| -rw-r--r-- | src/nvim/charset.c | 4 | ||||
| -rw-r--r-- | src/nvim/runtime.c | 9 | ||||
| -rw-r--r-- | test/old/testdir/test_packadd.vim | 35 |
3 files changed, 44 insertions, 4 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c index c6efb4b3b4..4030d818c8 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -1376,7 +1376,7 @@ char *skiptowhite(const char *p) /// @param p /// /// @return Pointer to the next whitespace character. -char *skiptowhite_esc(char *p) +char *skiptowhite_esc(const char *p) FUNC_ATTR_PURE { while (*p != ' ' && *p != '\t' && *p != NUL) { @@ -1385,7 +1385,7 @@ char *skiptowhite_esc(char *p) } p++; } - return p; + return (char *)p; } /// Skip over text until '\n' or NUL. diff --git a/src/nvim/runtime.c b/src/nvim/runtime.c index 290b773371..89ffecd333 100644 --- a/src/nvim/runtime.c +++ b/src/nvim/runtime.c @@ -265,6 +265,15 @@ void set_context_in_runtime_cmd(expand_T *xp, const char *arg) char *p = skiptowhite(arg); runtime_expand_flags = *p != NUL ? get_runtime_cmd_flags((char **)&arg, (size_t)(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 = (char *)arg; } diff --git a/test/old/testdir/test_packadd.vim b/test/old/testdir/test_packadd.vim index 64c8fd8659..332b376bf7 100644 --- a/test/old/testdir/test_packadd.vim +++ b/test/old/testdir/test_packadd.vim @@ -388,9 +388,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 @@ -404,39 +404,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 |