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

1 files changed, 44 insertions, 0 deletions

diff --git a/test/functional/ui/statusline_spec.lua b/test/functional/ui/statusline_spec.lua
index 18391a575d..1c184ff27d 100644
--- a/test/functional/ui/statusline_spec.lua
+++ b/test/functional/ui/statusline_spec.lua
@@ -164,6 +164,24 @@ describe('statusline clicks', function()
     meths.input_mouse('right', 'press', '', 0, 6, 5)
     eq('0 1 r', eval("g:testvar"))
   end)
+
+  it('no memory leak with zero-width click labels', function()
+    command([[
+      let &stl = '%@Test@%T%@MyClickFunc@%=%T%@Test@'
+    ]])
+    meths.input_mouse('left', 'press', '', 0, 6, 0)
+    eq('0 1 l', eval("g:testvar"))
+    meths.input_mouse('right', 'press', '', 0, 6, 39)
+    eq('0 1 r', eval("g:testvar"))
+  end)
+
+  it('no memory leak with truncated click labels', function()
+    command([[
+      let &stl = '%@MyClickFunc@foo%X' .. repeat('a', 40) .. '%<t%@Test@bar%X%@Test@baz'
+    ]])
+    meths.input_mouse('left', 'press', '', 0, 6, 2)
+    eq('0 1 l', eval("g:testvar"))
+  end)
 end)
 
 describe('global statusline', function()
@@ -545,3 +563,29 @@ it('statusline is redrawn with :resize from <Cmd> mapping #19629', function()
                                             |
   ]])
 end)
+
+it('showcmdloc=statusline does not show if statusline is too narrow', function()
+  clear()
+  local screen = Screen.new(40, 8)
+  screen:set_default_attr_ids({
+    [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+    [1] = {bold = true, reverse = true},  -- StatusLine
+    [2] = {reverse = true},  -- StatusLineNC
+  })
+  screen:attach()
+  command('set showcmd')
+  command('set showcmdloc=statusline')
+  command('1vsplit')
+  screen:expect([[
+    ^ │                                      |
+    {0:~}│{0:~                                     }|
+    {0:~}│{0:~                                     }|
+    {0:~}│{0:~                                     }|
+    {0:~}│{0:~                                     }|
+    {0:~}│{0:~                                     }|
+    {1:< }{2:[No Name]                             }|
+                                            |
+  ]])
+  feed('1234')
+  screen:expect_unchanged()
+end)