mirror of
https://github.com/neovim/neovim.git
synced 2025-09-06 03:18:16 +00:00

Problem: Default color scheme is suboptimal. Solution: Start using new color scheme. Introduce new `vim` color scheme for opt-in backward compatibility. ------ Main design ideas - Be "Neovim branded". - Be minimal for 256 colors with a bit more shades for true colors. - Be accessible through high enough contrast ratios. - Be suitable for dark and light backgrounds via exchange of dark and light palettes. ------ Palettes - Have dark and light variants. Implemented through exporeted `NvimDark*` and `NvimLight*` hex colors. - Palettes have 4 shades of grey for UI elements and 6 colors (red, yellow, green, cyan, blue, magenta). - Actual values are computed procedurally in Oklch color space based on a handful of hyperparameters. - Each color has a 256 colors variant with perceptually closest color. ------ Highlight groups Use: - Grey shades for general UI according to their design. - Bold text for keywords (`Statement` highlight group). This is an important choice to increase accessibility for people with color deficiencies, as it doesn't rely on actual color. - Green for strings, `DiffAdd` (as background), `DiagnosticOk`, and some minor text UI elements. - Cyan as main syntax color, i.e. for function usage (`Function` highlight group), `DiffText`, `DiagnosticInfo`, and some minor text UI elements. - Red to generally mean high user attention, i.e. errors; in particular for `ErrorMsg`, `DiffDelete`, `DiagnosticError`. - Yellow very sparingly only with true colors to mean mild user attention, i.e. warnings. That is, `DiagnosticWarn` and `WarningMsg`. - Blue very sparingly only with true colors as `DiagnosticHint` and some additional important syntax group (like `Identifier`). - Magenta very carefully (if at all). ------ Notes - To make tests work without relatively larege updates, each one is prepended with an equivalent of the call `:colorscheme vim`. Plus some tests which spawn new Neovim instances also now use 'vim' color scheme. In some cases tests are updated to fit new default color scheme.
194 lines
7.7 KiB
Lua
194 lines
7.7 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};
|
|
[9] = {foreground = Screen.colors.NvimLightGrey3, background = Screen.colors.NvimDarkGrey1};
|
|
[10] = {foreground = Screen.colors.NvimLightRed};
|
|
[11] = {foreground = Screen.colors.NvimLightCyan};
|
|
})
|
|
end
|
|
|
|
it('can display errors', function()
|
|
startup('--cmd', 'echoerr invalid+')
|
|
screen:expect([[
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{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:~ }|
|
|
{3:~ }|
|
|
{3:~ }|
|
|
{3:~ }|
|
|
{3:~ }|
|
|
{3:~ }|
|
|
|
|
|
]])
|
|
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([[
|
|
|
|
|
|
|
|
|
|
|
{9: }|
|
|
{7:Error detected while processing pre-vimrc command line:} |
|
|
{7:foo} |
|
|
{10:bar} |
|
|
{11: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=[[
|
|
|
|
|
|
|
|
|
|
|
{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:~ }|
|
|
{1:~ }|
|
|
{1:~ }|
|
|
{1:~ }|
|
|
{1:~ }|
|
|
|
|
|
]]}
|
|
|
|
-- stdin (rpc input) still works
|
|
feed 'o'
|
|
screen:expect{grid=[[
|
|
hello nvim |
|
|
^ |
|
|
from external input |
|
|
{1:~ }|
|
|
{1:~ }|
|
|
{1:~ }|
|
|
{1:~ }|
|
|
{2:-- INSERT --} |
|
|
]]}
|
|
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:~ }|
|
|
{1:~ }|
|
|
{1:~ }|
|
|
{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)
|