aboutsummaryrefslogtreecommitdiff
path: root/test/functional/legacy/cmdline_spec.lua
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/legacy/cmdline_spec.lua')
-rw-r--r--test/functional/legacy/cmdline_spec.lua177
1 files changed, 58 insertions, 119 deletions
diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index 3cbff2a01b..8c94451f9a 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -5,8 +5,8 @@ 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
+local api = helpers.api
+local pesc = vim.pesc
describe('cmdline', function()
before_each(clear)
@@ -16,10 +16,10 @@ describe('cmdline', 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};
+ [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))]])
@@ -37,35 +37,28 @@ describe('cmdline', function()
]])
feed [[:tabnew<cr>]]
- screen:expect{grid=[[
+ screen:expect {
+ grid = [[
{1: + [No Name] }{2: [No Name] }{3: }{1:X}|
^ |
- {4:~ }|
- {4:~ }|
- {4:~ }|
- {4:~ }|
- {4:~ }|
- {4:~ }|
- {4:~ }|
+ {4:~ }|*7
:tabnew |
- ]]}
+ ]],
+ }
feed [[<C-w>-<C-w>-]]
- screen:expect{grid=[[
+ screen:expect {
+ grid = [[
{1: + [No Name] }{2: [No Name] }{3: }{1:X}|
^ |
- {4:~ }|
- {4:~ }|
- {4:~ }|
- {4:~ }|
- {4:~ }|
- |
- |
- |
- ]]}
+ {4:~ }|*5
+ |*3
+ ]],
+ }
feed [[gt]]
- screen:expect{grid=[[
+ screen:expect {
+ grid = [[
{2: + [No Name] }{1: [No Name] }{3: }{1:X}|
^0 |
1 |
@@ -76,20 +69,15 @@ describe('cmdline', function()
6 |
7 |
|
- ]]}
+ ]],
+ }
feed [[gt]]
screen:expect([[
{1: + [No Name] }{2: [No Name] }{3: }{1:X}|
^ |
- {4:~ }|
- {4:~ }|
- {4:~ }|
- {4:~ }|
- {4:~ }|
- |
- |
- |
+ {4:~ }|*5
+ |*3
]])
end)
@@ -105,8 +93,7 @@ describe('cmdline', function()
feed_command('DoSomething')
screen:expect([[
|
- ~ |
- ~ |
+ ~ |*2
|
Executing: DoSomething |
Executing: echo 'hello' |set ts=4 |let v = '123' |echo v |
@@ -123,8 +110,8 @@ describe('cmdline', function()
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
+ [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
+ [1] = { reverse = true }, -- TabLineFill
})
screen:attach()
exec([[
@@ -135,9 +122,7 @@ describe('cmdline', function()
screen:expect([[
{1:foo }|
|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*3
:^ |
]])
end)
@@ -146,7 +131,7 @@ describe('cmdline', function()
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
+ [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
})
screen:attach()
exec([[
@@ -156,9 +141,7 @@ describe('cmdline', function()
feed(':for i in range(3)<CR>')
screen:expect([[
|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*3
:for i in range(3) |
: ^ |
]])
@@ -166,9 +149,7 @@ describe('cmdline', function()
-- Note: this may still be considered broken, ref #18140
screen:expect([[
|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*3
: :let i =^ |
|
]])
@@ -177,8 +158,8 @@ describe('cmdline', function()
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
+ [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
+ [1] = { bold = true, reverse = true }, -- StatusLine
})
screen:attach()
exec([[
@@ -194,22 +175,14 @@ describe('cmdline', function()
feed(':call EchoTwo()')
screen:expect([[
|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*5
{1:[No Name] }|
:call EchoTwo()^ |
]])
feed('<CR>')
screen:expect([[
^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*5
{1:[No Name] }|
|
]])
@@ -219,22 +192,19 @@ describe('cmdline', function()
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
+ [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_value('laststatus', 2, {})
- meths.set_option_value('showtabline', 2, {})
- meths.set_option_value('cmdheight', 1, {})
+ api.nvim_set_option_value('laststatus', 2, {})
+ api.nvim_set_option_value('showtabline', 2, {})
+ api.nvim_set_option_value('cmdheight', 1, {})
screen:expect([[
{2: [No Name] }{3: }|
^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*4
{1:[No Name] }|
|
]])
@@ -244,13 +214,13 @@ describe('cmdline', function()
it("ruler has correct position with 'rulerformat' set", function()
local screen = Screen.new(20, 3)
screen:set_default_attr_ids {
- [0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
+ [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
}
screen:attach()
- meths.set_option_value('ruler', true, {})
- meths.set_option_value('rulerformat', 'longish', {})
- meths.set_option_value('laststatus', 0, {})
- meths.set_option_value('winwidth', 1, {})
+ api.nvim_set_option_value('ruler', true, {})
+ api.nvim_set_option_value('rulerformat', 'longish', {})
+ api.nvim_set_option_value('laststatus', 0, {})
+ api.nvim_set_option_value('winwidth', 1, {})
feed [[<C-W>v<C-W>|<C-W>p]]
screen:expect [[
│^ |
@@ -267,72 +237,41 @@ describe('cmdwin', function()
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
+ [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 --}^')})
+ screen:expect({ any = pesc('{3:-- More --}^') })
feed('q')
screen:expect([[
|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*5
{2:[No Name] }|
{0::}^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*6
{1:[Command Line] }|
|
]])
feed([[aecho 'done']])
screen:expect([[
|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*5
{2:[No Name] }|
{0::}echo 'done'^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*6
{1:[Command Line] }|
{4:-- INSERT --} |
]])
feed('<CR>')
screen:expect([[
^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*14
done |
]])
end)
generated by cgit (git 2.34.1) at 2025-04-28 13:54:21 +0000