diff options
| author | Gregory Anders <8965202+gpanders@users.noreply.github.com> | 2022-05-22 21:20:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-22 21:20:18 -0600 |
| commit | 9e1ee9fb1d747facb6fa97a32dc5e22c7dfcb346 (patch) | |
| tree | b6fe628698f9d4181285a144b17b7518833693ce /src/nvim/testdir | |
| parent | a7e0a02031c7b4a192cb9c0e4eb13a714d5b0dbb (diff) | |
| download | rneovim-9e1ee9fb1d747facb6fa97a32dc5e22c7dfcb346.tar.gz rneovim-9e1ee9fb1d747facb6fa97a32dc5e22c7dfcb346.tar.bz2 rneovim-9e1ee9fb1d747facb6fa97a32dc5e22c7dfcb346.zip | |
refactor!: delete insertmode (#18547)
Neovim already removed `evim` (or any similar flags). The 'insertmode'
option is a weird remnant, so get rid of it.
The 'insertmode' option is replaced with a script that closely emulates
the option. This script is documented at :help 'insertmode'
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/test_edit.vim | 23 | ||||
| -rw-r--r-- | src/nvim/testdir/test_normal.vim | 9 |
2 files changed, 19 insertions, 13 deletions
diff --git a/src/nvim/testdir/test_edit.vim b/src/nvim/testdir/test_edit.vim index bd080147fb..275c8f7a15 100644 --- a/src/nvim/testdir/test_edit.vim +++ b/src/nvim/testdir/test_edit.vim @@ -16,8 +16,9 @@ func Test_edit_00b() call setline(1, ['abc ']) inoreabbr <buffer> h here some more call cursor(1, 4) - " <c-l> expands the abbreviation and ends insertmode - call feedkeys(":set im\<cr> h\<c-l>:set noim\<cr>", 'tix') + " <esc> expands the abbreviation and ends insert mode + " call feedkeys(":set im\<cr> h\<c-l>:set noim\<cr>", 'tix') + call feedkeys("i h\<esc>", 'tix') call assert_equal(['abc here some more '], getline(1,'$')) iunabbr <buffer> h bw! @@ -234,15 +235,18 @@ func Test_edit_09() call setline(1, ['abc', 'def', 'ghi']) call cursor(1, 1) " 1) CTRL-\ CTLR-N - call feedkeys(":set im\<cr>\<c-\>\<c-n>ccABC\<c-l>", 'txin') + " call feedkeys(":set im\<cr>\<c-\>\<c-n>ccABC\<c-l>", 'txin') + call feedkeys("i\<c-\>\<c-n>ccABC\<esc>", 'txin') call assert_equal(['ABC', 'def', 'ghi'], getline(1,'$')) call setline(1, ['ABC', 'def', 'ghi']) " 2) CTRL-\ CTLR-G - call feedkeys("j0\<c-\>\<c-g>ZZZ\<cr>\<c-l>", 'txin') - call assert_equal(['ABC', 'ZZZ', 'def', 'ghi'], getline(1,'$')) - call feedkeys("I\<c-\>\<c-g>YYY\<c-l>", 'txin') - call assert_equal(['ABC', 'ZZZ', 'YYYdef', 'ghi'], getline(1,'$')) - set noinsertmode + " CTRL-\ CTRL-G goes to Insert mode when 'insertmode' is set, but + " 'insertmode' is now removed so skip this test + " call feedkeys("j0\<c-\>\<c-g>ZZZ\<cr>\<esc>", 'txin') + " call assert_equal(['ABC', 'ZZZ', 'def', 'ghi'], getline(1,'$')) + " call feedkeys("I\<c-\>\<c-g>YYY\<c-l>", 'txin') + " call assert_equal(['ABC', 'ZZZ', 'YYYdef', 'ghi'], getline(1,'$')) + " set noinsertmode " 3) CTRL-\ CTRL-O call setline(1, ['ABC', 'ZZZ', 'def', 'ghi']) call cursor(1, 1) @@ -1043,7 +1047,8 @@ endfunc func Test_edit_F1() " Pressing <f1> new - call feedkeys(":set im\<cr>\<f1>\<c-l>", 'tnix') + " call feedkeys(":set im\<cr>\<f1>\<c-l>", 'tnix') + call feedkeys("i\<f1>\<esc>", 'tnix') set noinsertmode call assert_equal('help', &buftype) bw diff --git a/src/nvim/testdir/test_normal.vim b/src/nvim/testdir/test_normal.vim index 1feffe1f8c..d1cb89bbd4 100644 --- a/src/nvim/testdir/test_normal.vim +++ b/src/nvim/testdir/test_normal.vim @@ -133,7 +133,8 @@ func Test_normal02_selectmode2() " some basic select mode tests call Setup_NewWindow() 50 - call feedkeys(":set im\n\<c-o>gHc\<c-o>:set noim\n", 'tx') + " call feedkeys(":set im\n\<c-o>gHc\<c-o>:set noim\n", 'tx') + call feedkeys("i\<c-o>gHc\<esc>", 'tx') call assert_equal('c51', getline('.')) " clean up bw! @@ -2113,11 +2114,11 @@ fun! Test_normal40_ctrl_bsl() call assert_equal('n', mode()) call assert_equal(1, col('.')) "imap <buffer> , <c-\><c-n> - set im + " set im exe ":norm! \<c-\>\<c-n>dw" - set noim + " set noim call assert_equal('are some words', getline(1)) - call assert_false(&insertmode) + " call assert_false(&insertmode) " clean up bw! |