vim-patch:8.2.0522: several errors are not tested for (#19901)

Problem:    Several errors are not tested for.
Solution:   Add tests. (Yegappan Lakshmanan, closes vim/vim#5892)
https://github.com/vim/vim/commit/ee4e0c1e9a81cb5d96e0060203a9033c2f28588e

Omit Test_range() change: reverted in patch 8.2.0615.
Cherry-pick Test_z_no_space_before_xxx() from patch 8.2.0195.
Cherry-pick Test_reverse_sort_uniq() change from patch 8.2.0183.
Make uniq() error behavior consistent with sort().
Cherry-pick Test_set_ttytype() change from patch 8.1.1826.
Cherry-pick quickfix checks from patch 8.1.2373 to test_preview.vim.
Test_viminfo_error() is applicable.
Cherry-pick E1058 from patch 8.2.0149 and port Test_deep_nest() to Lua.

2 files changed, 85 insertions, 10 deletions

diff --git a/test/functional/vimscript/eval_spec.lua b/test/functional/vimscript/eval_spec.lua
index 0c2ca8de78..65ac5b8c80 100644
--- a/test/functional/vimscript/eval_spec.lua
+++ b/test/functional/vimscript/eval_spec.lua
@@ -10,11 +10,13 @@
 --    test/functional/vimscript/functions_spec.lua
 
 local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
 
 local lfs = require('lfs')
 local clear = helpers.clear
 local eq = helpers.eq
 local exc_exec = helpers.exc_exec
+local exec = helpers.exec
 local eval = helpers.eval
 local command = helpers.command
 local write_file = helpers.write_file
@@ -144,3 +146,76 @@ describe('List support code', function()
     end
   end)
 end)
+
+-- oldtest: Test_deep_nest()
+it('Error when if/for/while/try/function is nested too deep',function()
+  clear()
+  local screen = Screen.new(80, 24)
+  screen:attach()
+  meths.set_option('laststatus', 2)
+  exec([[
+    " Deep nesting of if ... endif
+    func Test1()
+      let @a = join(repeat(['if v:true'], 51), "\n")
+      let @a ..= "\n"
+      let @a ..= join(repeat(['endif'], 51), "\n")
+      @a
+      let @a = ''
+    endfunc
+
+    " Deep nesting of for ... endfor
+    func Test2()
+      let @a = join(repeat(['for i in [1]'], 51), "\n")
+      let @a ..= "\n"
+      let @a ..= join(repeat(['endfor'], 51), "\n")
+      @a
+      let @a = ''
+    endfunc
+
+    " Deep nesting of while ... endwhile
+    func Test3()
+      let @a = join(repeat(['while v:true'], 51), "\n")
+      let @a ..= "\n"
+      let @a ..= join(repeat(['endwhile'], 51), "\n")
+      @a
+      let @a = ''
+    endfunc
+
+    " Deep nesting of try ... endtry
+    func Test4()
+      let @a = join(repeat(['try'], 51), "\n")
+      let @a ..= "\necho v:true\n"
+      let @a ..= join(repeat(['endtry'], 51), "\n")
+      @a
+      let @a = ''
+    endfunc
+
+    " Deep nesting of function ... endfunction
+    func Test5()
+      let @a = join(repeat(['function X()'], 51), "\n")
+      let @a ..= "\necho v:true\n"
+      let @a ..= join(repeat(['endfunction'], 51), "\n")
+      @a
+      let @a = ''
+    endfunc
+  ]])
+  screen:expect({any = '%[No Name%]'})
+  feed(':call Test1()<CR>')
+  screen:expect({any = 'E579: '})
+  feed('<C-C>')
+  screen:expect({any = '%[No Name%]'})
+  feed(':call Test2()<CR>')
+  screen:expect({any = 'E585: '})
+  feed('<C-C>')
+  screen:expect({any = '%[No Name%]'})
+  feed(':call Test3()<CR>')
+  screen:expect({any = 'E585: '})
+  feed('<C-C>')
+  screen:expect({any = '%[No Name%]'})
+  feed(':call Test4()<CR>')
+  screen:expect({any = 'E601: '})
+  feed('<C-C>')
+  screen:expect({any = '%[No Name%]'})
+  feed(':call Test5()<CR>')
+  screen:expect({any = 'E1058: '})
+end)
diff --git a/test/functional/vimscript/input_spec.lua b/test/functional/vimscript/input_spec.lua
index d6ab71b7d5..f50b39c2c5 100644
--- a/test/functional/vimscript/input_spec.lua
+++ b/test/functional/vimscript/input_spec.lua
@@ -455,24 +455,24 @@ describe('confirm()', function()
     meths.set_option('more', false)  -- Avoid hit-enter prompt
     meths.set_option('laststatus', 2)
     -- screen:expect() calls are needed to avoid feeding input too early
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
 
     async_meths.command([[let a = confirm('Press O to proceed')]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('o')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(1, meths.get_var('a'))
 
-    async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
+    async_meths.command([[let a = 'Are you sure?'->confirm("&Yes\n&No")]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('y')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(1, meths.get_var('a'))
 
     async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('n')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(2, meths.get_var('a'))
 
     -- Not possible to match Vim's CTRL-C test here as CTRL-C always sets got_int in Nvim.
@@ -481,26 +481,26 @@ describe('confirm()', function()
     async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('<Esc>')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(0, meths.get_var('a'))
 
     -- Default choice is returned when pressing <CR>.
     async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('<CR>')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(1, meths.get_var('a'))
 
     async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No", 2)]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('<CR>')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(2, meths.get_var('a'))
 
     async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No", 0)]])
     screen:expect({any = '{CONFIRM:.+: }'})
     feed('<CR>')
-    screen:expect({any = 'No Name'})
+    screen:expect({any = '%[No Name%]'})
     eq(0, meths.get_var('a'))
 
     -- Test with the {type} 4th argument
@@ -508,7 +508,7 @@ describe('confirm()', function()
       async_meths.command(([[let a = confirm('Are you sure?', "&Yes\n&No", 1, '%s')]]):format(type))
       screen:expect({any = '{CONFIRM:.+: }'})
       feed('y')
-      screen:expect({any = 'No Name'})
+      screen:expect({any = '%[No Name%]'})
       eq(1, meths.get_var('a'))
     end