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

refactor(tests): use more global highlight definitions

Browse Source
This commit is contained in:
bfredl
2024-11-09 14:14:29 +01:00
parent d0e78b5871
commit 29fd5ed606
6 changed files with 963 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
test/functional/ui/embed_spec.lua
View File

@@ -27,32 +27,30 @@ local function test_embed(ext_linegrid)
-- attach immediately after startup, for early UI
screen = Screen.new(60, 8)
screen:attach { ext_linegrid = ext_linegrid }
screen:set_default_attr_ids({
[1] = { foreground = Screen.colors.Grey100, background = Screen.colors.Red },
[2] = { bold = true, foreground = Screen.colors.SeaGreen4 },
[3] = { bold = true, foreground = Screen.colors.Blue1 },
[4] = { bold = true, foreground = Screen.colors.Green },
[5] = { bold = true, reverse = true },
[6] = { foreground = Screen.colors.NvimLightGrey3, background = Screen.colors.NvimDarkGrey3 },
[7] = { foreground = Screen.colors.NvimDarkRed },
[8] = { foreground = Screen.colors.NvimDarkCyan },
})
screen:add_extra_attr_ids {
[100] = { foreground = Screen.colors.NvimDarkCyan },
[101] = { foreground = Screen.colors.NvimDarkRed },
[102] = {
background = Screen.colors.NvimDarkGrey3,
foreground = Screen.colors.NvimLightGrey3,
},
}
end
it('can display errors', function()
startup('--cmd', 'echoerr invalid+')
screen:expect([[
|*4
{6: }|
{1:Error detected while processing pre-vimrc command line:} |
{1:E121: Undefined variable: invalid} |
{2:Press ENTER or type command to continue}^ |
{102: }|
{9:Error detected while processing pre-vimrc command line:} |
{9:E121: Undefined variable: invalid} |
{6:Press ENTER or type command to continue}^ |
]])
feed('<cr>')
screen:expect([[
^ |
{3:~ }|*6
{1:~ }|*6
|
]])
end)
@@ -64,11 +62,11 @@ local function test_embed(ext_linegrid)
startup('--cmd', 'echoerr "foo"', '--cmd', 'color default', '--cmd', 'echoerr "bar"')
screen:expect([[
|*3
{6: }|
{1:Error detected while processing pre-vimrc command line:} |
{1:foo} |
{7:bar} |
{8:Press ENTER or type command to continue}^ |
{102: }|
{9:Error detected while processing pre-vimrc command line:} |
{9:foo} |
{101:bar} |
{100:Press ENTER or type command to continue}^ |
]])
end)
@@ -77,11 +75,11 @@ local function test_embed(ext_linegrid)
screen:expect {
grid = [[
|*3
{6: }|
{1:Error detected while processing pre-vimrc command line:} |
{1:foo} |
{1:bar} |
{2:Press ENTER or type command to continue}^ |
{102: }|
{9:Error detected while processing pre-vimrc command line:} |
{9:foo} |
{9:bar} |
{6:Press ENTER or type command to continue}^ |
]],
condition = function()
eq(Screen.colors.Green, screen.default_colors.rgb_bg)
@@ -115,10 +113,6 @@ describe('--embed UI', function()
local screen = Screen.new(40, 8)
screen.rpc_async = true -- Avoid hanging. #24888
screen:attach { stdin_fd = 3 }
screen:set_default_attr_ids {
[1] = { bold = true, foreground = Screen.colors.Blue1 },
[2] = { bold = true },
}
writer:write 'hello nvim\nfrom external input\n'
writer:shutdown(function()
@@ -139,7 +133,7 @@ describe('--embed UI', function()
^ |
from external input |
{1:~ }|*4
{2:-- INSERT --} |
{5:-- INSERT --} |
]]
if not is_os('win') then
@@ -173,10 +167,6 @@ describe('--embed UI', function()
local screen = Screen.new(60, 8)
screen.rpc_async = true -- Avoid hanging. #24888
screen:attach { stdin_fd = 3 }
screen:set_default_attr_ids {
[1] = { bold = true, foreground = Screen.colors.Blue1 },
[2] = { bold = true },
}
writer:write [[Xbadfile.c:4:12: error: expected ';' before '}' token]]
writer:shutdown(function()
@@ -202,7 +192,7 @@ describe('--embed UI', function()
return 666^ |
} |
{1:~ }|*2
{2:-- INSERT --} |
{5:-- INSERT --} |
]]
eq('-', api.nvim_get_option_value('errorfile', {}))