IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13903 from glacambre/fix_prompt_for_number

Browse Source 
Clear prompt_for_number messages
This commit is contained in:
Björn Linse 2021-02-10 18:51:33 +01:00 committed by GitHub
commit 230f2ff381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/spell.c
View File

@ -112,6 +112,7 @@
#include "nvim/strings.h"
#include "nvim/syntax.h"
#include "nvim/undo.h"
#include "nvim/ui.h"
#include "nvim/os/os.h"
#include "nvim/os/input.h"
@ -2889,8 +2890,14 @@ void spell_suggest(int count)
msg_col = 0;
// Ask for choice.
selected = prompt_for_number(&mouse_used);
if (mouse_used)
if (ui_has(kUIMessages)) {
ui_call_msg_clear();
}
if (mouse_used) {
selected -= lines_left;
}
lines_left = Rows; // avoid more prompt
// don't delay for 'smd' in normal_cmd()
msg_scroll = msg_scroll_save;

40
test/functional/ui/messages_spec.lua
View File

@ -29,6 +29,7 @@ describe('ui/ext_messages', function()
[6] = {bold = true, reverse = true},
[7] = {background = Screen.colors.Yellow},
[8] = {foreground = Screen.colors.Red},
[9] = {special = Screen.colors.Red, undercurl = true},
})
end)
after_each(function()
@ -795,6 +796,45 @@ describe('ui/ext_messages', function()
pos = 9,
}}}
end)
it('hides prompt_for_number messages', function()
command('set spell')
feed('ihelllo<esc>')
feed('z=')
screen:expect{grid=[[
{9:helllo} |
{1:~ }|
{1:~ }|
{1:~ }|
{1:^~ }|
]], messages={
{content = { { 'Change "helllo" to:\n 1 "Hello"\n 2 "Hallo"\n 3 "Helli"\nType number and <Enter> or click with mouse (empty cancels): ' } }, kind = ""}
}}
feed('1')
screen:expect{grid=[[
{9:helllo} |
{1:~ }|
{1:~ }|
{1:~ }|
{1:^~ }|
]], messages={
{content = { { 'Change "helllo" to:\n 1 "Hello"\n 2 "Hallo"\n 3 "Helli"\nType number and <Enter> or click with mouse (empty cancels): ' } }, kind = ""},
{ content = { { "1" } }, kind = "" }
}}
feed('<cr>')
screen:expect{grid=[[
^Hello |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
]]}
end)
end)
describe('ui/builtin messages', function()