From f6a6db3e248dd6360dbd55574321ddc216848c13 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 17 Feb 2023 07:59:22 +0800 Subject: vim-patch:8.2.0148: mapping related function in wrong source file Problem: Mapping related function in wrong source file. Solution: Move the function. Add a few more test cases. (Yegappan Lakshmanan, closes vim/vim#5528) https://github.com/vim/vim/commit/7f51bbe0d19f1f0cb0321326f45a17b4f5155f89 Co-authored-by: Bram Moolenaar --- src/nvim/testdir/test_mapping.vim | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'src/nvim/testdir/test_mapping.vim') diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim index 5c5a65d4ca..6cf19306ec 100644 --- a/src/nvim/testdir/test_mapping.vim +++ b/src/nvim/testdir/test_mapping.vim @@ -934,6 +934,39 @@ func Test_abbr_remove() call assert_equal({}, maparg('foo', 'i', 1, 1)) endfunc +" Trigger an abbreviation using a special key +func Test_abbr_trigger_special() + new + iabbr teh the + call feedkeys("iteh\\", 'xt') + call assert_equal('the', getline(1)) + iunab teh + close! +endfunc + +" Test for '<' in 'cpoptions' +func Test_map_cpo_special_keycode() + set cpo-=< + imap xk Test + let d = maparg('xk', 'i', 0, 1) + call assert_equal(['x\k', 'Test', 'i'], [d.lhs, d.rhs, d.mode]) + call feedkeys(":imap x\\\"\", 'tx') + call assert_equal('"imap x\k', @:) + iunmap xk + " Nvim: no "<" flag in 'cpoptions'. + " set cpo+=< + " imap xk Test + " let d = maparg('xk', 'i', 0, 1) + " call assert_equal(['xk', 'Test', 'i'], [d.lhs, d.rhs, d.mode]) + " call feedkeys(":imap x\\\"\", 'tx') + " call assert_equal('"imap xk', @:) + " iunmap xk + set cpo-=< + " Modifying 'cpo' above adds some default mappings, remove them + mapclear + mapclear! +endfunc + func Test_map_cmdkey_redo() func SelectDash() call search('^---\n\zs', 'bcW') -- cgit From 8784f064f15e5ae0b6bc85c2972ec16c64656e2b Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 20 Feb 2023 08:24:49 +0800 Subject: vim-patch:9.0.1329: completion of map includes simplified ones (#22335) Problem: Completion of map includes simplified ones. Solution: Do not complete simplified mappings. (closes vim/vim#12013) https://github.com/vim/vim/commit/997b8a015cd39141866e953651d55c705275cbd6 --- src/nvim/testdir/test_mapping.vim | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/nvim/testdir/test_mapping.vim') diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim index 6cf19306ec..e25c3c333e 100644 --- a/src/nvim/testdir/test_mapping.vim +++ b/src/nvim/testdir/test_mapping.vim @@ -759,11 +759,12 @@ func Test_mapcomplete() call feedkeys(":abbr! \\\"\", 'tx') call assert_equal("\"abbr! \x01", @:) - " Multiple matches for a map - nmap ,f /H - omap ,f /H + " When multiple matches have the same {lhs}, it should only appear once. + " The simplified form should also not be included. + nmap , /H + omap , /H call feedkeys(":map ,\\\"\", 'tx') - call assert_equal('"map ,f', @:) + call assert_equal('"map ,', @:) mapclear endfunc -- cgit From af23d173883f47fd02a9a380c719e4428370b484 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Tue, 7 Mar 2023 04:13:04 +0100 Subject: test: move oldtests to test directory (#22536) The new oldtest directory is in test/old/testdir. The reason for this is that many tests have hardcoded the parent directory name to be 'testdir'. --- src/nvim/testdir/test_mapping.vim | 1227 ------------------------------------- 1 file changed, 1227 deletions(-) delete mode 100644 src/nvim/testdir/test_mapping.vim (limited to 'src/nvim/testdir/test_mapping.vim') diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim deleted file mode 100644 index e25c3c333e..0000000000 --- a/src/nvim/testdir/test_mapping.vim +++ /dev/null @@ -1,1227 +0,0 @@ -" Tests for mappings and abbreviations - -source shared.vim -source check.vim -source screendump.vim - -func Test_abbreviation() - " abbreviation with 0x80 should work - inoreab чкпр vim - call feedkeys("Goчкпр \", "xt") - call assert_equal('vim ', getline('$')) - iunab чкпр - set nomodified -endfunc - -func Test_abclear() - abbrev foo foobar - iabbrev fooi foobari - cabbrev fooc foobarc - call assert_equal("\n\nc fooc foobarc\ni fooi foobari\n! foo foobar", execute('abbrev')) - - iabclear - call assert_equal("\n\nc fooc foobarc\nc foo foobar", execute('abbrev')) - abbrev foo foobar - iabbrev fooi foobari - - cabclear - call assert_equal("\n\ni fooi foobari\ni foo foobar", execute('abbrev')) - abbrev foo foobar - cabbrev fooc foobarc - - abclear - call assert_equal("\n\nNo abbreviation found", execute('abbrev')) - call assert_fails('%abclear', 'E481:') -endfunc - -func Test_abclear_buffer() - abbrev foo foobar - new X1 - abbrev foo1 foobar1 - new X2 - abbrev foo2 foobar2 - - call assert_equal("\n\n! foo2 @foobar2\n! foo foobar", execute('abbrev')) - - abclear - call assert_equal("\n\n! foo foobar", execute('abbrev')) - - b X1 - call assert_equal("\n\n! foo1 @foobar1\n! foo foobar", execute('abbrev')) - abclear - call assert_equal("\n\n! foo foobar", execute('abbrev')) - - abclear - call assert_equal("\n\nNo abbreviation found", execute('abbrev')) - - %bwipe -endfunc - -func Test_map_ctrl_c_insert() - " mapping of ctrl-c in Insert mode - set cpo-=< cpo-=k - inoremap - cnoremap dummy - cunmap - call feedkeys("GoTEST2: CTRL-C |\<*C-C>A|\", "xt") - call assert_equal('TEST2: CTRL-C |A|', getline('$')) - unmap! - set nomodified -endfunc - -func Test_map_ctrl_c_visual() - " mapping of ctrl-c in Visual mode - vnoremap :$put ='vmap works' - call feedkeys("GV\<*C-C>\", "xt") - call assert_equal('vmap works', getline('$')) - vunmap - set nomodified -endfunc - -func Test_map_langmap() - if !has('langmap') - return - endif - - " check langmap applies in normal mode - set langmap=+- nolangremap - new - call setline(1, ['a', 'b', 'c']) - 2 - call assert_equal('b', getline('.')) - call feedkeys("+", "xt") - call assert_equal('a', getline('.')) - - " check no remapping - map x + - 2 - call feedkeys("x", "xt") - call assert_equal('c', getline('.')) - - " check with remapping - set langremap - 2 - call feedkeys("x", "xt") - call assert_equal('a', getline('.')) - - unmap x - bwipe! - - " 'langnoremap' follows 'langremap' and vise versa - set langremap - set langnoremap - call assert_equal(0, &langremap) - set langremap - call assert_equal(0, &langnoremap) - set nolangremap - call assert_equal(1, &langnoremap) - - " check default values - set langnoremap& - call assert_equal(1, &langnoremap) - call assert_equal(0, &langremap) - set langremap& - call assert_equal(1, &langnoremap) - call assert_equal(0, &langremap) - - " langmap should not apply in insert mode, 'langremap' doesn't matter - set langmap=+{ nolangremap - call feedkeys("Go+\", "xt") - call assert_equal('+', getline('$')) - set langmap=+{ langremap - call feedkeys("Go+\", "xt") - call assert_equal('+', getline('$')) - - " langmap used for register name in insert mode. - call setreg('a', 'aaaa') - call setreg('b', 'bbbb') - call setreg('c', 'cccc') - set langmap=ab langremap - call feedkeys("Go\a\", "xt") - call assert_equal('bbbb', getline('$')) - call feedkeys("Go\\a\", "xt") - call assert_equal('bbbb', getline('$')) - " mapping does not apply - imap c a - call feedkeys("Go\c\", "xt") - call assert_equal('cccc', getline('$')) - imap a c - call feedkeys("Go\a\", "xt") - call assert_equal('bbbb', getline('$')) - - " langmap should not apply in Command-line mode - set langmap=+{ nolangremap - call feedkeys(":call append(line('$'), '+')\", "xt") - call assert_equal('+', getline('$')) - - iunmap a - iunmap c - set nomodified -endfunc - -func Test_map_feedkeys() - " issue #212 (feedkeys insert mapping at current position) - nnoremap . :call feedkeys(".", "in") - call setline('$', ['a b c d', 'a b c d']) - $-1 - call feedkeys("0qqdw.ifoo\qj0@q\", "xt") - call assert_equal(['fooc d', 'fooc d'], getline(line('$') - 1, line('$'))) - nunmap . - set nomodified -endfunc - -func Test_map_cursor() - " U works only within a single line - imapclear - imap ( ()U - call feedkeys("G2o\ki\Test1: text with a (here some more text\k.", "xt") - call assert_equal('Test1: text with a (here some more text)', getline(line('$') - 2)) - call assert_equal('Test1: text with a (here some more text)', getline(line('$') - 1)) - - " test undo - call feedkeys("G2o\ki\Test2: text wit a (here some more text [und undo]\u\k.u", "xt") - call assert_equal('', getline(line('$') - 2)) - call assert_equal('Test2: text wit a (here some more text [und undo])', getline(line('$') - 1)) - set nomodified - imapclear -endfunc - -func Test_map_cursor_ctrl_gU() - " U works only within a single line - nnoremap c<* *Ncgn"U - call setline(1, ['foo', 'foobar', '', 'foo']) - call cursor(1,2) - call feedkeys("c<*PREFIX\.", 'xt') - call assert_equal(['PREFIXfoo', 'foobar', '', 'PREFIXfoo'], getline(1,'$')) - " break undo manually - set ul=1000 - exe ":norm! uu" - call assert_equal(['foo', 'foobar', '', 'foo'], getline(1,'$')) - - " Test that it does not work if the cursor moves to the previous line - " 2 times move to the previous line - nnoremap c<* *Ncgn"UU - call setline(1, ['', ' foo', 'foobar', '', 'foo']) - call cursor(2,3) - call feedkeys("c<*PREFIX\.", 'xt') - call assert_equal(['PREFIXPREFIX', ' foo', 'foobar', '', 'foo'], getline(1,'$')) - nmapclear -endfunc - - -" This isn't actually testing a mapping, but similar use of CTRL-G U as above. -func Test_break_undo() - set whichwrap=<,>,[,] - call feedkeys("G4o2k", "xt") - exe ":norm! iTest3: text with a (parenthesis here\U\new line here\\\." - call assert_equal('new line here', getline(line('$') - 3)) - call assert_equal('Test3: text with a (parenthesis here', getline(line('$') - 2)) - call assert_equal('new line here', getline(line('$') - 1)) - set nomodified -endfunc - -func Test_map_meta_quotes() - imap foo - call feedkeys("Go-\<*M-\">-\", "xt") - call assert_equal("-foo-", getline('$')) - set nomodified - iunmap -endfunc - -func Test_map_meta_multibyte() - imap foo - call assert_match('i \s*foo', execute('imap')) - iunmap -endfunc - -func Test_abbr_after_line_join() - new - abbr foo bar - set backspace=indent,eol,start - exe "normal o\foo " - call assert_equal("bar ", getline(1)) - bwipe! - unabbr foo - set backspace& -endfunc - -func Test_map_timeout() - if !has('timers') - return - endif - nnoremap aaaa :let got_aaaa = 1 - nnoremap bb :let got_bb = 1 - nmap b aaa - new - func ExitInsert(timer) - let g:line = getline(1) - call feedkeys("\", "t") - endfunc - set timeout timeoutlen=200 - let timer = timer_start(300, 'ExitInsert') - " After the 'b' Vim waits for another character to see if it matches 'bb'. - " When it times out it is expanded to "aaa", but there is no wait for - " "aaaa". Can't check that reliably though. - call feedkeys("b", "xt!") - call assert_equal("aa", g:line) - call assert_false(exists('got_aaa')) - call assert_false(exists('got_bb')) - - bwipe! - nunmap aaaa - nunmap bb - nunmap b - set timeoutlen& - delfunc ExitInsert - call timer_stop(timer) -endfunc - -func Test_map_timeout_with_timer_interrupt() - if !has('job') || !has('timers') - return - endif - - " Confirm the timer invoked in exit_cb of the job doesn't disturb mapped key - " sequence. - new - let g:val = 0 - nnoremap \12 :let g:val = 1 - nnoremap \123 :let g:val = 2 - set timeout timeoutlen=200 - - func ExitCb(job, status) - let g:timer = timer_start(1, {-> feedkeys("3\", 't')}) - endfunc - - call job_start([&shell, &shellcmdflag, 'echo'], {'exit_cb': 'ExitCb'}) - call feedkeys('\12', 'xt!') - call assert_equal(2, g:val) - - bwipe! - nunmap \12 - nunmap \123 - set timeoutlen& - call WaitFor({-> exists('g:timer')}) - call timer_stop(g:timer) - unlet g:timer - unlet g:val - delfunc ExitCb -endfunc - -func Test_cabbr_visual_mode() - cabbr s su - call feedkeys(":s \\"\", 'itx') - call assert_equal('"su ', getreg(':')) - call feedkeys(":'<,'>s \\"\", 'itx') - let expected = '"'. "'<,'>su " - call assert_equal(expected, getreg(':')) - call feedkeys(": '<,'>s \\"\", 'itx') - let expected = '" '. "'<,'>su " - call assert_equal(expected, getreg(':')) - call feedkeys(":'a,'bs \\"\", 'itx') - let expected = '"'. "'a,'bsu " - call assert_equal(expected, getreg(':')) - cunabbr s -endfunc - -func Test_abbreviation_CR() - new - func Eatchar(pat) - let c = nr2char(getchar(0)) - return (c =~ a:pat) ? '' : c - endfunc - iabbrev ~~7 =repeat('~', 7)=Eatchar('\s') - call feedkeys("GA~~7 \", 'xt') - call assert_equal('~~~~~~~', getline('$')) - %d - call feedkeys("GA~~7\\", 'xt') - call assert_equal(['~~~~~~~', ''], getline(1,'$')) - delfunc Eatchar - bw! -endfunc - -func Test_motionforce_omap() - func GetCommand() - let g:m=mode(1) - let [g:lnum1, g:col1] = searchpos('-', 'Wb') - if g:lnum1 == 0 - return "\" - endif - let [g:lnum2, g:col2] = searchpos('-', 'W') - if g:lnum2 == 0 - return "\" - endif - return ":call Select()\" - endfunc - func Select() - call cursor([g:lnum1, g:col1]) - exe "normal! 1 ". (strlen(g:m) == 2 ? 'v' : g:m[2]) - call cursor([g:lnum2, g:col2]) - execute "normal! \" - endfunc - new - onoremap i- GetCommand() - " 1) default omap mapping - %d_ - call setline(1, ['aaa - bbb', 'x', 'ddd - eee']) - call cursor(2, 1) - norm di- - call assert_equal('no', g:m) - call assert_equal(['aaa -- eee'], getline(1, '$')) - " 2) forced characterwise operation - %d_ - call setline(1, ['aaa - bbb', 'x', 'ddd - eee']) - call cursor(2, 1) - norm dvi- - call assert_equal('nov', g:m) - call assert_equal(['aaa -- eee'], getline(1, '$')) - " 3) forced linewise operation - %d_ - call setline(1, ['aaa - bbb', 'x', 'ddd - eee']) - call cursor(2, 1) - norm dVi- - call assert_equal('noV', g:m) - call assert_equal([''], getline(1, '$')) - " 4) forced blockwise operation - %d_ - call setline(1, ['aaa - bbb', 'x', 'ddd - eee']) - call cursor(2, 1) - exe "norm d\i-" - call assert_equal("no\", g:m) - call assert_equal(['aaabbb', 'x', 'dddeee'], getline(1, '$')) - bwipe! - delfunc Select - delfunc GetCommand -endfunc - -func Test_error_in_map_expr() - " Unlike CheckRunVimInTerminal this does work in a win32 console - CheckFeature terminal - if has('win32') && has('gui_running') - throw 'Skipped: cannot run Vim in a terminal window' - endif - - let lines =<< trim [CODE] - func Func() - " fail to create list - let x = [ - endfunc - nmap ! Func() - set updatetime=50 - [CODE] - call writefile(lines, 'Xtest.vim') - - let buf = term_start(GetVimCommandCleanTerm() .. ' -S Xtest.vim', {'term_rows': 8}) - let job = term_getjob(buf) - call WaitForAssert({-> assert_notequal('', term_getline(buf, 8))}) - - " GC must not run during map-expr processing, which can make Vim crash. - call term_sendkeys(buf, '!') - call term_wait(buf, 100) - call term_sendkeys(buf, "\") - call term_wait(buf, 100) - call assert_equal('run', job_status(job)) - - call term_sendkeys(buf, ":qall!\") - call WaitFor({-> job_status(job) ==# 'dead'}) - if has('unix') - call assert_equal('', job_info(job).termsig) - endif - - call delete('Xtest.vim') - exe buf .. 'bwipe!' -endfunc - -func Test_list_mappings() - " Remove default mappings - imapclear - - " reset 'isident' to check it isn't used - set isident= - inoremap CtrlM - inoremap AltS - inoremap ShiftSlash - set isident& - call assert_equal([ - \ 'i * ShiftSlash', - \ 'i * AltS', - \ 'i * CtrlM', - \], execute('imap')->trim()->split("\n")) - iunmap - iunmap - call assert_equal(['i * ShiftSlash'], execute('imap')->trim()->split("\n")) - iunmap - call assert_equal(['No mapping found'], execute('imap')->trim()->split("\n")) - - " List global, buffer local and script local mappings - nmap ,f /^\k\+ ( - nmap ,f /^\k\+ ( - nmap