From 9e1ee9fb1d747facb6fa97a32dc5e22c7dfcb346 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Sun, 22 May 2022 21:20:18 -0600
Subject: 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'
---
 src/nvim/testdir/test_edit.vim | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/nvim/testdir/test_edit.vim')

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
-- 
cgit