Merge pull request #20262 from zeertzjq/vim-9.0.0507

vim-patch:9.0.{0507,0512}: cmdline cleared when using :redrawstatus

1 files changed, 68 insertions, 0 deletions

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index 99d2d0f30e..8325f7eeb0 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -140,6 +140,74 @@ describe('cmdline', function()
       :^                             |
     ]])
   end)
+
+  -- oldtest: Test_redraw_in_autocmd()
+  it('cmdline cursor position is correct after :redraw with cmdheight=2', function()
+    local screen = Screen.new(30, 6)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+    })
+    screen:attach()
+    exec([[
+      set cmdheight=2
+      autocmd CmdlineChanged * redraw
+    ]])
+    feed(':for i in range(3)<CR>')
+    screen:expect([[
+                                    |
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      :for i in range(3)            |
+      :  ^                           |
+    ]])
+    feed(':let i =')
+    -- Note: this may still be considered broken, ref #18140
+    screen:expect([[
+                                    |
+      {0:~                             }|
+      {0:~                             }|
+      {0:~                             }|
+      :  :let i =^                   |
+                                    |
+    ]])
+  end)
+
+  -- oldtest: Test_redrawstatus_in_autocmd()
+  it(':redrawstatus in cmdline mode', function()
+    local screen = Screen.new(60, 6)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {bold = true, reverse = true},  -- MsgSeparator, StatusLine
+    })
+    screen:attach()
+    exec([[
+      set laststatus=2
+      set statusline=%=:%{getcmdline()}
+      autocmd CmdlineChanged * if getcmdline() == 'foobar' | redrawstatus | endif
+    ]])
+    -- :redrawstatus is postponed if messages have scrolled
+    feed([[:echo "one\ntwo\nthree\nfour"<CR>]])
+    feed(':foobar')
+    screen:expect([[
+      {1:                                                            }|
+      one                                                         |
+      two                                                         |
+      three                                                       |
+      four                                                        |
+      :foobar^                                                     |
+    ]])
+    -- it is not postponed if messages have not scrolled
+    feed('<Esc>:foobar')
+    screen:expect([[
+                                                                  |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {1:                                                     :foobar}|
+      :foobar^                                                     |
+    ]])
+  end)
 end)
 
 describe('cmdwin', function()