feat(ui): make right-click menu work properly with ext_multigrid

Add tests both with and without ext_multigrid.

2 files changed, 133 insertions, 0 deletions

diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index befed415a6..ba151b5ce2 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -940,14 +940,17 @@ void pum_set_event_info(dict_T *dict)
 
 static void pum_position_at_mouse(int min_width)
 {
+  pum_anchor_grid = mouse_grid;
   if (Rows - mouse_row > pum_size) {
     // Enough space below the mouse row.
+    pum_above = false;
     pum_row = mouse_row + 1;
     if (pum_height > Rows - pum_row) {
       pum_height = Rows - pum_row;
     }
   } else {
     // Show above the mouse row, reduce height if it does not fit.
+    pum_above = true;
     pum_row = mouse_row - pum_size;
     if (pum_row < 0) {
       pum_height += pum_row;
@@ -971,6 +974,14 @@ static void pum_position_at_mouse(int min_width)
 /// Select the pum entry at the mouse position.
 static void pum_select_mouse_pos(void)
 {
+  if (mouse_grid == pum_grid.handle) {
+    pum_selected = mouse_row;
+    return;
+  } else if (mouse_grid > 1) {
+    pum_selected = -1;
+    return;
+  }
+
   int idx = mouse_row - pum_row;
 
   if (idx < 0 || idx >= pum_size) {
diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
index ef65dbd2bd..39753cca5b 100644
--- a/test/functional/ui/popupmenu_spec.lua
+++ b/test/functional/ui/popupmenu_spec.lua
@@ -11,6 +11,7 @@ local get_pathsep = helpers.get_pathsep
 local eq = helpers.eq
 local pcall_err = helpers.pcall_err
 local exec_lua = helpers.exec_lua
+local exec = helpers.exec
 
 describe('ui/ext_popupmenu', function()
   local screen
@@ -2359,6 +2360,74 @@ describe('builtin popupmenu', function()
       {2:-- INSERT --}                    |
     ]])
   end)
+
+  it('supports mousemodel=popup', function()
+    screen:try_resize(32, 6)
+    exec([[
+      call setline(1, 'popup menu test')
+      set mouse=a mousemodel=popup
+
+      menu PopUp.foo :let g:menustr = 'foo'<CR>
+      menu PopUp.bar :let g:menustr = 'bar'<CR>
+      menu PopUp.baz :let g:menustr = 'baz'<CR>
+    ]])
+    meths.input_mouse('right', 'press', '', 0, 0, 4)
+    screen:expect([[
+      ^popup menu test                 |
+      {1:~  }{n: foo }{1:                        }|
+      {1:~  }{n: bar }{1:                        }|
+      {1:~  }{n: baz }{1:                        }|
+      {1:~                               }|
+                                      |
+    ]])
+    feed('<Down>')
+    screen:expect([[
+      ^popup menu test                 |
+      {1:~  }{s: foo }{1:                        }|
+      {1:~  }{n: bar }{1:                        }|
+      {1:~  }{n: baz }{1:                        }|
+      {1:~                               }|
+                                      |
+    ]])
+    feed('<Down>')
+    screen:expect([[
+      ^popup menu test                 |
+      {1:~  }{n: foo }{1:                        }|
+      {1:~  }{s: bar }{1:                        }|
+      {1:~  }{n: baz }{1:                        }|
+      {1:~                               }|
+                                      |
+    ]])
+    feed('<CR>')
+    screen:expect([[
+      ^popup menu test                 |
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      :let g:menustr = 'bar'          |
+    ]])
+    eq('bar', meths.get_var('menustr'))
+    meths.input_mouse('right', 'press', '', 0, 1, 20)
+    screen:expect([[
+      ^popup menu test                 |
+      {1:~                               }|
+      {1:~                  }{n: foo }{1:        }|
+      {1:~                  }{n: bar }{1:        }|
+      {1:~                  }{n: baz }{1:        }|
+      :let g:menustr = 'bar'          |
+    ]])
+    meths.input_mouse('left', 'press', '', 0, 4, 22)
+    screen:expect([[
+      ^popup menu test                 |
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      :let g:menustr = 'baz'          |
+    ]])
+    eq('baz', meths.get_var('menustr'))
+  end)
 end)
 
 describe('builtin popupmenu with ui/ext_multigrid', function()
@@ -2450,4 +2519,57 @@ describe('builtin popupmenu with ui/ext_multigrid', function()
         {n: 哦哦哦哦哦哦哦哦哦>}{s: }|
     ]], float_pos={[4] = {{id = -1}, 'NW', 2, 1, 11, false, 100}}})
   end)
+
+  it('supports mousemodel=popup', function()
+    screen:try_resize(32, 6)
+    exec([[
+      call setline(1, 'popup menu test')
+      set mouse=a mousemodel=popup
+
+      menu PopUp.foo :let g:menustr = 'foo'<CR>
+      menu PopUp.bar :let g:menustr = 'bar'<CR>
+      menu PopUp.baz :let g:menustr = 'baz'<CR>
+    ]])
+    meths.input_mouse('right', 'press', '', 2, 1, 20)
+    screen:expect({grid=[[
+    ## grid 1
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [3:--------------------------------]|
+    ## grid 2
+      ^popup menu test                 |
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+    ## grid 3
+                                      |
+    ## grid 4
+      {n: foo }|
+      {n: bar }|
+      {n: baz }|
+    ]], float_pos={[4] = {{id = -1}, 'NW', 2, 2, 19, false, 100}}})
+    meths.input_mouse('left', 'press', '', 4, 2, 2)
+    screen:expect({grid=[[
+    ## grid 1
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [2:--------------------------------]|
+      [3:--------------------------------]|
+    ## grid 2
+      ^popup menu test                 |
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+      {1:~                               }|
+    ## grid 3
+      :let g:menustr = 'baz'          |
+    ]]})
+    eq('baz', meths.get_var('menustr'))
+  end)
 end)