mirror of
https://github.com/neovim/neovim.git
synced 2024-12-26 14:11:15 -07:00
31b3c62845
Problem: Visual highlight hard to read with 'termguicolors'
(Maxim Kim)
Solution: Set Visual GUI foreground to black (with background=light)
and lightgrey (with background=dark)
(Maxim Kim)
fixes: vim/vim#14024
closes: vim/vim#14025
34e4a05d02
Co-authored-by: Maxim Kim <habamax@gmail.com>
117 lines
5.7 KiB
Lua
117 lines
5.7 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 exec = helpers.exec
|
|
local feed = helpers.feed
|
|
|
|
before_each(clear)
|
|
|
|
describe('breakindent', function()
|
|
-- oldtest: Test_cursor_position_with_showbreak()
|
|
it('cursor shown at correct position with showbreak', function()
|
|
local screen = Screen.new(75, 6)
|
|
screen:set_default_attr_ids({
|
|
[0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
|
|
[1] = { background = Screen.colors.Grey, foreground = Screen.colors.DarkBlue }, -- SignColumn
|
|
[2] = { bold = true }, -- ModeMsg
|
|
})
|
|
screen:attach()
|
|
exec([[
|
|
set listchars=eol:$
|
|
let &signcolumn = 'yes'
|
|
let &showbreak = '++'
|
|
let &breakindentopt = 'shift:2'
|
|
let leftcol = win_getid()->getwininfo()->get(0, {})->get('textoff')
|
|
eval repeat('x', &columns - leftcol - 1)->setline(1)
|
|
eval 'second line'->setline(2)
|
|
]])
|
|
|
|
feed('AX')
|
|
screen:expect([[
|
|
{1: }xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxX|
|
|
{1: }^second line |
|
|
{0:~ }|*3
|
|
{2:-- INSERT --} |
|
|
]])
|
|
-- No line wraps, so changing 'showbreak' should lead to the same screen.
|
|
command('setlocal showbreak=+')
|
|
screen:expect_unchanged()
|
|
-- No line wraps, so setting 'breakindent' should lead to the same screen.
|
|
command('setlocal breakindent')
|
|
screen:expect_unchanged()
|
|
-- The first line now wraps because of "eol" in 'listchars'.
|
|
command('setlocal list')
|
|
screen:expect([[
|
|
{1: }xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxX|
|
|
{1: } {0:+^$} |
|
|
{1: }second line{0:$} |
|
|
{0:~ }|*2
|
|
{2:-- INSERT --} |
|
|
]])
|
|
command('setlocal nobreakindent')
|
|
screen:expect([[
|
|
{1: }xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxX|
|
|
{1: }{0:+^$} |
|
|
{1: }second line{0:$} |
|
|
{0:~ }|*2
|
|
{2:-- INSERT --} |
|
|
]])
|
|
end)
|
|
|
|
-- oldtest: Test_visual_starts_before_skipcol()
|
|
it('Visual selection that starts before skipcol shows correctly', function()
|
|
local screen = Screen.new(75, 6)
|
|
exec([[
|
|
1new
|
|
setlocal breakindent
|
|
call setline(1, "\t" .. join(range(100)))
|
|
]])
|
|
screen:set_default_attr_ids({
|
|
[0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
|
|
[1] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
|
|
[2] = { bold = true, reverse = true }, -- StatusLine
|
|
[3] = { reverse = true }, -- StatusLineNC
|
|
[4] = { bold = true }, -- ModeMsg
|
|
})
|
|
screen:attach()
|
|
|
|
feed('v$')
|
|
screen:expect([[
|
|
{0:<<<} {1: 93 94 95 96 97 98 99}^ |
|
|
{2:[No Name] [+] }|
|
|
|
|
|
{0:~ }|
|
|
{3:[No Name] }|
|
|
{4:-- VISUAL --} |
|
|
]])
|
|
command('setlocal showbreak=+++')
|
|
screen:expect([[
|
|
{0:+++}{1: 90 91 92 93 94 95 96 97 98 99}^ |
|
|
{2:[No Name] [+] }|
|
|
|
|
|
{0:~ }|
|
|
{3:[No Name] }|
|
|
{4:-- VISUAL --} |
|
|
]])
|
|
command('setlocal breakindentopt+=sbr')
|
|
screen:expect([[
|
|
{0:+++} {1: 93 94 95 96 97 98 99}^ |
|
|
{2:[No Name] [+] }|
|
|
|
|
|
{0:~ }|
|
|
{3:[No Name] }|
|
|
{4:-- VISUAL --} |
|
|
]])
|
|
command('setlocal nobreakindent')
|
|
screen:expect([[
|
|
{0:+++}{1: 98 99}^ |
|
|
{2:[No Name] [+] }|
|
|
|
|
|
{0:~ }|
|
|
{3:[No Name] }|
|
|
{4:-- VISUAL --} |
|
|
]])
|
|
end)
|
|
end)
|