mirror of
https://github.com/neovim/neovim.git
synced 2024-12-20 19:25:11 -07:00
574519d9d6
Problem: Updating default color scheme produced some feedback. Solution: Address the feedback. Outline of the changes: - Colors `Grey1` and `Grey2` are made a little bit more extreme (dark - darker, light - lighter) to increase overall contrast. - `gui` colors are treated as base with `cterm` colors falling back to using 0-15 colors which come from terminal emulator. - Update highlight group definition to not include attribute definition if it is intended to staty uncolored. - Tweak some specific highlight groups. - Add a list of Neovim specific highlight groups which are now defined differently in a breaking way. - Minor tweaks in several other places related to default color scheme.
203 lines
7.4 KiB
Lua
203 lines
7.4 KiB
Lua
local uv = require'luv'
|
|
|
|
local helpers = require('test.functional.helpers')(after_each)
|
|
local Screen = require('test.functional.ui.screen')
|
|
|
|
local feed = helpers.feed
|
|
local eq = helpers.eq
|
|
local neq = helpers.neq
|
|
local clear = helpers.clear
|
|
local ok = helpers.ok
|
|
local funcs = helpers.funcs
|
|
local nvim_prog = helpers.nvim_prog
|
|
local retry = helpers.retry
|
|
|
|
local function test_embed(ext_linegrid)
|
|
local screen
|
|
local function startup(...)
|
|
clear{args_rm={'--headless'}, args={...}}
|
|
|
|
-- 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.NvimDarkGrey3, background = Screen.colors.NvimLightGrey1};
|
|
[7] = {foreground = Screen.colors.NvimDarkRed};
|
|
[8] = {foreground = Screen.colors.NvimDarkCyan};
|
|
})
|
|
end
|
|
|
|
it('can display errors', function()
|
|
startup('--cmd', 'echoerr invalid+')
|
|
screen:expect([[
|
|
|*4
|
|
{6: }|
|
|
{7:Error detected while processing pre-vimrc command line:} |
|
|
{7:E121: Undefined variable: invalid} |
|
|
{8:Press ENTER or type command to continue}^ |
|
|
]])
|
|
|
|
feed('<cr>')
|
|
screen:expect([[
|
|
^ |
|
|
{3:~ }|*6
|
|
|
|
|
]])
|
|
end)
|
|
|
|
it("doesn't erase output when setting color scheme", function()
|
|
if helpers.is_os('openbsd') then
|
|
pending('FIXME #10804')
|
|
end
|
|
startup('--cmd', 'echoerr "foo"', '--cmd', 'color default', '--cmd', 'echoerr "bar"')
|
|
screen:expect([[
|
|
|*3
|
|
{6: }|
|
|
{7:Error detected while processing pre-vimrc command line:} |
|
|
{7:foo} |
|
|
{7:bar} |
|
|
{8:Press ENTER or type command to continue}^ |
|
|
]])
|
|
end)
|
|
|
|
it("doesn't erase output when setting Normal colors", function()
|
|
startup('--cmd', 'echoerr "foo"', '--cmd', 'hi Normal guibg=Green', '--cmd', 'echoerr "bar"')
|
|
screen:expect{grid=[[
|
|
|*3
|
|
{6: }|
|
|
{7:Error detected while processing pre-vimrc command line:} |
|
|
{7:foo} |
|
|
{7:bar} |
|
|
{8:Press ENTER or type command to continue}^ |
|
|
]], condition=function()
|
|
eq(Screen.colors.Green, screen.default_colors.rgb_bg)
|
|
end}
|
|
end)
|
|
end
|
|
|
|
describe('--embed UI on startup (ext_linegrid=true)', function() test_embed(true) end)
|
|
describe('--embed UI on startup (ext_linegrid=false)', function() test_embed(false) end)
|
|
|
|
describe('--embed UI', function()
|
|
it('can pass stdin', function()
|
|
local pipe = assert(uv.pipe())
|
|
|
|
local writer = assert(uv.new_pipe(false))
|
|
writer:open(pipe.write)
|
|
|
|
clear {args_rm={'--headless'}, io_extra=pipe.read}
|
|
|
|
-- attach immediately after startup, for early UI
|
|
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() writer:close() end)
|
|
|
|
screen:expect{grid=[[
|
|
^hello nvim |
|
|
from external input |
|
|
{1:~ }|*5
|
|
|
|
|
]]}
|
|
|
|
-- stdin (rpc input) still works
|
|
feed 'o'
|
|
screen:expect{grid=[[
|
|
hello nvim |
|
|
^ |
|
|
from external input |
|
|
{1:~ }|*4
|
|
{2:-- INSERT --} |
|
|
]]}
|
|
end)
|
|
|
|
it("only sets background colors once even if overridden", function()
|
|
local screen, current, seen
|
|
local function handle_default_colors_set(_, _, rgb_bg, _, _, _)
|
|
seen[rgb_bg] = true
|
|
current = rgb_bg
|
|
end
|
|
local function startup(...)
|
|
seen = {}
|
|
current = nil
|
|
clear {args_rm={'--headless'}, args={...}}
|
|
|
|
-- attach immediately after startup, for early UI
|
|
screen = Screen.new(40, 8)
|
|
screen._handle_default_colors_set = handle_default_colors_set
|
|
screen:attach()
|
|
end
|
|
|
|
startup()
|
|
screen:expect{condition=function()
|
|
eq(16777215, current)
|
|
end}
|
|
eq({[16777215]=true}, seen)
|
|
|
|
-- NB: by accident how functional/helpers.lua currently handles the default color scheme, the
|
|
-- above is sufficient to test the behavior. But in case that workaround is removed, we need
|
|
-- a test with an explicit override like below, so do it to remain safe.
|
|
startup('--cmd', 'hi NORMAL guibg=#FF00FF')
|
|
screen:expect{condition=function()
|
|
eq(16711935, current)
|
|
end}
|
|
eq({[16711935]=true}, seen) -- we only saw the last one, despite 16777215 was set internally earlier
|
|
end)
|
|
end)
|
|
|
|
describe('--embed --listen UI', function()
|
|
it('waits for connection on listening address', function()
|
|
helpers.skip(helpers.is_os('win'))
|
|
clear()
|
|
local child_server = assert(helpers.new_pipename())
|
|
funcs.jobstart({nvim_prog, '--embed', '--listen', child_server, '--clean', '--cmd', 'colorscheme vim'})
|
|
retry(nil, nil, function() neq(nil, uv.fs_stat(child_server)) end)
|
|
|
|
local child_session = helpers.connect(child_server)
|
|
|
|
local info_ok, api_info = child_session:request('nvim_get_api_info')
|
|
ok(info_ok)
|
|
eq(2, #api_info)
|
|
ok(api_info[1] > 2, 'channel_id > 2', api_info[1])
|
|
|
|
child_session:request('nvim_exec2', [[
|
|
let g:evs = []
|
|
autocmd UIEnter * call add(g:evs, $"UIEnter:{v:event.chan}")
|
|
autocmd VimEnter * call add(g:evs, "VimEnter")
|
|
]], {})
|
|
|
|
-- VimEnter and UIEnter shouldn't be triggered until after attach
|
|
local var_ok, var = child_session:request('nvim_get_var', 'evs')
|
|
ok(var_ok)
|
|
eq({}, var)
|
|
|
|
local child_screen = Screen.new(40, 6)
|
|
child_screen:attach(nil, child_session)
|
|
child_screen:expect{grid=[[
|
|
^ |
|
|
{1:~ }|*3
|
|
{2:[No Name] 0,0-1 All}|
|
|
|
|
|
]], attr_ids={
|
|
[1] = {foreground = Screen.colors.Blue, bold = true};
|
|
[2] = {reverse = true, bold = true};
|
|
}}
|
|
|
|
-- VimEnter and UIEnter should now be triggered
|
|
var_ok, var = child_session:request('nvim_get_var', 'evs')
|
|
ok(var_ok)
|
|
eq({'VimEnter', ('UIEnter:%d'):format(api_info[1])}, var)
|
|
end)
|
|
end)
|