From 64fa75a86a9e2e301e884e21911d71688fc8f122 Mon Sep 17 00:00:00 2001
From: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
Date: Thu, 2 Feb 2023 10:35:51 +0100
Subject: fix(column): estimate 'statuscolumn' width appropriately

Problem:    The 'statuscolumn' width is being estimated without the
            proper context. In particular, this resulted in the fact
            that a custom fold column could be included in the estimated
            `number_width()`, and doubly added when actually drawing the
            statuscolumn due to `win_col_off()` also adding the
            `'foldcolumn'` width. Resulting in a status column that is
            `'foldcolumn'` cells wider than necessary.
Solution:   Estimate 'statuscolumn' width in `get_statuscol_str()` when
            a buffer's line count has changed.
---
 test/functional/ui/statuscolumn_spec.lua | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index ae3b95fb0f..3233e6cd19 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -439,7 +439,7 @@ describe('statuscolumn', function()
       vim.api.nvim_buf_set_extmark(0, ns, 7, 0, {
         virt_lines_leftcol = true, virt_lines = {{{"virt", ""}}} })
     ]])
-    feed('lh')  -- force update wcol/row
+    feed('lh')  -- force update cursor row
     screen:expect([[
                 4 aaaaa                                    |
                 5 aaaaa                                    |
@@ -458,5 +458,24 @@ describe('statuscolumn', function()
     ]])
     command('set stc=')  -- also for the default sign column
     screen:expect_unchanged()
+    -- 'statuscolumn' is not too wide with custom (bogus) fold column
+    command([[set stc=%{foldlevel(v:lnum)>0?repeat('-',foldlevel(v:lnum)):''}%=%l\ ]])
+    feed('Gd10Ggg<C-l>')
+    screen:expect([[
+               1 ^aaaaa                                     |
+               2 aaaaa                                     |
+               3 aaaaa                                     |
+               4 aaaaa                                     |
+               5 aaaaa                                     |
+               6 aaaaa                                     |
+               7 aaaaa                                     |
+      virt                                                 |
+      ---------8 aaaaa                                     |
+      virt                                                 |
+      ---------9 aaaaa                                     |
+      ~                                                    |
+      ~                                                    |
+                                                           |
+    ]])
   end)
 end)
-- 
cgit 


From 08fb3b5309dee79585f3eec2450636966cbb01b4 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Tue, 31 Jan 2023 00:52:34 +0100
Subject: perf(column): only build fold/sign column when present in
 'statuscolumn'

Problem:    The fold and sign column is built and stored regardless of
            whether the corresponding item is present in 'statuscolumn'.
Solution:   Since the 'statuscolumn' parses itself, we can defer
            building the columns until the corresponding item is
            actually encountered.
---
 test/functional/ui/statuscolumn_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 3233e6cd19..287686cf37 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -456,7 +456,7 @@ describe('statuscolumn', function()
                14 aaaaa                                    |
                                                            |
     ]])
-    command('set stc=')  -- also for the default sign column
+    command('set stc=')  -- also for the default fold column
     screen:expect_unchanged()
     -- 'statuscolumn' is not too wide with custom (bogus) fold column
     command([[set stc=%{foldlevel(v:lnum)>0?repeat('-',foldlevel(v:lnum)):''}%=%l\ ]])
-- 
cgit 


From 9a271f6afd7a9b1c17d694b57ee1f489496000aa Mon Sep 17 00:00:00 2001
From: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
Date: Tue, 28 Feb 2023 03:19:58 +0100
Subject: fix(column): cmdwin cursor is offset with 'statuscolumn' (#22445)

---
 test/functional/ui/statuscolumn_spec.lua | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 287686cf37..f997546c7c 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -478,4 +478,24 @@ describe('statuscolumn', function()
                                                            |
     ]])
   end)
+
+  it('works with cmdwin', function()
+    feed(':set stc=%l<CR>q:k$')
+    screen:expect([[
+      7 aaaaa                                              |
+      8 aaaaa                                              |
+      9 aaaaa                                              |
+      10aaaaa                                              |
+      [No Name] [+]                                        |
+      :1set stc=%^l                                         |
+      :2                                                   |
+      ~                                                    |
+      ~                                                    |
+      ~                                                    |
+      ~                                                    |
+      ~                                                    |
+      [Command Line]                                       |
+      :                                                    |
+    ]])
+  end)
 end)
-- 
cgit 


From b7d59649acf43c76cc72b25c04bcae926a40b4fe Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 4 Mar 2023 12:23:04 +0800
Subject: fix(redraw): get the line again after evaluating something

---
 test/functional/ui/statuscolumn_spec.lua | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index f997546c7c..08b5d1913b 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -375,6 +375,28 @@ describe('statuscolumn', function()
       {1:wrapped 1 9}aaaaaaaa                                  |
                                                            |
     ]])
+    -- Also test virt_lines at the end of buffer
+    exec_lua([[
+      local ns = vim.api.nvim_create_namespace("ns")
+      vim.api.nvim_buf_set_extmark(0, ns, 15, 0, { virt_lines = {{{"END", ""}}} })
+    ]])
+    feed('Gzz')
+    screen:expect([[
+      {1:buffer  0 13}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {1:wrapped 1 13}aaaaaaaaa                                |
+      {1:buffer  0 14}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {1:wrapped 1 14}aaaaaaaaa                                |
+      {1:buffer  0 15}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {1:wrapped 1 15}aaaaaaaaa                                |
+      {4:buffer  0 16}{5:^aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {4:wrapped 1 16}{5:aaaaaaaaa                                }|
+      {1:virtual-1 16}END                                      |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+                                                           |
+    ]])
   end)
 
   it("works with 'statuscolumn' clicks", function()
-- 
cgit 


From bf4eada2c83f5402fc56370fd22af11029a4a3aa Mon Sep 17 00:00:00 2001
From: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
Date: Tue, 7 Mar 2023 01:45:08 +0100
Subject: fix(column): issues with 'statuscolumn' width (#22542)

Problem:    'statuscolumn' width can be incorrect when toggling 'number'
            or setting 'statuscolumn'.
Solution:   Make sure the width is reset and re-estimated when
            'statuscolumn' and 'number' are set. (When 'relativenumber'
            is set this already happens because it always changes
            "nrwidth_line_count".)
---
 test/functional/ui/statuscolumn_spec.lua | 38 ++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 08b5d1913b..dfbdbb4898 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -520,4 +520,42 @@ describe('statuscolumn', function()
       :                                                    |
     ]])
   end)
+
+  it("has correct width when toggling '(relative)number'", function()
+    screen:try_resize(screen._width, 6)
+    command('call setline(1, repeat(["aaaaa"], 100))')
+    command('set relativenumber')
+    command([[set stc=%{!&nu&&!&rnu?'':&rnu?v:relnum?v:relnum:&nu?v:lnum:'0':v:lnum}]])
+    screen:expect([[
+      1  aaaaa                                             |
+      8  ^aaaaa                                             |
+      1  aaaaa                                             |
+      2  aaaaa                                             |
+      3  aaaaa                                             |
+                                                           |
+    ]])
+    -- width correctly estimated with "w_nrwidth_line_count" when setting 'stc'
+    command([[set stc=%{!&nu&&!&rnu?'':&rnu?v:relnum?v:relnum:&nu?v:lnum:'0':v:lnum}]])
+    screen:expect_unchanged()
+    -- zero width when disabling 'number'
+    command('set norelativenumber nonumber')
+    screen:expect([[
+      aaaaa                                                |
+      ^aaaaa                                                |
+      aaaaa                                                |
+      aaaaa                                                |
+      aaaaa                                                |
+                                                           |
+    ]])
+    -- width correctly estimated with "w_nrwidth_line_count" when setting 'nu'
+    command('set number')
+    screen:expect([[
+      7  aaaaa                                             |
+      8  ^aaaaa                                             |
+      9  aaaaa                                             |
+      10 aaaaa                                             |
+      11 aaaaa                                             |
+                                                           |
+    ]])
+  end)
 end)
-- 
cgit 


From 8916669d50243f6d4cdfb9480ef1b4e7ccdcfbb6 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 18 Mar 2023 19:06:24 +0800
Subject: test(statuscolumn_spec): remove unnecessary feed('lh')

It is no longer needed after #22706.
---
 test/functional/ui/statuscolumn_spec.lua | 1 -
 1 file changed, 1 deletion(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index dfbdbb4898..d9385ef221 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -461,7 +461,6 @@ describe('statuscolumn', function()
       vim.api.nvim_buf_set_extmark(0, ns, 7, 0, {
         virt_lines_leftcol = true, virt_lines = {{{"virt", ""}}} })
     ]])
-    feed('lh')  -- force update cursor row
     screen:expect([[
                 4 aaaaa                                    |
                 5 aaaaa                                    |
-- 
cgit 


From 204a8b17c8ebab1619cc47a920a06dcc348d75f7 Mon Sep 17 00:00:00 2001
From: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
Date: Sat, 18 Mar 2023 12:44:44 +0100
Subject: fix(column): rebuild status column when sign column is invalidated
 (#22690)

* fix(column): rebuild status column when sign column is invalidated

Problem:    When implementing a custom sign column through
            `'statuscolumn'`, the status column is not properly rebuilt
            when the sign column width changes.
Solution:   Force a rebuild of the status column when the sign column
            width is invalidated.

* test(column): 'statuscolumn' has correct width when (un)placing signs
---
 test/functional/ui/statuscolumn_spec.lua | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index d9385ef221..0a253455ad 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -557,4 +557,40 @@ describe('statuscolumn', function()
                                                            |
     ]])
   end)
+
+  it("has correct width with custom sign column when (un)placing signs", function()
+    screen:try_resize(screen._width, 6)
+    exec_lua([[
+      vim.cmd.norm('gg')
+      vim.o.signcolumn = 'no'
+      vim.fn.sign_define('sign', { text = 'ss' })
+      _G.StatusCol = function()
+        local s = vim.fn.sign_getplaced(1)[1].signs
+        local sign = ''
+        if #s > 0 then
+          sign = vim.v.lnum == 5 and 'ss' or '  '
+        end
+        return vim.v.lnum .. '%=' .. sign
+      end
+      vim.o.statuscolumn = "%!v:lua.StatusCol()"
+      vim.fn.sign_place(0, '', 'sign', 1, { lnum = 5 })
+    ]])
+    screen:expect([[
+      1   ^aaaaa                                            |
+      2   aaaaa                                            |
+      3   aaaaa                                            |
+      4   aaaaa                                            |
+      5 ssaaaaa                                            |
+                                                           |
+    ]])
+    command('sign unplace 1')
+    screen:expect([[
+      1 ^aaaaa                                              |
+      2 aaaaa                                              |
+      3 aaaaa                                              |
+      4 aaaaa                                              |
+      5 aaaaa                                              |
+                                                           |
+    ]])
+  end)
 end)
-- 
cgit 


From 3c724fe1f3efae0d00b43e381523ea2ec7229328 Mon Sep 17 00:00:00 2001
From: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
Date: Mon, 10 Apr 2023 02:39:27 +0200
Subject: fix(column): 'statuscolumn' not drawn after virt_lines with "n" in
 'cpo' (#22967)

Problem:    The 'statuscolumn' is not drawn and the line itself is drawn
            at an offset to the rest of the buffer after virt_lines if
            'cpoptions' includes "n".
Solution:   Make sure 'statuscolumn' is drawn.
---
 test/functional/ui/statuscolumn_spec.lua | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 0a253455ad..83c49e56a0 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -397,6 +397,29 @@ describe('statuscolumn', function()
       {0:~                                                    }|
                                                            |
     ]])
+    -- Also test virt_lines when 'cpoptions' includes "n"
+    exec_lua([[
+      vim.opt.cpoptions:append("n")
+      local ns = vim.api.nvim_create_namespace("ns")
+      vim.api.nvim_buf_set_extmark(0, ns, 14, 0, { virt_lines = {{{"virt_line1", ""}}} })
+      vim.api.nvim_buf_set_extmark(0, ns, 14, 0, { virt_lines = {{{"virt_line2", ""}}} })
+    ]])
+    screen:expect([[
+      {1:buffer  0 13}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      aaaaaaaaa                                            |
+      {1:buffer  0 14}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      aaaaaaaaa                                            |
+      {1:buffer  0 15}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      aaaaaaaaa                                            |
+      {1:virtual-2 15}virt_line1                               |
+      {1:virtual-2 15}virt_line2                               |
+      {1:buffer  0 16}{5:^aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {5:aaaaaaaaa                                            }|
+      {1:virtual-1 16}END                                      |
+      {0:~                                                    }|
+      {0:~                                                    }|
+                                                           |
+    ]])
   end)
 
   it("works with 'statuscolumn' clicks", function()
-- 
cgit 


From cdc028e97d9808c21e26fffe2d282b6517eaffc0 Mon Sep 17 00:00:00 2001
From: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
Date: Wed, 12 Apr 2023 17:40:58 +0200
Subject: fix(column): add truncated width during estimation for 'statuscolumn'

Problem:    Estimated 'statuscolumn' width estimated is not properly used,
            executing the `w_redr_statuscol` path unnecessarily.
Solution:   Adjust `w_nrwidth` and 'statuscolumn' width before anything
            is actually drawn in a `win_update()`.
---
 test/functional/ui/statuscolumn_spec.lua | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 83c49e56a0..a2fe875e65 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -616,4 +616,17 @@ describe('statuscolumn', function()
                                                            |
     ]])
   end)
+
+  it("is only evaluated twice, once to estimate and once to draw", function()
+    command([[
+      let g:stcnr = 0
+      func! Stc()
+        let g:stcnr += 1
+        return '12345'
+      endfunc
+      set stc=%!Stc()
+      norm ggdG
+    ]])
+    eq(2, eval('g:stcnr'))
+  end)
 end)
-- 
cgit 


From 84a4319545ad280d48a41e4cafaf0622c4278a16 Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Tue, 18 Apr 2023 02:00:49 +0200
Subject: fix(mouse): cmdline click registered as statuscolumn (#23163)

---
 test/functional/ui/statuscolumn_spec.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index a2fe875e65..0eec693182 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -457,6 +457,9 @@ describe('statuscolumn', function()
     -- Check that statusline click doesn't register as statuscolumn click
     meths.input_mouse('right', 'press', '', 0, 12, 0)
     eq('', eval("g:testvar"))
+    -- Check that cmdline click doesn't register as statuscolumn click
+    meths.input_mouse('right', 'press', '', 0, 13, 0)
+    eq('', eval("g:testvar"))
   end)
 
   it('click labels do not leak memory', function()
-- 
cgit 


From d799456a6b4d9f3000a4a4adb8b71ddee96351b9 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Tue, 18 Apr 2023 03:20:18 +0200
Subject: test(column): statuscolumn is rebuild when signs are (un)placed

---
 test/functional/ui/statuscolumn_spec.lua | 60 ++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 15 deletions(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 0eec693182..886e264a5f 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -15,6 +15,7 @@ describe('statuscolumn', function()
     clear('--cmd', 'set number nuw=1 | call setline(1, repeat(["aaaaa"], 16)) | norm GM')
     screen = Screen.new()
     screen:attach()
+    exec_lua('ns = vim.api.nvim_create_namespace("")')
   end)
 
   it("fails with invalid 'statuscolumn'", function()
@@ -352,7 +353,6 @@ describe('statuscolumn', function()
     ]])
     -- Status column is re-evaluated for virt_lines, buffer line, and wrapped line
     exec_lua([[
-      local ns = vim.api.nvim_create_namespace("ns")
       vim.api.nvim_buf_set_extmark(0, ns, 5, 0, {
         virt_lines_above = true, virt_lines = {{{"virt_line above", ""}}} })
       vim.api.nvim_buf_set_extmark(0, ns, 4, 0, { virt_lines = {{{"virt_line", ""}}} })
@@ -377,7 +377,6 @@ describe('statuscolumn', function()
     ]])
     -- Also test virt_lines at the end of buffer
     exec_lua([[
-      local ns = vim.api.nvim_create_namespace("ns")
       vim.api.nvim_buf_set_extmark(0, ns, 15, 0, { virt_lines = {{{"END", ""}}} })
     ]])
     feed('Gzz')
@@ -400,7 +399,6 @@ describe('statuscolumn', function()
     -- Also test virt_lines when 'cpoptions' includes "n"
     exec_lua([[
       vim.opt.cpoptions:append("n")
-      local ns = vim.api.nvim_create_namespace("ns")
       vim.api.nvim_buf_set_extmark(0, ns, 14, 0, { virt_lines = {{{"virt_line1", ""}}} })
       vim.api.nvim_buf_set_extmark(0, ns, 14, 0, { virt_lines = {{{"virt_line2", ""}}} })
     ]])
@@ -481,7 +479,6 @@ describe('statuscolumn', function()
     for _ = 0,8 do command('norm zfjzo') end
     -- 'statuscolumn' is not drawn for `virt_lines_leftcol` lines
     exec_lua([[
-      local ns = vim.api.nvim_create_namespace("ns")
       vim.api.nvim_buf_set_extmark(0, ns, 6, 0, {
         virt_lines_leftcol = true, virt_lines = {{{"virt", ""}}} })
       vim.api.nvim_buf_set_extmark(0, ns, 7, 0, {
@@ -585,37 +582,70 @@ describe('statuscolumn', function()
   end)
 
   it("has correct width with custom sign column when (un)placing signs", function()
-    screen:try_resize(screen._width, 6)
+    screen:try_resize(screen._width, 3)
     exec_lua([[
       vim.cmd.norm('gg')
       vim.o.signcolumn = 'no'
       vim.fn.sign_define('sign', { text = 'ss' })
       _G.StatusCol = function()
         local s = vim.fn.sign_getplaced(1)[1].signs
+        local es = vim.api.nvim_buf_get_extmarks(0, ns, 0, -1, {type = "sign"})
         local sign = ''
-        if #s > 0 then
-          sign = vim.v.lnum == 5 and 'ss' or '  '
+        local signs = #s + #es
+        if signs > 0 then
+          sign = (vim.v.lnum == 2 and 'ss' or '  '):rep(signs)
         end
         return vim.v.lnum .. '%=' .. sign
       end
       vim.o.statuscolumn = "%!v:lua.StatusCol()"
-      vim.fn.sign_place(0, '', 'sign', 1, { lnum = 5 })
     ]])
+    command('sign place 1 line=2 name=sign')
+    screen:expect([[
+      1   ^aaaaa                                            |
+      2 ssaaaaa                                            |
+                                                           |
+    ]])
+    command('sign place 2 line=2 name=sign')
+    screen:expect([[
+      1     ^aaaaa                                          |
+      2 ssssaaaaa                                          |
+                                                           |
+    ]])
+    command('sign unplace 2')
     screen:expect([[
       1   ^aaaaa                                            |
-      2   aaaaa                                            |
-      3   aaaaa                                            |
-      4   aaaaa                                            |
-      5 ssaaaaa                                            |
+      2 ssaaaaa                                            |
                                                            |
     ]])
     command('sign unplace 1')
     screen:expect([[
       1 ^aaaaa                                              |
       2 aaaaa                                              |
-      3 aaaaa                                              |
-      4 aaaaa                                              |
-      5 aaaaa                                              |
+                                                           |
+    ]])
+    -- Also for extmark signs
+    exec_lua('id1 = vim.api.nvim_buf_set_extmark(0, ns, 1, 0, {sign_text = "ss"})')
+    screen:expect([[
+      1   ^aaaaa                                            |
+      2 ssaaaaa                                            |
+                                                           |
+    ]])
+    exec_lua('id2 = vim.api.nvim_buf_set_extmark(0, ns, 1, 0, {sign_text = "ss"})')
+    screen:expect([[
+      1     ^aaaaa                                          |
+      2 ssssaaaaa                                          |
+                                                           |
+    ]])
+    exec_lua("vim.api.nvim_buf_del_extmark(0, ns, id1)")
+    screen:expect([[
+      1   ^aaaaa                                            |
+      2 ssaaaaa                                            |
+                                                           |
+    ]])
+    exec_lua("vim.api.nvim_buf_del_extmark(0, ns, id2)")
+    screen:expect([[
+      1 ^aaaaa                                              |
+      2 aaaaa                                              |
                                                            |
     ]])
   end)
-- 
cgit 


From 44d4f0357341d661a8fa7bd88c244e0ab196a838 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Wed, 19 Apr 2023 00:19:26 +0200
Subject: fix(column): rebuild status column when sign column is invalid

---
 test/functional/ui/statuscolumn_spec.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 886e264a5f..c4b055d289 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -648,6 +648,14 @@ describe('statuscolumn', function()
       2 aaaaa                                              |
                                                            |
     ]])
+    -- In all windows
+    command('wincmd v | set ls=0')
+    command('sign place 1 line=2 name=sign')
+    screen:expect([[
+      1   ^aaaaa                 │1   aaaaa                 |
+      2 ssaaaaa                 │2 ssaaaaa                 |
+                                                           |
+    ]])
   end)
 
   it("is only evaluated twice, once to estimate and once to draw", function()
-- 
cgit 


From a4b2400804355e99813f39a6b38d8f38667f8bdd Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Tue, 25 Apr 2023 05:05:04 +0200
Subject: fix(statusline): also allow right click when 'mousemodel' is "popup*"
 (#23258)

Problem:    The 'statusline'-format ui elements do not receive right
            click events when "mousemodel" is "popup*"
Solution:   Do not draw popupmenu and handle click event instead.
---
 test/functional/ui/statuscolumn_spec.lua | 82 +++++++++++++++++---------------
 1 file changed, 43 insertions(+), 39 deletions(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index c4b055d289..3b41d3684a 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -9,6 +9,8 @@ local feed = helpers.feed
 local meths = helpers.meths
 local pcall_err = helpers.pcall_err
 
+local mousemodels = { "extend", "popup", "popup_setpos" }
+
 describe('statuscolumn', function()
   local screen
   before_each(function()
@@ -420,45 +422,47 @@ describe('statuscolumn', function()
     ]])
   end)
 
-  it("works with 'statuscolumn' clicks", function()
-    command('set mousemodel=extend')
-    command([[
-      function! MyClickFunc(minwid, clicks, button, mods)
-        let g:testvar = printf("%d %d %s %d", a:minwid, a:clicks, a:button, getmousepos().line)
-        if a:mods !=# '    '
-          let g:testvar ..= '(' .. a:mods .. ')'
-        endif
-      endfunction
-      set stc=%0@MyClickFunc@%=%l%T
-    ]])
-    meths.input_mouse('left', 'press', '', 0, 0, 0)
-    eq('0 1 l 4', eval("g:testvar"))
-    meths.input_mouse('left', 'press', '', 0, 0, 0)
-    eq('0 2 l 4', eval("g:testvar"))
-    meths.input_mouse('left', 'press', '', 0, 0, 0)
-    eq('0 3 l 4', eval("g:testvar"))
-    meths.input_mouse('left', 'press', '', 0, 0, 0)
-    eq('0 4 l 4', eval("g:testvar"))
-    meths.input_mouse('right', 'press', '', 0, 3, 0)
-    eq('0 1 r 7', eval("g:testvar"))
-    meths.input_mouse('right', 'press', '', 0, 3, 0)
-    eq('0 2 r 7', eval("g:testvar"))
-    meths.input_mouse('right', 'press', '', 0, 3, 0)
-    eq('0 3 r 7', eval("g:testvar"))
-    meths.input_mouse('right', 'press', '', 0, 3, 0)
-    eq('0 4 r 7', eval("g:testvar"))
-    command('set laststatus=2 winbar=%f')
-    command('let g:testvar=""')
-    -- Check that winbar click doesn't register as statuscolumn click
-    meths.input_mouse('right', 'press', '', 0, 0, 0)
-    eq('', eval("g:testvar"))
-    -- Check that statusline click doesn't register as statuscolumn click
-    meths.input_mouse('right', 'press', '', 0, 12, 0)
-    eq('', eval("g:testvar"))
-    -- Check that cmdline click doesn't register as statuscolumn click
-    meths.input_mouse('right', 'press', '', 0, 13, 0)
-    eq('', eval("g:testvar"))
-  end)
+  for _, model in ipairs(mousemodels) do
+    it("works with 'statuscolumn' clicks with mousemodel=" .. model, function()
+      command('set mousemodel=' .. model)
+      command([[
+        function! MyClickFunc(minwid, clicks, button, mods)
+          let g:testvar = printf("%d %d %s %d", a:minwid, a:clicks, a:button, getmousepos().line)
+          if a:mods !=# '    '
+            let g:testvar ..= '(' .. a:mods .. ')'
+          endif
+        endfunction
+        set stc=%0@MyClickFunc@%=%l%T
+      ]])
+      meths.input_mouse('left', 'press', '', 0, 0, 0)
+      eq('0 1 l 4', eval("g:testvar"))
+      meths.input_mouse('left', 'press', '', 0, 0, 0)
+      eq('0 2 l 4', eval("g:testvar"))
+      meths.input_mouse('left', 'press', '', 0, 0, 0)
+      eq('0 3 l 4', eval("g:testvar"))
+      meths.input_mouse('left', 'press', '', 0, 0, 0)
+      eq('0 4 l 4', eval("g:testvar"))
+      meths.input_mouse('right', 'press', '', 0, 3, 0)
+      eq('0 1 r 7', eval("g:testvar"))
+      meths.input_mouse('right', 'press', '', 0, 3, 0)
+      eq('0 2 r 7', eval("g:testvar"))
+      meths.input_mouse('right', 'press', '', 0, 3, 0)
+      eq('0 3 r 7', eval("g:testvar"))
+      meths.input_mouse('right', 'press', '', 0, 3, 0)
+      eq('0 4 r 7', eval("g:testvar"))
+      command('set laststatus=2 winbar=%f')
+      command('let g:testvar=""')
+      -- Check that winbar click doesn't register as statuscolumn click
+      meths.input_mouse('right', 'press', '', 0, 0, 0)
+      eq('', eval("g:testvar"))
+      -- Check that statusline click doesn't register as statuscolumn click
+      meths.input_mouse('right', 'press', '', 0, 12, 0)
+      eq('', eval("g:testvar"))
+      -- Check that cmdline click doesn't register as statuscolumn click
+      meths.input_mouse('right', 'press', '', 0, 13, 0)
+      eq('', eval("g:testvar"))
+    end)
+  end
 
   it('click labels do not leak memory', function()
     command([[
-- 
cgit 


From 60f69014a801891d084542cf98ba2aa0d476164a Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Sun, 21 May 2023 13:00:37 +0200
Subject: fix(redraw): multibyte characters are wrapped at the end of a line
 (#23696)

Problem:    Multibyte characters may be wrapped at the end of a line
            when 'statuscolumn' and 'spell' are set.
Solution:   Update line pointerdiff "v" before fetching the line pointer
            after evaluating 'statuscolumn'.
---
 test/functional/ui/statuscolumn_spec.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 3b41d3684a..3d68246ba9 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -674,4 +674,16 @@ describe('statuscolumn', function()
     ]])
     eq(2, eval('g:stcnr'))
   end)
+
+  it('does not wrap multibyte characters at the end of a line', function()
+    screen:try_resize(33, 4)
+    command([[set spell stc=%l\ ]])
+    command('call setline(8, "This is a line that contains ᶏ multibyte character.")')
+    screen:expect([[
+      8  ^This is a line that contains ᶏ|
+          multibyte character.         |
+      9  aaaaa                         |
+                                       |
+    ]])
+  end)
 end)
-- 
cgit 


From 678548a2b44601db73cc7d049467abd2b433baae Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 24 May 2023 21:25:39 +0800
Subject: fix(folds): show Folded highlight in Visual selection (#23741)

Note: CursorLine highlight is now combined with Folded.
---
 test/functional/ui/statuscolumn_spec.lua | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 3d68246ba9..f349b182c9 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -196,8 +196,10 @@ describe('statuscolumn', function()
       [2] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.WebGrey},
       [3] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGrey},
       [4] = {bold = true, foreground = Screen.colors.Brown},
-      [5] = {background = Screen.colors.Grey90},
+      [5] = {background = Screen.colors.Grey90, underline = true},
+      [6] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGrey, underline = true},
     })
+    command('hi! CursorLine gui=underline guibg=Grey90')
     screen:expect([[
       {1: 4│ }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {1:  │ }a                                                |
@@ -214,7 +216,7 @@ describe('statuscolumn', function()
       {1:10│ }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa{0:@@@}|
                                                            |
     ]])
-    command("set stc=%C%s%=%l│\\ ")
+    command([[set stc=%C%s%=%l│\ ]])
     screen:expect_unchanged()
     command('set signcolumn=auto:2 foldcolumn=auto')
     command('sign define piet1 text=>> texthl=LineNr')
@@ -268,7 +270,7 @@ describe('statuscolumn', function()
       {2: }{1:  │}{2:    }{1: }aaaaaa                                      |
       {2: }{1: 7│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {2: }{1:  │}{2:    }{1: }aaaaaa                                      |
-      {2:+}{4: 8│}{2:    }{4: }{5:^+--  1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {2:+}{4: 8│}{2:    }{4: }{6:^+--  1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
       {2: }{1: 9│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {2: }{1:  │}{2:    }{1: }aaaaaa                                      |
       {2: }{1:10│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
@@ -286,7 +288,7 @@ describe('statuscolumn', function()
       {2: }{1: 6│}{2:    }{1: }aaaaaa                                      |
       {2: }{1: 7│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {2: }{1: 7│}{2:    }{1: }aaaaaa                                      |
-      {2:+}{4: 8│}{2:    }{4: }{5:^+--  1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {2:+}{4: 8│}{2:    }{4: }{6:^+--  1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
       {2: }{1: 9│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {2: }{1: 9│}{2:    }{1: }aaaaaa                                      |
       {2: }{1:10│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
@@ -304,7 +306,7 @@ describe('statuscolumn', function()
       {2: }{1: 2│}{2:    }{1: }aaaaaa                                      |
       {2: }{1: 1│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {2: }{1: 1│}{2:    }{1: }aaaaaa                                      |
-      {2:+}{4: 0│}{2:    }{4: }{5:^+--  1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {2:+}{4: 0│}{2:    }{4: }{6:^+--  1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
       {2: }{1: 1│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {2: }{1: 1│}{2:    }{1: }aaaaaa                                      |
       {2: }{1: 2│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
@@ -321,7 +323,7 @@ describe('statuscolumn', function()
       {2: }{1:  │}{2:    }{1: }aaaaaa                                      |
       {2: }{1: 1│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {2: }{1:  │}{2:    }{1: }aaaaaa                                      |
-      {2:+}{4: 0│}{2:    }{4: }{5:^+--  1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {2:+}{4: 0│}{2:    }{4: }{6:^+--  1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
       {2: }{1: 1│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {2: }{1:  │}{2:    }{1: }aaaaaa                                      |
       {2: }{1: 2│}{2:    }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
@@ -346,7 +348,7 @@ describe('statuscolumn', function()
       {2: }{1:  │}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaa          |
       {2: }{1: 1│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {2: }{1:  │}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaa          |
-      {2:+}{4: 0│}{2:                  }{4: }{5:^+--  1 line: aaaaaaaaaaaaaaaaa}|
+      {2:+}{4: 0│}{2:                  }{4: }{6:^+--  1 line: aaaaaaaaaaaaaaaaa}|
       {2: }{1: 1│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {2: }{1:  │}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaa          |
       {2: }{1: 2│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
@@ -372,7 +374,7 @@ describe('statuscolumn', function()
       {1:wrapped 1 6}aaaaaaaa                                  |
       {1:buffer  0 7}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {1:wrapped 1 7}aaaaaaaa                                  |
-      {4:buffer  0 8}{5:^+--  1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {4:buffer  0 8}{6:^+--  1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
       {1:buffer  0 9}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {1:wrapped 1 9}aaaaaaaa                                  |
                                                            |
-- 
cgit 


From ee986ee0449b828ca64bf7d4c69624596aab8319 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 25 May 2023 22:14:12 +0800
Subject: fix(folds): combined Folded and Visual highlights (#23752)

Also combine high-priority CursorLine with Folded.
---
 test/functional/ui/statuscolumn_spec.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index f349b182c9..c218bd8fd6 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -196,10 +196,10 @@ describe('statuscolumn', function()
       [2] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.WebGrey},
       [3] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGrey},
       [4] = {bold = true, foreground = Screen.colors.Brown},
-      [5] = {background = Screen.colors.Grey90, underline = true},
-      [6] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGrey, underline = true},
+      [5] = {foreground = Screen.colors.Red},
+      [6] = {foreground = Screen.colors.Red, background = Screen.colors.LightGrey},
     })
-    command('hi! CursorLine gui=underline guibg=Grey90')
+    command('hi! CursorLine guifg=Red guibg=NONE')
     screen:expect([[
       {1: 4│ }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {1:  │ }a                                                |
-- 
cgit 


From 70da793c5eda9f3e533a137ac0c0e31db1df0324 Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Tue, 30 May 2023 14:56:12 +0200
Subject: fix(statusline): corrupted screen with minwid sign item in
 'statuscolumn' (#23823)

---
 test/functional/ui/statuscolumn_spec.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index c218bd8fd6..6624fb008d 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -424,6 +424,21 @@ describe('statuscolumn', function()
     ]])
   end)
 
+  it('does not corrupt the screen with minwid sign item', function()
+    screen:try_resize(screen._width, 3)
+    screen:set_default_attr_ids({
+      [0] = {foreground = Screen.colors.Brown},
+      [1] = {foreground = Screen.colors.Blue4, background = Screen.colors.Gray},
+    })
+    command([[set stc=%6s\ %l]])
+    exec_lua('vim.api.nvim_buf_set_extmark(0, ns, 7, 0, {sign_text = "𒀀"})')
+    screen:expect([[
+      {0:    𒀀  8}^aaaaa                                        |
+      {0:    }{1:  }{0: 9}aaaaa                                        |
+                                                           |
+    ]])
+  end)
+
   for _, model in ipairs(mousemodels) do
     it("works with 'statuscolumn' clicks with mousemodel=" .. model, function()
       command('set mousemodel=' .. model)
-- 
cgit 


From 7d0a23973b7d0804089e3bfeb2372f4b818d6046 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 29 Jun 2023 11:37:55 +0800
Subject: fix(column): handle unprintable chars in 'statuscolumn' (#24198)

---
 test/functional/ui/statuscolumn_spec.lua | 114 ++++++++++++++++++++-----------
 1 file changed, 76 insertions(+), 38 deletions(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 6624fb008d..d713580ca9 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -3,6 +3,7 @@ local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
 local command = helpers.command
 local eq = helpers.eq
+local exec = helpers.exec
 local eval = helpers.eval
 local exec_lua = helpers.exec_lua
 local feed = helpers.feed
@@ -440,44 +441,81 @@ describe('statuscolumn', function()
   end)
 
   for _, model in ipairs(mousemodels) do
-    it("works with 'statuscolumn' clicks with mousemodel=" .. model, function()
-      command('set mousemodel=' .. model)
-      command([[
-        function! MyClickFunc(minwid, clicks, button, mods)
-          let g:testvar = printf("%d %d %s %d", a:minwid, a:clicks, a:button, getmousepos().line)
-          if a:mods !=# '    '
-            let g:testvar ..= '(' .. a:mods .. ')'
-          endif
-        endfunction
-        set stc=%0@MyClickFunc@%=%l%T
-      ]])
-      meths.input_mouse('left', 'press', '', 0, 0, 0)
-      eq('0 1 l 4', eval("g:testvar"))
-      meths.input_mouse('left', 'press', '', 0, 0, 0)
-      eq('0 2 l 4', eval("g:testvar"))
-      meths.input_mouse('left', 'press', '', 0, 0, 0)
-      eq('0 3 l 4', eval("g:testvar"))
-      meths.input_mouse('left', 'press', '', 0, 0, 0)
-      eq('0 4 l 4', eval("g:testvar"))
-      meths.input_mouse('right', 'press', '', 0, 3, 0)
-      eq('0 1 r 7', eval("g:testvar"))
-      meths.input_mouse('right', 'press', '', 0, 3, 0)
-      eq('0 2 r 7', eval("g:testvar"))
-      meths.input_mouse('right', 'press', '', 0, 3, 0)
-      eq('0 3 r 7', eval("g:testvar"))
-      meths.input_mouse('right', 'press', '', 0, 3, 0)
-      eq('0 4 r 7', eval("g:testvar"))
-      command('set laststatus=2 winbar=%f')
-      command('let g:testvar=""')
-      -- Check that winbar click doesn't register as statuscolumn click
-      meths.input_mouse('right', 'press', '', 0, 0, 0)
-      eq('', eval("g:testvar"))
-      -- Check that statusline click doesn't register as statuscolumn click
-      meths.input_mouse('right', 'press', '', 0, 12, 0)
-      eq('', eval("g:testvar"))
-      -- Check that cmdline click doesn't register as statuscolumn click
-      meths.input_mouse('right', 'press', '', 0, 13, 0)
-      eq('', eval("g:testvar"))
+    describe('with mousemodel=' .. model, function()
+      before_each(function()
+        command('set mousemodel=' .. model)
+        exec([[
+          function! MyClickFunc(minwid, clicks, button, mods)
+            let g:testvar = printf("%d %d %s %d", a:minwid, a:clicks, a:button, getmousepos().line)
+            if a:mods !=# '    '
+              let g:testvar ..= '(' .. a:mods .. ')'
+            endif
+          endfunction
+          let g:testvar = ''
+        ]])
+      end)
+
+      it('clicks work with mousemodel=' .. model, function()
+        meths.set_option_value('statuscolumn', '%0@MyClickFunc@%=%l%T', {})
+        meths.input_mouse('left', 'press', '', 0, 0, 0)
+        eq('0 1 l 4', eval("g:testvar"))
+        meths.input_mouse('left', 'press', '', 0, 0, 0)
+        eq('0 2 l 4', eval("g:testvar"))
+        meths.input_mouse('left', 'press', '', 0, 0, 0)
+        eq('0 3 l 4', eval("g:testvar"))
+        meths.input_mouse('left', 'press', '', 0, 0, 0)
+        eq('0 4 l 4', eval("g:testvar"))
+        meths.input_mouse('right', 'press', '', 0, 3, 0)
+        eq('0 1 r 7', eval("g:testvar"))
+        meths.input_mouse('right', 'press', '', 0, 3, 0)
+        eq('0 2 r 7', eval("g:testvar"))
+        meths.input_mouse('right', 'press', '', 0, 3, 0)
+        eq('0 3 r 7', eval("g:testvar"))
+        meths.input_mouse('right', 'press', '', 0, 3, 0)
+        eq('0 4 r 7', eval("g:testvar"))
+        command('set laststatus=2 winbar=%f')
+        command('let g:testvar = ""')
+        -- Check that winbar click doesn't register as statuscolumn click
+        meths.input_mouse('right', 'press', '', 0, 0, 0)
+        eq('', eval("g:testvar"))
+        -- Check that statusline click doesn't register as statuscolumn click
+        meths.input_mouse('right', 'press', '', 0, 12, 0)
+        eq('', eval("g:testvar"))
+        -- Check that cmdline click doesn't register as statuscolumn click
+        meths.input_mouse('right', 'press', '', 0, 13, 0)
+        eq('', eval("g:testvar"))
+      end)
+
+      it('clicks and highlights work with control characters', function()
+        meths.set_option_value('statuscolumn', '\t%#NonText#\1%0@MyClickFunc@\t\1%T\t%##\1', {})
+        screen:expect{grid=[[
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}^aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+          {1:^I}{0:^A^I^A^I}{1:^A}aaaaa                                    |
+                                                               |
+        ]], attr_ids={
+          [0] = {foreground = Screen.colors.Blue, bold = true};  -- NonText
+          [1] = {foreground = Screen.colors.Brown};  -- LineNr
+        }}
+        meths.input_mouse('right', 'press', '', 0, 4, 3)
+        eq('', eval("g:testvar"))
+        meths.input_mouse('left', 'press', '', 0, 5, 8)
+        eq('', eval("g:testvar"))
+        meths.input_mouse('right', 'press', '', 0, 6, 4)
+        eq('0 1 r 10', eval("g:testvar"))
+        meths.input_mouse('left', 'press', '', 0, 7, 7)
+        eq('0 1 l 11', eval("g:testvar"))
+      end)
     end)
   end
 
-- 
cgit 


From 25e62697c32e43d978e43776f9a01cd62bfe83be Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 6 Jul 2023 11:07:23 +0800
Subject: fix(column): fix wrong cursor with 'statuscolumn' and cpo+=n (#24268)

---
 test/functional/ui/statuscolumn_spec.lua | 58 ++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index d713580ca9..6a1c20ff67 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -356,6 +356,64 @@ describe('statuscolumn', function()
       {2: }{1:  │}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaa          |
                                                            |
     ]])
+    -- Also test fold and sign column when 'cpoptions' includes "n"
+    command('set cpoptions+=n')
+    feed('Hgjg0')
+    screen:expect([[
+      {2: }{4: 0│}{1:>>}{2:                }{4: }{5:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {2:                   }{5:^aaaaaaaaaaaaaaaaaaaa              }|
+      {2: }{1: 3│}{0:>!}{2:                }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }aaaaaaaaaaaaaaaaaaaa              |
+      {2: }{1: 2│>>}{0:>!}{1:>>}{0:>!}{1:>>}{0:>!}{1:>>}{0:>!}{1:>> }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }aaaaaaaaaaaaaaaaaaaa              |
+      {2: }{1: 1│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }aaaaaaaaaaaaaaaaaaaa              |
+      {2:+}{1: 4│}{2:                  }{1: }{3:+--  1 line: aaaaaaaaaaaaaaaaa}|
+      {2: }{1: 1│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }aaaaaaaaaaaaaaaaaaaa              |
+      {2: }{1: 2│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }aaaaaaaaaaaaaaaaaaaa              |
+                                                           |
+    ]])
+    command('set breakindent')
+    feed('J2gjg0')
+    screen:expect([[
+      {2: }{4: 0│}{1:>>}{2:                }{4: }{5:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {2:                   }    {5:aaaaaaaaaaaaaaaaaaaa aaaaaaaaa}|
+      {2:                   }    {5:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {2:                   }    {5:^aaaaaaaaaaa                   }|
+      {2: }{1: 1│>>}{0:>!}{1:>>}{0:>!}{1:>>}{0:>!}{1:>>}{0:>!}{1:>> }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }    aaaaaaaaaaaaaaaaaaaa          |
+      {2: }{1: 2│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }    aaaaaaaaaaaaaaaaaaaa          |
+      {2:+}{1: 3│}{2:                  }{1: }{3:+--  1 line: aaaaaaaaaaaaaaaaa}|
+      {2: }{1: 4│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }    aaaaaaaaaaaaaaaaaaaa          |
+      {2: }{1: 5│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }    aaaaaaaaaaaaaaaaaaaa          |
+                                                           |
+    ]])
+    command('set nobreakindent')
+    feed('$g0')
+    screen:expect([[
+      {2: }{4: 0│}{1:>>}{2:                }{4: }{5:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {2:                   }{5:aaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaa}|
+      {2:                   }{5:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {2:                   }{5:^aaa                               }|
+      {2: }{1: 1│>>}{0:>!}{1:>>}{0:>!}{1:>>}{0:>!}{1:>>}{0:>!}{1:>> }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }aaaaaaaaaaaaaaaaaaaa              |
+      {2: }{1: 2│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }aaaaaaaaaaaaaaaaaaaa              |
+      {2:+}{1: 3│}{2:                  }{1: }{3:+--  1 line: aaaaaaaaaaaaaaaaa}|
+      {2: }{1: 4│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }aaaaaaaaaaaaaaaaaaaa              |
+      {2: }{1: 5│}{2:                  }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {2:                   }aaaaaaaaaaaaaaaaaaaa              |
+                                                           |
+    ]])
+    command('silent undo')
+    feed('8gg')
+    command('set cpoptions-=n')
     -- Status column is re-evaluated for virt_lines, buffer line, and wrapped line
     exec_lua([[
       vim.api.nvim_buf_set_extmark(0, ns, 5, 0, {
-- 
cgit 


From 01e273c340b5e51b593900c8feb894ba9a46c366 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 24 Jul 2023 15:18:24 +0800
Subject: fix(statuscolumn): don't update clicks if current width is 0 (#24459)

---
 test/functional/ui/statuscolumn_spec.lua | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 6a1c20ff67..35cd479bb9 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -9,6 +9,7 @@ local exec_lua = helpers.exec_lua
 local feed = helpers.feed
 local meths = helpers.meths
 local pcall_err = helpers.pcall_err
+local assert_alive = helpers.assert_alive
 
 local mousemodels = { "extend", "popup", "popup_setpos" }
 
@@ -577,8 +578,8 @@ describe('statuscolumn', function()
     end)
   end
 
-  it('click labels do not leak memory', function()
-    command([[
+  it('click labels do not leak memory #21878', function()
+    exec([[
       set laststatus=2
       setlocal statuscolumn=%0@MyClickFunc@abcd%T
       4vsplit
@@ -590,6 +591,18 @@ describe('statuscolumn', function()
     ]])
   end)
 
+  it('click labels do not crash when initial width is 0 #24428', function()
+    exec([[
+      set nonumber
+      bwipe!
+      setlocal statuscolumn=abcd
+      redraw
+      setlocal statuscolumn=%0@MyClickFunc@abcd%T
+      redraw
+    ]])
+    assert_alive()
+  end)
+
   it('works with foldcolumn', function()
     -- Fits maximum multibyte foldcolumn #21759
     command([[set stc=%C%=%l\  fdc=9 fillchars=foldsep:𒀀]])
-- 
cgit 


From afd0c648a89ff88c9bff1b24c37e139813ec13c9 Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Sat, 26 Aug 2023 15:10:04 +0200
Subject: fix(statuscolumn): force full redraw when signcolumn is invalid
 (#24859)

Fix #24655
---
 test/functional/ui/statuscolumn_spec.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 35cd479bb9..ee235cd6b5 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -727,6 +727,8 @@ describe('statuscolumn', function()
         end
         return vim.v.lnum .. '%=' .. sign
       end
+      vim.o.number = true
+      vim.o.numberwidth = 2
       vim.o.statuscolumn = "%!v:lua.StatusCol()"
     ]])
     command('sign place 1 line=2 name=sign')
-- 
cgit 


From 2b475cb5cc2196a32085fbbdfd7357cbb02a1cb0 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 11 Sep 2023 08:29:33 +0800
Subject: fix(mouse): click on 'statuscolumn' with 'rightleft' (#25090)

---
 test/functional/ui/statuscolumn_spec.lua | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index ee235cd6b5..742976cbe2 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -532,6 +532,24 @@ describe('statuscolumn', function()
         eq('0 3 r 7', eval("g:testvar"))
         meths.input_mouse('right', 'press', '', 0, 3, 0)
         eq('0 4 r 7', eval("g:testvar"))
+
+        command('rightbelow vsplit')
+        meths.input_mouse('left', 'press', '', 0, 0, 27)
+        eq('0 1 l 4', eval("g:testvar"))
+        meths.input_mouse('right', 'press', '', 0, 3, 27)
+        eq('0 1 r 7', eval("g:testvar"))
+        command('setlocal rightleft')
+        meths.input_mouse('left', 'press', '', 0, 0, 52)
+        eq('0 1 l 4', eval("g:testvar"))
+        meths.input_mouse('right', 'press', '', 0, 3, 52)
+        eq('0 1 r 7', eval("g:testvar"))
+        command('wincmd H')
+        meths.input_mouse('left', 'press', '', 0, 0, 25)
+        eq('0 1 l 4', eval("g:testvar"))
+        meths.input_mouse('right', 'press', '', 0, 3, 25)
+        eq('0 1 r 7', eval("g:testvar"))
+        command('close')
+
         command('set laststatus=2 winbar=%f')
         command('let g:testvar = ""')
         -- Check that winbar click doesn't register as statuscolumn click
-- 
cgit 


From dc6c11394b73803028d04498c80a538fe6aa4310 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 21 Sep 2023 07:03:26 +0800
Subject: fix(statuscolumn): update number hl for each screen line (#25277)

---
 test/functional/ui/statuscolumn_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 742976cbe2..a7830abe8f 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -475,7 +475,7 @@ describe('statuscolumn', function()
       aaaaaaaaa                                            |
       {1:virtual-2 15}virt_line1                               |
       {1:virtual-2 15}virt_line2                               |
-      {1:buffer  0 16}{5:^aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {4:buffer  0 16}{5:^aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
       {5:aaaaaaaaa                                            }|
       {1:virtual-1 16}END                                      |
       {0:~                                                    }|
-- 
cgit 


From d3582e102b7bd53afb58efb37eca866ec528dfbe Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Mon, 13 Nov 2023 04:24:02 +0100
Subject: feat(statuscolumn): re-evaluate for every screen line (#25885)

Problem:  v:virtnum is less useful than it could be.
Solution: Always re-evaluate 'statuscolumn', and update v:virtnum
          accordingly.
---
 test/functional/ui/statuscolumn_spec.lua | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index a7830abe8f..9f00c7a5d6 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -429,7 +429,7 @@ describe('statuscolumn', function()
       {1:buffer  0 5}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {1:wrapped 1 5}aaaaaaaa                                  |
       {1:virtual-2 5}virt_line                                 |
-      {1:virtual-2 5}virt_line above                           |
+      {1:virtual-1 5}virt_line above                           |
       {1:buffer  0 6}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {1:wrapped 1 6}aaaaaaaa                                  |
       {1:buffer  0 7}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
@@ -443,18 +443,18 @@ describe('statuscolumn', function()
     exec_lua([[
       vim.api.nvim_buf_set_extmark(0, ns, 15, 0, { virt_lines = {{{"END", ""}}} })
     ]])
-    feed('Gzz')
+    feed('GkJzz')
     screen:expect([[
+      {1:buffer  0 12}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      {1:wrapped 1 12}aaaaaaaaa                                |
       {1:buffer  0 13}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {1:wrapped 1 13}aaaaaaaaa                                |
       {1:buffer  0 14}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       {1:wrapped 1 14}aaaaaaaaa                                |
-      {1:buffer  0 15}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
-      {1:wrapped 1 15}aaaaaaaaa                                |
-      {4:buffer  0 16}{5:^aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
-      {4:wrapped 1 16}{5:aaaaaaaaa                                }|
-      {1:virtual-1 16}END                                      |
-      {0:~                                                    }|
+      {4:buffer  0 15}{5:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {4:wrapped 1 15}{5:aaaaaaaaa^ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {4:wrapped 2 15}{5:aaaaaaaaaaaaaaaaaaa                      }|
+      {1:virtual-1 15}END                                      |
       {0:~                                                    }|
       {0:~                                                    }|
       {0:~                                                    }|
@@ -467,18 +467,18 @@ describe('statuscolumn', function()
       vim.api.nvim_buf_set_extmark(0, ns, 14, 0, { virt_lines = {{{"virt_line2", ""}}} })
     ]])
     screen:expect([[
+      {1:buffer  0 12}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      aaaaaaaaa                                            |
       {1:buffer  0 13}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       aaaaaaaaa                                            |
       {1:buffer  0 14}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       aaaaaaaaa                                            |
-      {1:buffer  0 15}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
-      aaaaaaaaa                                            |
-      {1:virtual-2 15}virt_line1                               |
+      {4:buffer  0 15}{5:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {5:aaaaaaaaa^ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
+      {5:aaaaaaa                                              }|
+      {1:virtual-3 15}virt_line1                               |
       {1:virtual-2 15}virt_line2                               |
-      {4:buffer  0 16}{5:^aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
-      {5:aaaaaaaaa                                            }|
-      {1:virtual-1 16}END                                      |
-      {0:~                                                    }|
+      {1:virtual-1 15}END                                      |
       {0:~                                                    }|
                                                            |
     ]])
-- 
cgit 


From c4afb9788c4f139eb2e3b7aa4d6a6a20b67ba156 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Sat, 11 Nov 2023 00:52:50 +0100
Subject: refactor(sign): move legacy signs to extmarks

Problem:  The legacy signlist data structures and associated functions are
          redundant since the introduction of extmark signs.
Solution: Store signs defined through the legacy commands in a hashmap, placed
          signs in the extmark tree. Replace signlist associated functions.

Usage of the legacy sign commands should yield no change in behavior with the
exception of:
  - "orphaned signs" are now always removed when the line it is placed on is
    deleted. This used to depend on the value of 'signcolumn'.
  - It is no longer possible to place multiple signs with the same identifier
    in a single group on multiple lines. This will now move the sign instead.

Moreover, both signs placed through the legacy sign commands and through
|nvim_buf_set_extmark()|:
  - Will show up in both |sign-place| and |nvim_buf_get_extmarks()|.
  - Are displayed by increasing sign identifier, left to right.
    Extmark signs used to be ordered decreasingly as opposed to legacy signs.
---
 test/functional/ui/statuscolumn_spec.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 9f00c7a5d6..61f6419f8c 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -377,6 +377,7 @@ describe('statuscolumn', function()
                                                            |
     ]])
     command('set breakindent')
+    command('sign unplace 2')
     feed('J2gjg0')
     screen:expect([[
       {2: }{4: 0│}{1:>>}{2:                }{4: }{5:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
-- 
cgit 


From df399ea0d20e86027d0b59ca4bbd445c1d035a67 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Thu, 23 Nov 2023 16:23:26 +0100
Subject: fix(column): reset decor state before starting from top

---
 test/functional/ui/statuscolumn_spec.lua | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 61f6419f8c..dd11fa7c15 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -46,22 +46,17 @@ describe('statuscolumn', function()
   end)
 
   it("widens with irregular 'statuscolumn' width", function()
-    command([[set stc=%{v:relnum?v:relnum:(v:lnum==5?'bbbbb':v:lnum)}]])
-    command('norm 5G | redraw!')
-    screen:expect([[
-      1    aaaaa                                           |
+    screen:try_resize(screen._width, 4)
+    command([=[
+      set stc=%{v:relnum?v:relnum:(v:lnum==5?'bbbbb':v:lnum)}
+      let ns = nvim_create_namespace('')
+      call nvim_buf_set_extmark(0, ns, 3, 0, {'virt_text':[['virt_text']]})
+      norm 5G | redraw!
+    ]=])
+    screen:expect([[
+      1    aaaaa virt_text                                 |
       bbbbba^eaaa                                           |
       1    aaaaa                                           |
-      2    aaaaa                                           |
-      3    aaaaa                                           |
-      4    aaaaa                                           |
-      5    aaaaa                                           |
-      6    aaaaa                                           |
-      7    aaaaa                                           |
-      8    aaaaa                                           |
-      9    aaaaa                                           |
-      10   aaaaa                                           |
-      11   aaaaa                                           |
                                                            |
     ]])
   end)
-- 
cgit 


From a8a93e517f9eb988ee86170d9a77382637dd24a3 Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Fri, 24 Nov 2023 02:15:50 +0100
Subject: fix(mouse): avoid dragging after click label popupmenu callback
 (#26187)

---
 test/functional/ui/statuscolumn_spec.lua | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index dd11fa7c15..73039701cd 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -589,6 +589,33 @@ describe('statuscolumn', function()
         meths.input_mouse('left', 'press', '', 0, 7, 7)
         eq('0 1 l 11', eval("g:testvar"))
       end)
+
+      it('selecting popupmenu does not drag mouse', function()
+        screen:try_resize(screen._width, 2)
+        screen:set_default_attr_ids({
+          [0] = {foreground = Screen.colors.Brown},
+          [1] = {background = Screen.colors.Plum1},
+        })
+        meths.set_option_value('statuscolumn', '%0@MyClickFunc@%l%T', {})
+        exec([[
+          function! MyClickFunc(minwid, clicks, button, mods)
+            let g:testvar = printf("%d %d %s %d", a:minwid, a:clicks, a:button, getmousepos().line)
+            menu PopupStc.Echo <cmd>echo g:testvar<CR>
+            popup PopupStc
+          endfunction
+        ]])
+        meths.input_mouse('left', 'press', '', 0, 0, 0)
+        screen:expect([[
+          {0:8 }^aaaaa                                              |
+           {1: Echo }                                              |
+        ]])
+        meths.input_mouse('left', 'press', '', 0, 1, 5)
+        meths.input_mouse('left', 'release', '', 0, 1, 5)
+        screen:expect([[
+          {0:8 }^aaaaa                                              |
+          0 1 l 8                                              |
+        ]])
+      end)
     end)
   end
 
-- 
cgit 


From 6a2a37b1e102394d99b4891dc9807868f0fa3c97 Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Sat, 25 Nov 2023 00:10:19 +0100
Subject: fix(mouse): avoid dragging when clicking next to popupmenu (#26201)

---
 test/functional/ui/statuscolumn_spec.lua | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'test/functional/ui/statuscolumn_spec.lua')

diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
index 73039701cd..6eaf15cfad 100644
--- a/test/functional/ui/statuscolumn_spec.lua
+++ b/test/functional/ui/statuscolumn_spec.lua
@@ -590,7 +590,7 @@ describe('statuscolumn', function()
         eq('0 1 l 11', eval("g:testvar"))
       end)
 
-      it('selecting popupmenu does not drag mouse', function()
+      it('popupmenu callback does not drag mouse on close', function()
         screen:try_resize(screen._width, 2)
         screen:set_default_attr_ids({
           [0] = {foreground = Screen.colors.Brown},
@@ -604,6 +604,7 @@ describe('statuscolumn', function()
             popup PopupStc
           endfunction
         ]])
+        -- clicking an item does not drag mouse
         meths.input_mouse('left', 'press', '', 0, 0, 0)
         screen:expect([[
           {0:8 }^aaaaa                                              |
@@ -615,6 +616,19 @@ describe('statuscolumn', function()
           {0:8 }^aaaaa                                              |
           0 1 l 8                                              |
         ]])
+        command('echo')
+        -- clicking outside to close the menu does not drag mouse
+        meths.input_mouse('left', 'press', '', 0, 0, 0)
+        screen:expect([[
+          {0:8 }^aaaaa                                              |
+           {1: Echo }                                              |
+        ]])
+        meths.input_mouse('left', 'press', '', 0, 0, 10)
+        meths.input_mouse('left', 'release', '', 0, 0, 10)
+        screen:expect([[
+          {0:8 }^aaaaa                                              |
+                                                               |
+        ]])
       end)
     end)
   end
-- 
cgit