Merge remote-tracking branch 'upstream/master' into mix_20240309HEADrahm

4 files changed, 154 insertions, 15 deletions

diff --git a/test/functional/vimscript/ctx_functions_spec.lua b/test/functional/vimscript/ctx_functions_spec.lua
index 873e4f820d..85a74c0ab6 100644
--- a/test/functional/vimscript/ctx_functions_spec.lua
+++ b/test/functional/vimscript/ctx_functions_spec.lua
@@ -188,7 +188,10 @@ describe('context functions', function()
       function RestoreFuncs()
         call ctxpop()
       endfunction
+
+      let g:sid = expand('<SID>')
       ]])
+      local sid = api.nvim_get_var('sid')
 
       eq('Hello, World!', exec_capture([[call Greet('World')]]))
       eq(
@@ -200,11 +203,11 @@ describe('context functions', function()
       call('DeleteSFuncs')
 
       eq(
-        'function Greet, line 1: Vim(call):E117: Unknown function: s:greet',
+        ('function Greet, line 1: Vim(call):E117: Unknown function: %sgreet'):format(sid),
         pcall_err(command, [[call Greet('World')]])
       )
       eq(
-        'function GreetAll, line 1: Vim(call):E117: Unknown function: s:greet_all',
+        ('function GreetAll, line 1: Vim(call):E117: Unknown function: %sgreet_all'):format(sid),
         pcall_err(command, [[call GreetAll('World', 'One', 'Two', 'Three')]])
       )
 
diff --git a/test/functional/vimscript/getchar_spec.lua b/test/functional/vimscript/getchar_spec.lua
new file mode 100644
index 0000000000..4ecf082f97
--- /dev/null
+++ b/test/functional/vimscript/getchar_spec.lua
@@ -0,0 +1,95 @@
+local n = require('test.functional.testnvim')()
+local Screen = require('test.functional.ui.screen')
+
+local clear = n.clear
+local exec = n.exec
+local feed = n.feed
+local async_command = n.async_meths.nvim_command
+local poke_eventloop = n.poke_eventloop
+
+describe('getchar()', function()
+  before_each(clear)
+
+  -- oldtest: Test_getchar_cursor_position()
+  it('cursor positioning', function()
+    local screen = Screen.new(40, 6)
+    exec([[
+      call setline(1, ['foobar', 'foobar', 'foobar'])
+      call cursor(3, 6)
+    ]])
+    screen:expect([[
+      foobar                                  |*2
+      fooba^r                                  |
+      {1:~                                       }|*2
+                                              |
+    ]])
+
+    -- Default: behaves like "msg" when immediately after printing a message,
+    -- even if :sleep moved cursor elsewhere.
+    for _, cmd in ipairs({
+      'echo 1234 | call getchar()',
+      'echo 1234 | call getchar(-1, {})',
+      "echo 1234 | call getchar(-1, #{cursor: 'msg'})",
+      'echo 1234 | sleep 1m | call getchar()',
+      'echo 1234 | sleep 1m | call getchar(-1, {})',
+      "echo 1234 | sleep 1m | call getchar(-1, #{cursor: 'msg'})",
+    }) do
+      async_command(cmd)
+      screen:expect([[
+        foobar                                  |*3
+        {1:~                                       }|*2
+        1234^                                    |
+      ]])
+      feed('a')
+      screen:expect([[
+        foobar                                  |*2
+        fooba^r                                  |
+        {1:~                                       }|*2
+        1234                                    |
+      ]])
+    end
+
+    -- Default: behaves like "keep" when not immediately after printing a message.
+    for _, cmd in ipairs({
+      'call getchar()',
+      'call getchar(-1, {})',
+      "call getchar(-1, #{cursor: 'keep'})",
+      "echo 1234 | sleep 1m | call getchar(-1, #{cursor: 'keep'})",
+    }) do
+      async_command(cmd)
+      poke_eventloop()
+      screen:expect_unchanged()
+      feed('a')
+      poke_eventloop()
+      screen:expect_unchanged()
+    end
+
+    async_command("call getchar(-1, #{cursor: 'msg'})")
+    screen:expect([[
+      foobar                                  |*3
+      {1:~                                       }|*2
+      ^1234                                    |
+    ]])
+    feed('a')
+    screen:expect([[
+      foobar                                  |*2
+      fooba^r                                  |
+      {1:~                                       }|*2
+      1234                                    |
+    ]])
+
+    async_command("call getchar(-1, #{cursor: 'hide'})")
+    screen:expect([[
+      foobar                                  |*3
+      {1:~                                       }|*2
+      1234                                    |
+    ]])
+    feed('a')
+    screen:expect([[
+      foobar                                  |*2
+      fooba^r                                  |
+      {1:~                                       }|*2
+      1234                                    |
+    ]])
+  end)
+end)
diff --git a/test/functional/vimscript/null_spec.lua b/test/functional/vimscript/null_spec.lua
index 9a27239a6d..afd50f7cf9 100644
--- a/test/functional/vimscript/null_spec.lua
+++ b/test/functional/vimscript/null_spec.lua
@@ -116,7 +116,7 @@ describe('NULL', function()
     null_expr_test(
       'is accepted as an empty list by inputlist()',
       '[feedkeys("\\n"), inputlist(L)]',
-      'Type number and <Enter> or click with the mouse (q or empty cancels): ',
+      '',
       { 0, 0 }
     )
     null_expr_test(
diff --git a/test/functional/vimscript/timer_spec.lua b/test/functional/vimscript/timer_spec.lua
index d1b8bfe5d9..3e4e6de35c 100644
--- a/test/functional/vimscript/timer_spec.lua
+++ b/test/functional/vimscript/timer_spec.lua
@@ -94,12 +94,56 @@ describe('timers', function()
     assert(0 <= diff and diff <= 4, 'expected (0 <= diff <= 4), got: ' .. tostring(diff))
   end)
 
+  it('are triggered in inputlist() call #7857', function()
+    async_meths.nvim_exec2(
+      [[
+        call timer_start(5, 'MyHandler', {'repeat': -1})
+        let g:val = 0
+        let g:n = inputlist(['input0', 'input1'])
+      ]],
+      {}
+    )
+    retry(nil, nil, function()
+      local val = eval('g:val')
+      ok(val >= 2, '>= 2', tostring(val))
+      eq(0, eval("exists('g:n')"))
+    end)
+    feed('42<CR>')
+    eq(42, eval('g:n'))
+  end)
+
+  it('are triggered in confirm() call', function()
+    api.nvim_ui_attach(80, 24, {}) -- needed for confirm() to work
+    async_meths.nvim_exec2(
+      [[
+        call timer_start(5, 'MyHandler', {'repeat': -1})
+        let g:val = 0
+        let g:n = confirm('Are you sure?', "&Yes\n&No\n&Cancel")
+      ]],
+      {}
+    )
+    retry(nil, nil, function()
+      local val = eval('g:val')
+      ok(val >= 2, '>= 2', tostring(val))
+      eq(0, eval("exists('g:n')"))
+    end)
+    feed('c')
+    eq(3, eval('g:n'))
+  end)
+
   it('are triggered in blocking getchar() call', function()
-    command("call timer_start(5, 'MyHandler', {'repeat': -1})")
-    async_meths.nvim_command('let g:val = 0 | let g:c = getchar()')
+    async_meths.nvim_exec2(
+      [[
+        call timer_start(5, 'MyHandler', {'repeat': -1})
+        let g:val = 0
+        let g:c = getchar()
+      ]],
+      {}
+    )
     retry(nil, nil, function()
       local val = eval('g:val')
       ok(val >= 2, '>= 2', tostring(val))
+      eq(0, eval("exists('g:c')"))
       eq(0, eval('getchar(1)'))
     end)
     feed('c')
@@ -126,39 +170,36 @@ describe('timers', function()
         redraw
       endfunc
     ]])
-    async_meths.nvim_command('let g:c2 = getchar()')
+    async_meths.nvim_command("let g:c2 = getchar(-1, {'cursor': 'msg'})")
     async_meths.nvim_command(
       'call timer_start(' .. load_adjust(100) .. ", 'AddItem', {'repeat': -1})"
     )
 
     screen:expect([[
-      ^ITEM 1                                  |
+      ITEM 1                                  |
       ITEM 2                                  |
       {1:~                                       }|*3
-                                              |
+      ^                                        |
     ]])
     async_meths.nvim_command('let g:cont = 1')
 
     screen:expect([[
-      ^ITEM 1                                  |
+      ITEM 1                                  |
       ITEM 2                                  |
       ITEM 3                                  |
       {1:~                                       }|*2
-                                              |
+      ^                                        |
     ]])
 
     feed('3')
     eq(51, eval('g:c2'))
-    screen:expect {
-      grid = [[
+    screen:expect([[
       ^ITEM 1                                  |
       ITEM 2                                  |
       ITEM 3                                  |
       {1:~                                       }|*2
                                               |
-    ]],
-      unchanged = true,
-    }
+    ]])
   end)
 
   it('can be stopped', function()