diff options
| author | bfredl <bjorn.linse@gmail.com> | 2023-01-15 13:40:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-15 13:40:55 +0100 |
| commit | 43feb973e30ed40b8eb7bc97b0f41eef0b51194b (patch) | |
| tree | 7ded836d032066bce23bac16df43a5a579caeb07 | |
| parent | 909abfbd877f9231716ff3a2ea0532cf43a737f3 (diff) | |
| parent | b603d6f9e71f7ac1e34cfff5007834a765250922 (diff) | |
| download | rneovim-43feb973e30ed40b8eb7bc97b0f41eef0b51194b.tar.gz rneovim-43feb973e30ed40b8eb7bc97b0f41eef0b51194b.tar.bz2 rneovim-43feb973e30ed40b8eb7bc97b0f41eef0b51194b.zip | |
Merge pull request #21731 from tk-shirasaka/fix/builtin_popup_on_ext_popupmenu
fix: properly close builtin popup in ext_popupmenu
| -rw-r--r-- | src/nvim/popupmenu.c | 1 | ||||
| -rw-r--r-- | test/functional/ui/popupmenu_spec.lua | 76 |
2 files changed, 77 insertions, 0 deletions
diff --git a/src/nvim/popupmenu.c b/src/nvim/popupmenu.c index 1d55b2ef31..14ee71d50a 100644 --- a/src/nvim/popupmenu.c +++ b/src/nvim/popupmenu.c @@ -878,6 +878,7 @@ void pum_check_clear(void) grid_free(&pum_grid); } pum_is_drawn = false; + pum_external = false; } } diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua index 85e6a03872..0d874ae79d 100644 --- a/test/functional/ui/popupmenu_spec.lua +++ b/test/functional/ui/popupmenu_spec.lua @@ -945,6 +945,82 @@ describe('ui/ext_popupmenu', function() }} end) + + it('does not interfere with mousemodel=popup', function() + exec([[ + set mouse=a mousemodel=popup + + aunmenu 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> + ]]) + feed('o<C-r>=TestComplete()<CR>') + screen:expect{grid=[[ + | + foo^ | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {2:-- INSERT --} | + ]], popupmenu={ + items=expected, + pos=0, + anchor={1,1,0}, + }} + + feed('<c-p>') + screen:expect{grid=[[ + | + ^ | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {2:-- INSERT --} | + ]], popupmenu={ + items=expected, + pos=-1, + anchor={1,1,0}, + }} + + feed('<esc>') + screen:expect{grid=[[ + | + ^ | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + | + ]]} + feed('<RightMouse><0,0>') + screen:expect([[ + | + {7:^foo } | + {7:bar }{1: }| + {7:baz }{1: }| + {1:~ }| + {1:~ }| + {1:~ }| + | + ]]) + feed('<esc>') + screen:expect([[ + | + ^ | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + | + ]]) + end) end) |