neovim

commit 4876654d4cc9bb43f266c7c9d412f36ab57fa571
parent f2141de9e462ed8976b2a59337c32a0fcba2a11d
Author: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
Date:   Fri, 13 Jan 2023 00:36:59 +0100

fix(mouse): statusline click registered as statuscolumn (#21748)

fix(statuscolumn): statusline click registered as statuscolumn

Problem:  Status line click is registered as status status column click.
Solution: Check that mouse is not on the status line.

Resolve https://github.com/luukvbaal/statuscol.nvim/issues/4.
Diffstat:
M
src/nvim/mouse.c
 | 
2
+-
M
test/functional/ui/statuscolumn_spec.lua
 | 
8
++++++++

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c
@@ -1110,7 +1110,7 @@ retnomove:
     ? wp->w_winbar_height != 0
     : false;
 
-  on_statuscol = (grid == (col < win_col_off(wp)))
+  on_statuscol = !on_status_line && !on_winbar && col < win_col_off(wp)
     ? *wp->w_p_stc != NUL
     : false;
 
diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua
@@ -366,6 +366,14 @@ 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('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"))
   end)
 
   it('fits maximum multibyte foldcolumn #21759', function()