test: reorg #15698

Problem:
Subdirectories like "visual", "insert", "normal" encourage people to
separate *related* tests for no good reason.  Typically the _mode_ is
not the relevant topic of a test (and when it is, _then_ create
an appropriate describe() or it()).

Solution:
- Delete the various `test/functional/<mode>/` subdirectories, move
  their tests to more meaningful topics.
- Rename `…/normal/` to `…/editor/`.
  - Move or merge `…/visual/*` and `…/insert/*` tests into here where
    appropriate.
- Rename `…/eval/` to `…/vimscript/`.
  - Move `…/viml/*` into here also.

* test(reorg): insert/* => editor/mode_insert_spec.lua
* test(reorg): cmdline/* => editor/mode_cmdline_spec.lua
* test(reorg): eval core tests => eval_spec.lua

67 files changed, 320 insertions, 536 deletions

diff --git a/test/functional/autoread/focus_spec.lua b/test/functional/autocmd/focus_spec.lua
index 3f9a0ad09b..3f9a0ad09b 100644
--- a/test/functional/autoread/focus_spec.lua
+++ b/test/functional/autocmd/focus_spec.lua
diff --git a/test/functional/cmdline/ctrl_r_spec.lua b/test/functional/cmdline/ctrl_r_spec.lua
deleted file mode 100644
index a0f3955282..0000000000
--- a/test/functional/cmdline/ctrl_r_spec.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear, insert, funcs, eq, feed =
-  helpers.clear, helpers.insert, helpers.funcs, helpers.eq, helpers.feed
-
-describe('cmdline CTRL-R', function()
-  before_each(clear)
-
-  it('pasting non-special register inserts <CR> *between* lines', function()
-    insert([[
-    line1abc
-    line2somemoretext
-    ]])
-    -- Yank 2 lines linewise, then paste to cmdline.
-    feed([[<C-\><C-N>gg0yj:<C-R>0]])
-    -- <CR> inserted between lines, NOT after the final line.
-    eq('line1abc\rline2somemoretext', funcs.getcmdline())
-
-    -- Yank 2 lines charwise, then paste to cmdline.
-    feed([[<C-\><C-N>gg05lyvj:<C-R>0]])
-    -- <CR> inserted between lines, NOT after the final line.
-    eq('abc\rline2', funcs.getcmdline())
-
-    -- Yank 1 line linewise, then paste to cmdline.
-    feed([[<C-\><C-N>ggyy:<C-R>0]])
-    -- No <CR> inserted.
-    eq('line1abc', funcs.getcmdline())
-  end)
-
-  it('pasting special register inserts <CR>, <NL>', function()
-    feed([[:<C-R>="foo\nbar\rbaz"<CR>]])
-    eq('foo\nbar\rbaz', funcs.getcmdline())
-  end)
-end)
-
diff --git a/test/functional/normal/K_spec.lua b/test/functional/editor/K_spec.lua
index 40f36491e4..40f36491e4 100644
--- a/test/functional/normal/K_spec.lua
+++ b/test/functional/editor/K_spec.lua
diff --git a/test/functional/viml/completion_spec.lua b/test/functional/editor/completion_spec.lua
index befad29922..befad29922 100644
--- a/test/functional/viml/completion_spec.lua
+++ b/test/functional/editor/completion_spec.lua
diff --git a/test/functional/normal/count_spec.lua b/test/functional/editor/count_spec.lua
index 94f741250a..94f741250a 100644
--- a/test/functional/normal/count_spec.lua
+++ b/test/functional/editor/count_spec.lua
diff --git a/test/functional/normal/fold_spec.lua b/test/functional/editor/fold_spec.lua
index 00e83bedc8..00e83bedc8 100644
--- a/test/functional/normal/fold_spec.lua
+++ b/test/functional/editor/fold_spec.lua
diff --git a/test/functional/normal/jump_spec.lua b/test/functional/editor/jump_spec.lua
index 9e7158e2f7..9e7158e2f7 100644
--- a/test/functional/normal/jump_spec.lua
+++ b/test/functional/editor/jump_spec.lua
diff --git a/test/functional/normal/lang_spec.lua b/test/functional/editor/lang_spec.lua
index 24d1262f5f..24d1262f5f 100644
--- a/test/functional/normal/lang_spec.lua
+++ b/test/functional/editor/lang_spec.lua
diff --git a/test/functional/normal/langmap_spec.lua b/test/functional/editor/langmap_spec.lua
index e4349a22e7..e4349a22e7 100644
--- a/test/functional/normal/langmap_spec.lua
+++ b/test/functional/editor/langmap_spec.lua
diff --git a/test/functional/normal/macro_spec.lua b/test/functional/editor/macro_spec.lua
index 102d8fc723..102d8fc723 100644
--- a/test/functional/normal/macro_spec.lua
+++ b/test/functional/editor/macro_spec.lua
diff --git a/test/functional/insert/insert_spec.lua b/test/functional/editor/meta_key_spec.lua
index 330cfbd830..2a9541ba96 100644
--- a/test/functional/insert/insert_spec.lua
+++ b/test/functional/editor/meta_key_spec.lua
@@ -1,32 +1,40 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local command = helpers.command
-local eq = helpers.eq
 local expect = helpers.expect
 local funcs = helpers.funcs
+local eq = helpers.eq
 
-describe('insert-mode', function()
+describe('meta-keys #8226 #13042', function()
   before_each(function()
     clear()
   end)
 
-  it('CTRL-@', function()
-    -- Inserts last-inserted text, leaves insert-mode.
+  it('ALT/META, normal-mode', function()
+    -- Unmapped ALT-chords behave as ESC+c
     insert('hello')
-    feed('i<C-@>x')
-    expect('hellhello')
-
-    -- C-Space is the same as C-@.
-    -- CTRL-SPC inserts last-inserted text, leaves insert-mode.
-    feed('i<C-Space>x')
-    expect('hellhellhello')
+    feed('0<A-x><M-x>')
+    expect('llo')
+    -- Mapped ALT-chord behaves as mapped.
+    command('nnoremap <M-l> Ameta-l<Esc>')
+    command('nnoremap <A-j> Aalt-j<Esc>')
+    feed('<A-j><M-l>')
+    expect('lloalt-jmeta-l')
+  end)
 
-    -- CTRL-A inserts last inserted text
-    feed('i<C-A>x')
-    expect('hellhellhellhelloxo')
+  it('ALT/META, visual-mode', function()
+    -- Unmapped ALT-chords behave as ESC+c
+    insert('peaches')
+    feed('viw<A-x>viw<M-x>')
+    expect('peach')
+    -- Mapped ALT-chord behaves as mapped.
+    command('vnoremap <M-l> Ameta-l<Esc>')
+    command('vnoremap <A-j> Aalt-j<Esc>')
+    feed('viw<A-j>viw<M-l>')
+    expect('peachalt-jmeta-l')
   end)
 
-  it('ALT/META #8213', function()
+  it('ALT/META insert-mode', function()
     -- Mapped ALT-chord behaves as mapped.
     command('inoremap <M-l> meta-l')
     command('inoremap <A-j> alt-j')
diff --git a/test/functional/cmdline/history_spec.lua b/test/functional/editor/mode_cmdline_spec.lua
index ee2d36f642..0f7d821bb5 100644
--- a/test/functional/cmdline/history_spec.lua
+++ b/test/functional/editor/mode_cmdline_spec.lua
@@ -1,8 +1,41 @@
+-- Cmdline-mode tests.
+
 local helpers = require('test.functional.helpers')(after_each)
-local clear, meths, funcs, eq =
-  helpers.clear, helpers.meths, helpers.funcs, helpers.eq
+local clear, insert, funcs, eq, feed =
+  helpers.clear, helpers.insert, helpers.funcs, helpers.eq, helpers.feed
+local meths = helpers.meths
+
+describe('cmdline CTRL-R', function()
+  before_each(clear)
+
+  it('pasting non-special register inserts <CR> *between* lines', function()
+    insert([[
+    line1abc
+    line2somemoretext
+    ]])
+    -- Yank 2 lines linewise, then paste to cmdline.
+    feed([[<C-\><C-N>gg0yj:<C-R>0]])
+    -- <CR> inserted between lines, NOT after the final line.
+    eq('line1abc\rline2somemoretext', funcs.getcmdline())
+
+    -- Yank 2 lines charwise, then paste to cmdline.
+    feed([[<C-\><C-N>gg05lyvj:<C-R>0]])
+    -- <CR> inserted between lines, NOT after the final line.
+    eq('abc\rline2', funcs.getcmdline())
+
+    -- Yank 1 line linewise, then paste to cmdline.
+    feed([[<C-\><C-N>ggyy:<C-R>0]])
+    -- No <CR> inserted.
+    eq('line1abc', funcs.getcmdline())
+  end)
+
+  it('pasting special register inserts <CR>, <NL>', function()
+    feed([[:<C-R>="foo\nbar\rbaz"<CR>]])
+    eq('foo\nbar\rbaz', funcs.getcmdline())
+  end)
+end)
 
-describe('history support code', function()
+describe('cmdline history', function()
   before_each(clear)
 
   it('correctly clears start of the history', function()
diff --git a/test/functional/editor/mode_insert_spec.lua b/test/functional/editor/mode_insert_spec.lua
new file mode 100644
index 0000000000..46ab483036
--- /dev/null
+++ b/test/functional/editor/mode_insert_spec.lua
@@ -0,0 +1,89 @@
+-- Insert-mode tests.
+
+local helpers = require('test.functional.helpers')(after_each)
+local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local expect = helpers.expect
+local command = helpers.command
+local eq = helpers.eq
+local eval = helpers.eval
+local meths = helpers.meths
+
+describe('insert-mode', function()
+  before_each(function()
+    clear()
+  end)
+
+  it('CTRL-@', function()
+    -- Inserts last-inserted text, leaves insert-mode.
+    insert('hello')
+    feed('i<C-@>x')
+    expect('hellhello')
+
+    -- C-Space is the same as C-@.
+    -- CTRL-SPC inserts last-inserted text, leaves insert-mode.
+    feed('i<C-Space>x')
+    expect('hellhellhello')
+
+    -- CTRL-A inserts last inserted text
+    feed('i<C-A>x')
+    expect('hellhellhellhelloxo')
+  end)
+
+  describe('Ctrl-R', function()
+    it('works', function()
+      command("let @@ = 'test'")
+      feed('i<C-r>"')
+      expect('test')
+    end)
+
+    it('works with multi-byte text', function()
+      command("let @@ = 'påskägg'")
+      feed('i<C-r>"')
+      expect('påskägg')
+    end)
+  end)
+
+  describe('Ctrl-O', function()
+    it('enters command mode for one command', function()
+      feed('ihello world<C-o>')
+      feed(':let ctrlo = "test"<CR>')
+      feed('iii')
+      expect('hello worldiii')
+      eq(1, eval('ctrlo ==# "test"'))
+    end)
+
+    it('re-enters insert mode at the end of the line when running startinsert', function()
+      -- #6962
+      feed('ihello world<C-o>')
+      feed(':startinsert<CR>')
+      feed('iii')
+      expect('hello worldiii')
+    end)
+
+    it('re-enters insert mode at the beginning of the line when running startinsert', function()
+      insert('hello world')
+      feed('0<C-o>')
+      feed(':startinsert<CR>')
+      feed('aaa')
+      expect('aaahello world')
+    end)
+
+    it('re-enters insert mode in the middle of the line when running startinsert', function()
+      insert('hello world')
+      feed('bi<C-o>')
+      feed(':startinsert<CR>')
+      feed('ooo')
+      expect('hello oooworld')
+    end)
+
+    it("doesn't cancel Ctrl-O mode when processing event", function()
+      feed('iHello World<c-o>')
+      eq({mode='niI', blocking=false}, meths.get_mode()) -- fast event
+      eq(2, eval('1+1'))  -- causes K_EVENT key
+      eq({mode='niI', blocking=false}, meths.get_mode()) -- still in ctrl-o mode
+      feed('dd')
+      eq({mode='i', blocking=false}, meths.get_mode()) -- left ctrl-o mode
+      expect('') -- executed the command
+    end)
+  end)
+end)
diff --git a/test/functional/visual/ctrl_o_spec.lua b/test/functional/editor/mode_visual_spec.lua
index 65a128053c..e9c117a1e5 100644
--- a/test/functional/visual/ctrl_o_spec.lua
+++ b/test/functional/editor/mode_visual_spec.lua
@@ -1,3 +1,5 @@
+-- Visual-mode tests.
+
 local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
@@ -6,10 +8,10 @@ local expect = helpers.expect
 local feed = helpers.feed
 local meths = helpers.meths
 
-describe('select-mode Ctrl-O', function()
+describe('visual-mode', function()
   before_each(clear)
 
-  it("doesn't cancel Ctrl-O mode when processing event", function()
+  it("select-mode Ctrl-O doesn't cancel Ctrl-O mode when processing event #15688", function()
     feed('iHello World<esc>gh<c-o>')
     eq({mode='vs', blocking=false}, meths.get_mode()) -- fast event
     eq(2, eval('1+1'))  -- causes K_EVENT key
@@ -21,3 +23,4 @@ describe('select-mode Ctrl-O', function()
     expect('h') -- selection is the whole line and is replaced
   end)
 end)
+
diff --git a/test/functional/normal/put_spec.lua b/test/functional/editor/put_spec.lua
index 26967ecbba..26967ecbba 100644
--- a/test/functional/normal/put_spec.lua
+++ b/test/functional/editor/put_spec.lua
diff --git a/test/functional/normal/search_spec.lua b/test/functional/editor/search_spec.lua
index d5df131725..d5df131725 100644
--- a/test/functional/normal/search_spec.lua
+++ b/test/functional/editor/search_spec.lua
diff --git a/test/functional/normal/tabpage_spec.lua b/test/functional/editor/tabpage_spec.lua
index d1d6854b07..d1d6854b07 100644
--- a/test/functional/normal/tabpage_spec.lua
+++ b/test/functional/editor/tabpage_spec.lua
diff --git a/test/functional/normal/undo_spec.lua b/test/functional/editor/undo_spec.lua
index a023ca3d90..a023ca3d90 100644
--- a/test/functional/normal/undo_spec.lua
+++ b/test/functional/editor/undo_spec.lua
diff --git a/test/functional/eval/backtick_expansion_spec.lua b/test/functional/eval/backtick_expansion_spec.lua
deleted file mode 100644
index b1b44cfa8b..0000000000
--- a/test/functional/eval/backtick_expansion_spec.lua
+++ /dev/null
@@ -1,50 +0,0 @@
-local lfs = require('lfs')
-local helpers = require('test.functional.helpers')(after_each)
-local clear, command, eval, eq = helpers.clear, helpers.command, helpers.eval, helpers.eq
-local write_file = helpers.write_file
-
-describe("backtick expansion", function()
-  setup(function()
-    clear()
-    lfs.mkdir("test-backticks")
-    write_file("test-backticks/file1", "test file 1")
-    write_file("test-backticks/file2", "test file 2")
-    write_file("test-backticks/file3", "test file 3")
-    lfs.mkdir("test-backticks/subdir")
-    write_file("test-backticks/subdir/file4", "test file 4")
-    -- Long path might cause "Press ENTER" prompt; use :silent to avoid it.
-    command('silent cd test-backticks')
-  end)
-
-  teardown(function()
-    helpers.rmdir('test-backticks')
-  end)
-
-  it("with default 'shell'", function()
-    if helpers.iswin() then
-      command(":silent args `dir /b *2`")
-    else
-      command(":silent args `echo ***2`")
-    end
-    eq({ "file2", }, eval("argv()"))
-    if helpers.iswin() then
-      command(":silent args `dir /s/b *4`")
-      eq({ "subdir\\file4", }, eval("map(argv(), 'fnamemodify(v:val, \":.\")')"))
-    else
-      command(":silent args `echo */*4`")
-      eq({ "subdir/file4", }, eval("argv()"))
-    end
-  end)
-
-  it("with shell=fish", function()
-    if eval("executable('fish')") == 0 then
-      pending('missing "fish" command')
-      return
-    end
-    command("set shell=fish")
-    command(":silent ar