Mercurial > vim
changeset 16495:899db156cce3 v8.1.1251
patch 8.1.1251: no test for completion of mapping keys
commit https://github.com/vim/vim/commit/2cb9f0253228478ec27265ff40f59c629874d695
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 3 15:13:57 2019 +0200
patch 8.1.1251: no test for completion of mapping keys
Problem: No test for completion of mapping keys.
Solution: Add a test. Also clean up the code.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 03 May 2019 15:15:05 +0200 |
| parents | 373cf579e4ca |
| children | 7dabb1711e1d |
| files | src/getchar.c src/proto/term.pro src/term.c src/testdir/test_cmdline.vim src/version.c |
| diffstat | 5 files changed, 50 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/getchar.c +++ b/src/getchar.c @@ -4263,7 +4263,7 @@ set_context_in_map_cmd( } /* - * Find all mapping/abbreviation names that match regexp 'prog'. + * Find all mapping/abbreviation names that match regexp "regmatch"'. * For command line expansion of ":[un]map" and ":[un]abbrev" in all modes. * Return OK if matches found, FAIL otherwise. */ @@ -4343,7 +4343,7 @@ ExpandMappings( { if (mp->m_mode & expand_mapmodes) { - p = translate_mapping(mp->m_keys, TRUE); + p = translate_mapping(mp->m_keys); if (p != NULL && vim_regexec(regmatch, p, (colnr_T)0)) { if (round == 1)
--- a/src/proto/term.pro +++ b/src/proto/term.pro @@ -74,7 +74,7 @@ char_u *replace_termcodes(char_u *from, int find_term_bykeys(char_u *src); void show_termcodes(void); int show_one_termcode(char_u *name, char_u *code, int printit); -char_u *translate_mapping(char_u *str, int expmap); +char_u *translate_mapping(char_u *str); void update_tcap(int attr); void swap_tcap(void); guicolor_T gui_get_color_cmn(char_u *name);
--- a/src/term.c +++ b/src/term.c @@ -6629,22 +6629,20 @@ check_for_codes_from_term(void) #if defined(FEAT_CMDL_COMPL) || defined(PROTO) /* * Translate an internal mapping/abbreviation representation into the - * corresponding external one recognized by :map/:abbrev commands; - * respects the current B/k/< settings of 'cpoption'. + * corresponding external one recognized by :map/:abbrev commands. + * Respects the current B/k/< settings of 'cpoption'. * * This function is called when expanding mappings/abbreviations on the - * command-line, and for building the "Ambiguous mapping..." error message. + * command-line. * - * It uses a growarray to build the translation string since the - * latter can be wider than the original description. The caller has to - * free the string afterwards. + * It uses a growarray to build the translation string since the latter can be + * wider than the original description. The caller has to free the string + * afterwards. * * Returns NULL when there is a problem. */ char_u * -translate_mapping( - char_u *str, - int expmap) /* TRUE when expanding mappings on command-line */ +translate_mapping(char_u *str) { garray_T ga; int c; @@ -6691,7 +6689,7 @@ translate_mapping( } if (c == K_SPECIAL && str[1] != NUL && str[2] != NUL) { - if (expmap && cpo_special) + if (cpo_special) { ga_clear(&ga); return NULL; @@ -6703,7 +6701,7 @@ translate_mapping( } if (IS_SPECIAL(c) || modifiers) /* special key */ { - if (expmap && cpo_special) + if (cpo_special) { ga_clear(&ga); return NULL;
--- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -77,6 +77,42 @@ func Test_map_completion() call assert_equal('"map <special> <nowait>', getreg(':')) call feedkeys(":map <silent> <sp\<Tab>\<Home>\"\<CR>", 'xt') call assert_equal('"map <silent> <special>', getreg(':')) + + map ,f commaf + map ,g commaf + call feedkeys(":map ,\<Tab>\<Home>\"\<CR>", 'xt') + call assert_equal('"map ,f', getreg(':')) + call feedkeys(":map ,\<Tab>\<Tab>\<Home>\"\<CR>", 'xt') + call assert_equal('"map ,g', getreg(':')) + unmap ,f + unmap ,g + + set cpo-=< cpo-=B cpo-=k + map <Left> left + call feedkeys(":map <L\<Tab>\<Home>\"\<CR>", 'xt') + call assert_equal('"map <Left>', getreg(':')) + unmap <Left> + + set cpo+=< + map <Left> left + call feedkeys(":map <L\<Tab>\<Home>\"\<CR>", 'xt') + call assert_equal('"map <Left>', getreg(':')) + unmap <Left> + set cpo-=< + + set cpo+=B + map <Left> left + call feedkeys(":map <L\<Tab>\<Home>\"\<CR>", 'xt') + call assert_equal('"map <Left>', getreg(':')) + unmap <Left> + set cpo-=B + + set cpo+=k + map <Left> left + call feedkeys(":map <L\<Tab>\<Home>\"\<CR>", 'xt') + call assert_equal('"map <Left>', getreg(':')) + unmap <Left> + set cpo-=k endfunc func Test_match_completion()