aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 9.0.1329: completion of map includes simplified ones

Browse Source 
Problem:    Completion of map includes simplified ones.
Solution:   Do not complete simplified mappings. (closes #12013)
This commit is contained in:
zeertzjq
2023-02-19 21:00:31 +00:00
committed by Bram Moolenaar
parent 5b9f57262f
commit 997b8a015c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/map.c
View File

@@ -180,7 +180,7 @@ showmap(
len = msg_outtrans_special(mp->m_keys, TRUE, 0); len = msg_outtrans_special(mp->m_keys, TRUE, 0);
do do
{ {
msg_putchar(' '); // padd with blanks msg_putchar(' '); // pad with blanks
++len; ++len;
} while (len < 12); } while (len < 12);
@@ -1445,7 +1445,7 @@ ExpandMappings(
mp = maphash[hash]; mp = maphash[hash];
for (; mp; mp = mp->m_next) for (; mp; mp = mp->m_next)
{ {
if (!(mp->m_mode & expand_mapmodes)) if (mp->m_simplified || !(mp->m_mode & expand_mapmodes))
continue; continue;
p = translate_mapping(mp->m_keys); p = translate_mapping(mp->m_keys);

9
src/testdir/test_mapping.vim
View File

@@ -783,11 +783,12 @@ func Test_mapcomplete()
call feedkeys(":abbr! \<C-A>\<C-B>\"\<CR>", 'tx') call feedkeys(":abbr! \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"abbr! \x01", @:) call assert_equal("\"abbr! \x01", @:)
" Multiple matches for a map " When multiple matches have the same {lhs}, it should only appear once.
nmap ,f /H<CR> " The simplified form should also not be included.
omap ,f /H<CR> nmap ,<C-F> /H<CR>
omap ,<C-F> /H<CR>
call feedkeys(":map ,\<C-A>\<C-B>\"\<CR>", 'tx') call feedkeys(":map ,\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"map ,f', @:) call assert_equal('"map ,<C-F>', @:)
mapclear mapclear
endfunc endfunc

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1329,
/**/ /**/
1328, 1328,
/**/ /**/