diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-06 14:12:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-06 14:12:50 +0200 |
| commit | 7522f6982197f83a5c0f6e9af07fb713934f824a (patch) | |
| tree | 83081f448c1fa8a0730e5f0ae8d31a13d9582cdf /src | |
| parent | 7ab6defcafe017a3ad58580a3e56dab705b1ed8b (diff) | |
patch 7.4.2162v7.4.2162
Problem: Result of getcompletion('', 'sign') depends on previous
completion.
Solution: Call set_context_in_sign_cmd(). (Dominique Pelle)
Diffstat (limited to 'src')
| -rw-r--r-- | src/evalfunc.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_cmdline.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 22 insertions, 3 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index dc0e630af8..3754534460 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -4247,6 +4247,13 @@ f_getcompletion(typval_T *argvars, typval_T *rettv) xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); } #endif +#ifdef FEAT_SIGNS + if (xpc.xp_context == EXPAND_SIGN) + { + set_context_in_sign_cmd(&xpc, xpc.xp_pattern); + xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); + } +#endif pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context); if ((rettv_list_alloc(rettv) != FAIL) && (pat != NULL)) diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 12194cd963..e2c1876934 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -138,6 +138,19 @@ func Test_getcompletion() call assert_equal(keys, l) endif + if has('signs') + sign define Testing linehl=Comment + let l = getcompletion('', 'sign') + let cmds = ['define', 'jump', 'list', 'place', 'undefine', 'unplace'] + call assert_equal(cmds, l) + " using cmdline completion must not change the result + call feedkeys(":sign list \<c-d>\<c-c>", 'xt') + let l = getcompletion('', 'sign') + call assert_equal(cmds, l) + let l = getcompletion('list ', 'sign') + call assert_equal(['Testing'], l) + endif + " For others test if the name is recognized. let names = ['buffer', 'environment', 'file_in_path', \ 'mapping', 'shellcmd', 'tag', 'tag_listfiles', 'user'] @@ -150,9 +163,6 @@ func Test_getcompletion() if has('profile') call add(names, 'syntime') endif - if has('signs') - call add(names, 'sign') - endif set tags=Xtags call writefile(["!_TAG_FILE_ENCODING\tutf-8\t//", "word\tfile\tcmd"], 'Xtags') diff --git a/src/version.c b/src/version.c index e68df1f5ac..bd2b16c7ab 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2162, +/**/ 2161, /**/ 2160, |