mirror of
https://github.com/neovim/neovim.git
synced 2025-09-25 04:28:33 +00:00
466c18b818
Problem: wrong cursor position with 'showbreak' and lcs-eol
Solution: Add size of 'showbreak' before when 'listchars' "eol" is used.
Also fix wrong cursor position with wrapping virtual text on
empty line and 'showbreak'.
closes: vim/vim#12891
1193951beb
54 lines
2.4 KiB
Lua
54 lines
2.4 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 &breakindent = v:true
|
|
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:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{2:-- INSERT --} |
|
|
]])
|
|
-- No line wraps, so changing 'showbreak' should lead to the same screen.
|
|
command('setlocal showbreak=+')
|
|
screen:expect_unchanged()
|
|
-- The first line now wraps because of "eol" in 'listchars'.
|
|
command('setlocal list')
|
|
screen:expect{grid=[[
|
|
{1: }xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxX|
|
|
{1: } {0:+^$} |
|
|
{1: }second line{0:$} |
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{2:-- INSERT --} |
|
|
]]}
|
|
end)
|
|
end)
|