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

1 files changed, 0 insertions, 337 deletions

diff --git a/test/functional/eval/execute_spec.lua b/test/functional/eval/execute_spec.lua
deleted file mode 100644
index fccf52935b..0000000000
--- a/test/functional/eval/execute_spec.lua
+++ /dev/null
@@ -1,337 +0,0 @@
-local helpers = require('test.functional.helpers')(after_each)
-local eq = helpers.eq
-local eval = helpers.eval
-local clear = helpers.clear
-local source = helpers.source
-local redir_exec = helpers.redir_exec
-local exc_exec = helpers.exc_exec
-local funcs = helpers.funcs
-local Screen = require('test.functional.ui.screen')
-local command = helpers.command
-local feed = helpers.feed
-local iswin = helpers.iswin
-
-describe('execute()', function()
-  before_each(clear)
-
-  it('captures the same result as :redir', function()
-    eq(redir_exec('messages'), funcs.execute('messages'))
-  end)
-
-  it('captures the concatenated outputs of a List of commands', function()
-    eq("foobar", funcs.execute({'echon "foo"', 'echon "bar"'}))
-    eq("\nfoo\nbar", funcs.execute({'echo "foo"', 'echo "bar"'}))
-  end)
-
-  it('supports nested execute("execute(...)")', function()
-    eq('42', funcs.execute([[echon execute("echon execute('echon 42')")]]))
-  end)
-
-  it('supports nested :redir to a variable', function()
-    source([[
-    function! g:Foo()
-      let a = ''
-      redir => a
-      silent echon "foo"
-      redir END
-      return a
-    endfunction
-    function! g:Bar()
-      let a = ''
-      redir => a
-      silent echon "bar1"
-      call g:Foo()
-      silent echon "bar2"
-      redir END
-      silent echon "bar3"
-      return a
-    endfunction
-    ]])
-    eq('top1bar1foobar2bar3', funcs.execute('echon "top1"|call g:Bar()'))
-  end)
-
-  it('supports nested :redir to a register', function()
-    source([[
-    let @a = ''
-    function! g:Foo()
-      redir @a>>
-      silent echon "foo"
-      redir END
-      return @a
-    endfunction
-    function! g:Bar()
-      redir @a>>
-      silent echon "bar1"
-      call g:Foo()
-      silent echon "bar2"
-      redir END
-      silent echon "bar3"
-      return @a
-    endfunction
-    ]])
-    eq('top1bar1foobar2bar3', funcs.execute('echon "top1"|call g:Bar()'))
-    -- :redir itself doesn't nest, so the redirection ends in g:Foo
-    eq('bar1foo', eval('@a'))
-  end)
-
-  it('captures a transformed string', function()
-    eq('^A', funcs.execute('echon "\\<C-a>"'))
-  end)
-
-  it('returns empty string if the argument list is empty', function()
-    eq('', funcs.execute({}))
-    eq(0, exc_exec('let g:ret = execute(v:_null_list)'))
-    eq('', eval('g:ret'))
-  end)
-
-  it('captures errors', function()
-    local ret
-    ret = exc_exec('call execute(0.0)')
-    eq('Vim(call):E806: using Float as a String', ret)
-    ret = exc_exec('call execute(v:_null_dict)')
-    eq('Vim(call):E731: using Dictionary as a String', ret)
-    ret = exc_exec('call execute(function("tr"))')
-    eq('Vim(call):E729: using Funcref as a String', ret)
-    ret = exc_exec('call execute(["echo 42", 0.0, "echo 44"])')
-    eq('Vim:E806: using Float as a String', ret)
-    ret = exc_exec('call execute(["echo 42", v:_null_dict, "echo 44"])')
-    eq('Vim:E731: using Dictionary as a String', ret)
-    ret = exc_exec('call execute(["echo 42", function("tr"), "echo 44"])')
-    eq('Vim:E729: using Funcref as a String', ret)
-  end)
-
-  it('captures output with highlights', function()
-    eq('\nErrorMsg       xxx ctermfg=15 ctermbg=1 guifg=White guibg=Red',
-       eval('execute("hi ErrorMsg")'))
-  end)
-
-  it('does not corrupt the command display #5422', function()
-    local screen = Screen.new(70, 7)
-    screen:attach()
-    feed(':echo execute("hi ErrorMsg")<CR>')
-    screen:expect([[
-                                                                            |
-      {1:~                                                                     }|
-      {1:~                                                                     }|
-      {2:                                                                      }|
-                                                                            |
-      ErrorMsg       xxx ctermfg=15 ctermbg=1 guifg=White guibg=Red         |
-      {3:Press ENTER or type command to continue}^                               |
-    ]], {
-      [1] = {bold = true, foreground = Screen.colors.Blue1},
-      [2] = {bold = true, reverse = true},
-      [3] = {bold = true, foreground = Screen.colors.SeaGreen4},
-    })
-    feed('<CR>')
-  end)
-
-  it('places cursor correctly #6035', function()
-    local screen = Screen.new(40, 6)
-    screen:attach()
-    source([=[
-      " test 1: non-silenced output goes as usual
-      function! Test1()
-        echo 1234
-        let x = execute('echon "abcdef"', '')
-        echon 'ABCD'
-      endfunction
-
-      " test 2: silenced output does not affect ui
-      function! Test2()
-        echo 1234
-        let x = execute('echon "abcdef"', 'silent')
-        echon 'ABCD'
-      endfunction
-
-      " test 3: silenced! error does not affect ui
-      function! Test3()
-        echo 1234
-        let x = execute('echoerr "abcdef"', 'silent!')
-        echon 'ABCD'
-      endfunction
-
-      " test 4: silenced echoerr goes as usual
-      " bug here
-      function! Test4()
-        echo 1234
-        let x = execute('echoerr "abcdef"', 'silent')
-        echon 'ABCD'
-      endfunction
-
-      " test 5: silenced! echoerr does not affect ui
-      function! Test5()
-        echo 1234
-        let x = execute('echoerr "abcdef"', 'silent!')
-        echon 'ABCD'
-      endfunction
-
-      " test 6: silenced error goes as usual
-      function! Test6()
-        echo 1234
-        let x = execute('echo undefined', 'silent')
-        echon 'ABCD'
-      endfunction
-
-      " test 7: existing error does not mess the result
-      function! Test7()
-        " display from Test6() is still visible
-        " why does the "abcdef" goes into a newline
-        let x = execute('echon "abcdef"', '')
-        echon 'ABCD'
-      endfunction
-    ]=])
-
-    feed([[:call Test1()<cr>]])
-    screen:expect([[
-      ^                                        |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ABCD                                    |
-    ]])
-
-    feed([[:call Test2()<cr>]])
-    screen:expect([[
-      ^                                        |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      1234ABCD                                |
-    ]])
-
-    feed([[:call Test3()<cr>]])
-    screen:expect([[
-      ^                                        |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      1234ABCD                                |
-    ]])
-
-    feed([[:call Test4()<cr>]])
-    -- unexpected: need to fix
-    -- echoerr does not set did_emsg
-    -- "ef" was overwritten since msg_col was recovered wrongly
-    screen:expect([[
-      1234                                    |
-      Error detected while processing function|
-       Test4:                                 |
-      line    2:                              |
-      abcdABCD                                |
-      Press ENTER or type command to continue^ |
-    ]])
-
-    feed([[<cr>]]) -- to clear screen
-    feed([[:call Test5()<cr>]])
-    screen:expect([[
-      ^                                        |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      1234ABCD                                |
-    ]])
-
-    feed([[:call Test6()<cr>]])
-    screen:expect([[
-                                              |
-      Error detected while processing function|
-       Test6:                                 |
-      line    2:                              |
-      E121ABCD                                |
-      Press ENTER or type command to continue^ |
-    ]])
-
-    feed([[:call Test7()<cr>]])
-    screen:expect([[
-      Error detected while processing function|
-       Test6:                                 |
-      line    2:                              |
-      E121ABCD                                |
-      ABCD                                    |
-      Press ENTER or type command to continue^ |
-    ]])
-  end)
-
-  -- This deviates from vim behavior, but is consistent
-  -- with how nvim currently displays the output.
-  it('captures shell-command output', function()
-    local win_lf = iswin() and '\13' or ''
-    eq('\n:!echo foo\r\n\nfoo'..win_lf..'\n', funcs.execute('!echo foo'))
-  end)
-
-  describe('{silent} argument', function()
-    it('captures & displays output for ""', function()
-      local screen = Screen.new(40, 5)
-      screen:attach()
-      command('let g:mes = execute("echon 42", "")')
-      screen:expect([[
-      ^                                        |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      42                                      |
-      ]])
-      eq('42', eval('g:mes'))
-    end)
-
-    it('captures but does not display output for "silent"', function()
-      local screen = Screen.new(40, 5)
-      screen:attach()
-      command('let g:mes = execute("echon 42")')
-      screen:expect([[
-      ^                                        |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-                                              |
-      ]])
-      eq('42', eval('g:mes'))
-
-      command('let g:mes = execute("echon 13", "silent")')
-      screen:expect{grid=[[
-      ^                                        |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-                                              |
-      ]], unchanged=true}
-      eq('13', eval('g:mes'))
-    end)
-
-    it('suppresses errors for "silent!"', function()
-      eq(0, exc_exec('let g:mes = execute(0.0, "silent!")'))
-      eq('', eval('g:mes'))
-
-      eq(0, exc_exec('let g:mes = execute("echon add(1, 1)", "silent!")'))
-      eq('1', eval('g:mes'))
-
-      eq(0, exc_exec('let g:mes = execute(["echon 42", "echon add(1, 1)"], "silent!")'))
-      eq('421', eval('g:mes'))
-    end)
-
-    it('propagates errors for "" and "silent"', function()
-      local ret
-      ret = exc_exec('call execute(0.0, "")')
-      eq('Vim(call):E806: using Float as a String', ret)
-
-      ret = exc_exec('call execute(v:_null_dict, "silent")')
-      eq('Vim(call):E731: using Dictionary as a String', ret)
-
-      ret = exc_exec('call execute("echo add(1, 1)", "")')
-      eq('Vim(echo):E897: List or Blob required', ret)
-
-      ret = exc_exec('call execute(["echon 42", "echo add(1, 1)"], "")')
-      eq('Vim(echo):E897: List or Blob required', ret)
-
-      ret = exc_exec('call execute("echo add(1, 1)", "silent")')
-      eq('Vim(echo):E897: List or Blob required', ret)
-
-      ret = exc_exec('call execute(["echon 42", "echo add(1, 1)"], "silent")')
-      eq('Vim(echo):E897: List or Blob required', ret)
-    end)
-  end)
-end)