mirror of
https://github.com/neovim/neovim.git
synced 2024-12-26 14:11:15 -07:00
9857cc1dbf
Problem: No space for command line when there is a tabline.
Solution: Correct computation of where the command line should be.
(closes vim/vim#11295)
c9f5f73206
(cherry picked from commit 31996f7748)
398 lines
15 KiB
Lua
398 lines
15 KiB
Lua
local helpers = require('test.functional.helpers')(after_each)
|
|
local Screen = require('test.functional.ui.screen')
|
|
local clear = helpers.clear
|
|
local command = helpers.command
|
|
local feed = helpers.feed
|
|
local feed_command = helpers.feed_command
|
|
local exec = helpers.exec
|
|
local meths = helpers.meths
|
|
local pesc = helpers.pesc
|
|
|
|
describe('cmdline', function()
|
|
before_each(clear)
|
|
|
|
-- oldtest: Test_cmdlineclear_tabenter()
|
|
it('is cleared when switching tabs', function()
|
|
local screen = Screen.new(30, 10)
|
|
screen:attach()
|
|
screen:set_default_attr_ids {
|
|
[1] = {underline = true, background = Screen.colors.LightGrey};
|
|
[2] = {bold = true};
|
|
[3] = {reverse = true};
|
|
[4] = {bold = true, foreground = Screen.colors.Blue1};
|
|
}
|
|
|
|
feed_command([[call setline(1, range(30))]])
|
|
screen:expect([[
|
|
^0 |
|
|
1 |
|
|
2 |
|
|
3 |
|
|
4 |
|
|
5 |
|
|
6 |
|
|
7 |
|
|
8 |
|
|
:call setline(1, range(30)) |
|
|
]])
|
|
|
|
feed [[:tabnew<cr>]]
|
|
screen:expect{grid=[[
|
|
{1: + [No Name] }{2: [No Name] }{3: }{1:X}|
|
|
^ |
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
:tabnew |
|
|
]]}
|
|
|
|
feed [[<C-w>-<C-w>-]]
|
|
screen:expect{grid=[[
|
|
{1: + [No Name] }{2: [No Name] }{3: }{1:X}|
|
|
^ |
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
|
|
|
|
|
|
|
|
|
]]}
|
|
|
|
feed [[gt]]
|
|
screen:expect{grid=[[
|
|
{2: + [No Name] }{1: [No Name] }{3: }{1:X}|
|
|
^0 |
|
|
1 |
|
|
2 |
|
|
3 |
|
|
4 |
|
|
5 |
|
|
6 |
|
|
7 |
|
|
|
|
|
]]}
|
|
|
|
feed [[gt]]
|
|
screen:expect([[
|
|
{1: + [No Name] }{2: [No Name] }{3: }{1:X}|
|
|
^ |
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
{4:~ }|
|
|
|
|
|
|
|
|
|
|
|
]])
|
|
end)
|
|
|
|
-- oldtest: Test_verbose_option()
|
|
it('prints every executed Ex command if verbose >= 16', function()
|
|
local screen = Screen.new(60, 12)
|
|
screen:attach()
|
|
exec([[
|
|
command DoSomething echo 'hello' |set ts=4 |let v = '123' |echo v
|
|
call feedkeys("\r", 't') " for the hit-enter prompt
|
|
set verbose=20
|
|
]])
|
|
feed_command('DoSomething')
|
|
screen:expect([[
|
|
|
|
|
~ |
|
|
~ |
|
|
|
|
|
Executing: DoSomething |
|
|
Executing: echo 'hello' |set ts=4 |let v = '123' |echo v |
|
|
hello |
|
|
Executing: set ts=4 |let v = '123' |echo v |
|
|
Executing: let v = '123' |echo v |
|
|
Executing: echo v |
|
|
123 |
|
|
Press ENTER or type command to continue^ |
|
|
]])
|
|
end)
|
|
|
|
-- oldtest: Test_cmdline_redraw_tabline()
|
|
it('tabline is redrawn on entering cmdline', function()
|
|
local screen = Screen.new(30, 6)
|
|
screen:set_default_attr_ids({
|
|
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
|
|
[1] = {reverse = true}, -- TabLineFill
|
|
})
|
|
screen:attach()
|
|
exec([[
|
|
set showtabline=2
|
|
autocmd CmdlineEnter * set tabline=foo
|
|
]])
|
|
feed(':')
|
|
screen:expect([[
|
|
{1:foo }|
|
|
|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
:^ |
|
|
]])
|
|
end)
|
|
|
|
-- oldtest: Test_redraw_in_autocmd()
|
|
it('cmdline cursor position is correct after :redraw with cmdheight=2', function()
|
|
local screen = Screen.new(30, 6)
|
|
screen:set_default_attr_ids({
|
|
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
|
|
})
|
|
screen:attach()
|
|
exec([[
|
|
set cmdheight=2
|
|
autocmd CmdlineChanged * redraw
|
|
]])
|
|
feed(':for i in range(3)<CR>')
|
|
screen:expect([[
|
|
|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
:for i in range(3) |
|
|
: ^ |
|
|
]])
|
|
feed(':let i =')
|
|
-- Note: this may still be considered broken, ref #18140
|
|
screen:expect([[
|
|
|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
: :let i =^ |
|
|
|
|
|
]])
|
|
end)
|
|
|
|
-- oldtest: Test_redrawstatus_in_autocmd()
|
|
it(':redrawstatus in cmdline mode', function()
|
|
local screen = Screen.new(60, 8)
|
|
screen:set_default_attr_ids({
|
|
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
|
|
[1] = {bold = true, reverse = true}, -- MsgSeparator, StatusLine
|
|
})
|
|
screen:attach()
|
|
exec([[
|
|
set laststatus=2
|
|
set statusline=%=:%{getcmdline()}
|
|
autocmd CmdlineChanged * redrawstatus
|
|
set display-=msgsep
|
|
]])
|
|
-- :redrawstatus is postponed if messages have scrolled
|
|
feed([[:echo "one\ntwo\nthree\nfour"<CR>]])
|
|
feed(':foobar')
|
|
screen:expect([[
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{1: :echo "one\ntwo\nthree\nfour"}|
|
|
one |
|
|
two |
|
|
three |
|
|
four |
|
|
:foobar^ |
|
|
]])
|
|
-- it is not postponed if messages have not scrolled
|
|
feed('<Esc>:for in in range(3)')
|
|
screen:expect([[
|
|
|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{1: :for in in range(3)}|
|
|
:for in in range(3)^ |
|
|
]])
|
|
-- with cmdheight=1 messages have scrolled when typing :endfor
|
|
feed('<CR>:endfor')
|
|
screen:expect([[
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{1: :for in in range(3)}|
|
|
:for in in range(3) |
|
|
: :endfor^ |
|
|
]])
|
|
feed('<CR>:set cmdheight=2<CR>')
|
|
-- with cmdheight=2 messages haven't scrolled when typing :for or :endfor
|
|
feed(':for in in range(3)')
|
|
screen:expect([[
|
|
|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{1: :for in in range(3)}|
|
|
:for in in range(3)^ |
|
|
|
|
|
]])
|
|
feed('<CR>:endfor')
|
|
screen:expect([[
|
|
|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{1: ::endfor}|
|
|
:for in in range(3) |
|
|
: :endfor^ |
|
|
]])
|
|
end)
|
|
|
|
it("setting 'cmdheight' works after outputting two messages vim-patch:9.0.0665", function()
|
|
local screen = Screen.new(60, 8)
|
|
screen:set_default_attr_ids({
|
|
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
|
|
[1] = {bold = true, reverse = true}, -- StatusLine
|
|
})
|
|
screen:attach()
|
|
exec([[
|
|
set cmdheight=1 laststatus=2
|
|
func EchoTwo()
|
|
set laststatus=2
|
|
set cmdheight=5
|
|
echo 'foo'
|
|
echo 'bar'
|
|
set cmdheight=1
|
|
endfunc
|
|
]])
|
|
feed(':call EchoTwo()')
|
|
screen:expect([[
|
|
|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{1:[No Name] }|
|
|
:call EchoTwo()^ |
|
|
]])
|
|
feed('<CR>')
|
|
screen:expect([[
|
|
^ |
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{1:[No Name] }|
|
|
|
|
|
]])
|
|
end)
|
|
|
|
-- oldtest: Test_cmdheight_tabline()
|
|
it("changing 'cmdheight' when there is a tabline", function()
|
|
local screen = Screen.new(60, 8)
|
|
screen:set_default_attr_ids({
|
|
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
|
|
[1] = {bold = true, reverse = true}, -- StatusLine
|
|
[2] = {bold = true}, -- TabLineSel
|
|
[3] = {reverse = true}, -- TabLineFill
|
|
})
|
|
screen:attach()
|
|
meths.set_option('laststatus', 2)
|
|
meths.set_option('showtabline', 2)
|
|
meths.set_option('cmdheight', 1)
|
|
screen:expect([[
|
|
{2: [No Name] }{3: }|
|
|
^ |
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{1:[No Name] }|
|
|
|
|
|
]])
|
|
end)
|
|
end)
|
|
|
|
describe('cmdwin', function()
|
|
before_each(clear)
|
|
|
|
-- oldtest: Test_cmdwin_interrupted()
|
|
it('still uses a new buffer when interrupting more prompt on open', function()
|
|
local screen = Screen.new(30, 16)
|
|
screen:set_default_attr_ids({
|
|
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
|
|
[1] = {bold = true, reverse = true}, -- StatusLine
|
|
[2] = {reverse = true}, -- StatusLineNC
|
|
[3] = {bold = true, foreground = Screen.colors.SeaGreen}, -- MoreMsg
|
|
[4] = {bold = true}, -- ModeMsg
|
|
})
|
|
screen:attach()
|
|
command('set more')
|
|
command('autocmd WinNew * highlight')
|
|
feed('q:')
|
|
screen:expect({any = pesc('{3:-- More --}^')})
|
|
feed('q')
|
|
screen:expect([[
|
|
|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{2:[No Name] }|
|
|
{0::}^ |
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{1:[Command Line] }|
|
|
|
|
|
]])
|
|
feed([[aecho 'done']])
|
|
screen:expect([[
|
|
|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{2:[No Name] }|
|
|
{0::}echo 'done'^ |
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{1:[Command Line] }|
|
|
{4:-- INSERT --} |
|
|
]])
|
|
feed('<CR>')
|
|
screen:expect([[
|
|
^ |
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
done |
|
|
]])
|
|
end)
|
|
end)
|