From aa976f0d932738cb4b4f7cf5bef3d5157c68232d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 5 Feb 2025 11:36:01 +0800
Subject: fix(messages): add a trailing space to inputlist() etc. prompts
 (#32328)

Before #31525 the prompts had a trailing space.
Also add a test for #7857.
---
 src/nvim/input.c                         |  4 +-
 test/functional/ui/messages_spec.lua     | 39 ++++++++++++++++++-
 test/functional/vimscript/timer_spec.lua | 65 ++++++++++++++++++++++++++------
 3 files changed, 92 insertions(+), 16 deletions(-)

diff --git a/src/nvim/input.c b/src/nvim/input.c
index ca2a13e016..fb89d86a75 100644
--- a/src/nvim/input.c
+++ b/src/nvim/input.c
@@ -159,9 +159,9 @@ int prompt_for_input(char *prompt, int hl_id, bool one_key, bool *mouse_used)
 
   if (prompt == NULL) {
     if (mouse_used != NULL) {
-      prompt = _("Type number and <Enter> or click with the mouse (q or empty cancels):");
+      prompt = _("Type number and <Enter> or click with the mouse (q or empty cancels): ");
     } else {
-      prompt = _("Type number and <Enter> (q or empty cancels):");
+      prompt = _("Type number and <Enter> (q or empty cancels): ");
     }
   }
 
diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index c996d117f2..5c55dfe910 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -1259,7 +1259,7 @@ stack traceback:
           content = { { '' } },
           hl_id = 0,
           pos = 0,
-          prompt = 'Type number and <Enter> or click with the mouse (q or empty cancels):',
+          prompt = 'Type number and <Enter> or click with the mouse (q or empty cancels): ',
         },
       },
       messages = {
@@ -1282,7 +1282,7 @@ stack traceback:
           content = { { '1' } },
           hl_id = 0,
           pos = 1,
-          prompt = 'Type number and <Enter> or click with the mouse (q or empty cancels):',
+          prompt = 'Type number and <Enter> or click with the mouse (q or empty cancels): ',
         },
       },
       messages = {
@@ -1302,6 +1302,41 @@ stack traceback:
       ]],
       cmdline = { { abort = false } },
     })
+
+    async_meths.nvim_command("let g:n = inputlist(['input0', 'input1'])")
+    screen:expect({
+      grid = [[
+        ^Hello                    |
+        {1:~                        }|*4
+      ]],
+      cmdline = {
+        {
+          content = { { '' } },
+          hl_id = 0,
+          pos = 0,
+          prompt = 'Type number and <Enter> or click with the mouse (q or empty cancels): ',
+        },
+      },
+      messages = {
+        {
+          content = { { 'input0\ninput1\n' } },
+          history = false,
+          kind = 'list_cmd',
+        },
+      },
+    })
+
+    feed('42<CR>')
+    screen:expect({
+      grid = [[
+        ^Hello                    |
+        {1:~                        }|*4
+      ]],
+      cmdline = { {
+        abort = false,
+      } },
+    })
+    eq(42, eval('g:n'))
   end)
 
   it('supports nvim_echo messages with multiple attrs', function()
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()
-- 
cgit