mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 12:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

ex_getln: remove msg_scrolled cargo-cult magic, fixes #8251

Browse Source
This commit is contained in:
Björn Linse
2018-06-02 10:03:43 +02:00
parent 1efe65a155
commit 37e00c6e65
2 changed files with 110 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/ex_getln.c
View File

@@ -295,10 +295,7 @@ static uint8_t *command_line_enter(int firstc, long count, int indent)
redir_off = true; // don't redirect the typed command redir_off = true; // don't redirect the typed command
if (!cmd_silent) { if (!cmd_silent) {
s->i = msg_scrolled;
msg_scrolled = 0; // avoid wait_return message
gotocmdline(true); gotocmdline(true);
msg_scrolled += s->i;
redrawcmdprompt(); // draw prompt or indent redrawcmdprompt(); // draw prompt or indent
set_cmdspos(); set_cmdspos();
} }

110
test/functional/ex_cmds/debug_spec.lua Normal file
View File

@@ -0,0 +1,110 @@
local helpers = require('test.functional.helpers')(after_each)
local Screen = require('test.functional.ui.screen')
local feed = helpers.feed
local clear = helpers.clear
describe(':debug', function()
local screen
before_each(function()
clear()
screen = Screen.new(50, 14)
screen:set_default_attr_ids({
[1] = {bold = true, foreground = Screen.colors.Blue1},
[2] = {bold = true, reverse = true},
[3] = {foreground = Screen.colors.Grey100, background = Screen.colors.Red},
[4] = {bold = true, foreground = Screen.colors.SeaGreen4},
})
screen:attach()
end)
it('scrolls messages correctly', function()
feed(':echoerr bork<cr>')
screen:expect([[
|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{2: }|
{3:E121: Undefined variable: bork} |
{3:E15: Invalid expression: bork} |
{4:Press ENTER or type command to continue}^ |
]])
feed(':debug echo "aa"| echo "bb"<cr>')
screen:expect([[
|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{2: }|
{3:E121: Undefined variable: bork} |
{3:E15: Invalid expression: bork} |
Entering Debug mode. Type "cont" to continue. |
cmd: echo "aa"| echo "bb" |
>^ |
]])
feed('step<cr>')
screen:expect([[
|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{2: }|
{3:E121: Undefined variable: bork} |
{3:E15: Invalid expression: bork} |
Entering Debug mode. Type "cont" to continue. |
cmd: echo "aa"| echo "bb" |
>step |
aa |
cmd: echo "bb" |
>^ |
]])
feed('step<cr>')
screen:expect([[
|
{1:~ }|
{1:~ }|
{2: }|
{3:E121: Undefined variable: bork} |
{3:E15: Invalid expression: bork} |
Entering Debug mode. Type "cont" to continue. |
cmd: echo "aa"| echo "bb" |
>step |
aa |
cmd: echo "bb" |
>step |
bb |
{4:Press ENTER or type command to continue}^ |
]])
feed('<cr>')
screen:expect([[
^ |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]])
end)
end)