mirror of
https://github.com/neovim/neovim.git
synced 2024-12-22 04:05:09 -07:00
296b8fbe3b
Problem: 'listchars' "exceeds" character appears in foldcolumn. Window
separator is missing. (Leonid V. Fedorenchik)
Solution: Only draw the "exceeds" character in the text area. Break the
loop when not drawing the text. (closes vim/vim#8524)
41fb723ee9
179 lines
6.7 KiB
Lua
179 lines
6.7 KiB
Lua
-- Tests for 'listchars' display with 'list' and :list.
|
|
|
|
local helpers = require('test.functional.helpers')(after_each)
|
|
local Screen = require('test.functional.ui.screen')
|
|
local feed, insert, exec = helpers.feed, helpers.insert, helpers.exec
|
|
local clear, feed_command, expect = helpers.clear, helpers.feed_command, helpers.expect
|
|
|
|
-- luacheck: ignore 621 (Indentation)
|
|
describe("'listchars'", function()
|
|
before_each(function()
|
|
clear()
|
|
feed_command('set listchars=eol:$')
|
|
end)
|
|
|
|
-- luacheck: ignore 613 (Trailing whitespace in a string)
|
|
it("works with 'list'", function()
|
|
exec([[
|
|
function GetScreenCharsForLine(lnum)
|
|
return join(map(range(1, virtcol('$')), 'nr2char(screenchar(a:lnum, v:val))'), '')
|
|
endfunction
|
|
nnoremap <expr> GG ":call add(g:lines, GetScreenCharsForLine(".screenrow()."))\<CR>"
|
|
]])
|
|
|
|
insert([[
|
|
start:
|
|
aa
|
|
bb
|
|
cccc
|
|
dd ee
|
|
]])
|
|
|
|
feed_command('let g:lines = []')
|
|
|
|
-- Set up 'listchars', switch on 'list', and use the "GG" mapping to record
|
|
-- what the buffer lines look like.
|
|
feed_command('set listchars+=tab:>-,space:.,trail:<')
|
|
feed_command('set list')
|
|
feed_command('/^start:/')
|
|
feed_command('normal! jzt')
|
|
feed('GG<cr>')
|
|
feed('GG<cr>')
|
|
feed('GG<cr>')
|
|
feed('GG<cr>')
|
|
feed('GGH')
|
|
|
|
-- Repeat without displaying "trail" spaces.
|
|
feed_command('set listchars-=trail:<')
|
|
feed('GG<cr>')
|
|
feed('GG<cr>')
|
|
feed('GG<cr>')
|
|
feed('GG<cr>')
|
|
feed('GG')
|
|
|
|
-- Delete the buffer contents and :put the collected lines.
|
|
feed_command('%d')
|
|
feed_command('put =g:lines', '1d')
|
|
|
|
-- Assert buffer contents.
|
|
expect([[
|
|
>-------aa>-----$
|
|
..bb>---<<$
|
|
...cccc><$
|
|
dd........ee<<>-$
|
|
<$
|
|
>-------aa>-----$
|
|
..bb>---..$
|
|
...cccc>.$
|
|
dd........ee..>-$
|
|
.$]])
|
|
end)
|
|
|
|
it('works with :list', function()
|
|
insert([[
|
|
start:
|
|
fff
|
|
gg
|
|
h
|
|
iii ]])
|
|
|
|
-- Set up 'listchars', switch 'list' *off* (:list must show the 'listchars'
|
|
-- even when 'list' is off), then run :list and collect the output.
|
|
feed_command('set listchars+=tab:>-,space:.,trail:<')
|
|
feed_command('set nolist')
|
|
feed_command('/^start:/')
|
|
feed_command('redir! => g:lines')
|
|
feed_command('+1,$list')
|
|
feed_command('redir END')
|
|
|
|
-- Delete the buffer contents and :put the collected lines.
|
|
feed_command('%d')
|
|
feed_command('put =g:lines', '1d')
|
|
|
|
-- Assert buffer contents.
|
|
expect([[
|
|
|
|
|
|
..fff>--<<$
|
|
>-------gg>-----$
|
|
.....h>-$
|
|
iii<<<<><<$]])
|
|
end)
|
|
|
|
it('"exceeds" character does not appear in foldcolumn vim-patch:8.2.3121', function()
|
|
local screen = Screen.new(60, 10)
|
|
screen:attach()
|
|
exec([[
|
|
call setline(1, ['aaa', '', 'a', 'aaaaaa'])
|
|
vsplit
|
|
vsplit
|
|
windo set signcolumn=yes foldcolumn=1 winminwidth=0 nowrap list listchars=extends:>,precedes:<
|
|
]])
|
|
feed('13<C-W>>')
|
|
screen:expect([[
|
|
aaa │ a>│ ^aaa |
|
|
│ │ |
|
|
a │ a │ a |
|
|
aaaaaa │ a>│ aaaaaa |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
[No Name] [+] <[+] [No Name] [+] |
|
|
|
|
|
]])
|
|
feed('<C-W>>')
|
|
screen:expect([[
|
|
aaa │ >│ ^aaa |
|
|
│ │ |
|
|
a │ a│ a |
|
|
aaaaaa │ >│ aaaaaa |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
[No Name] [+] <+] [No Name] [+] |
|
|
|
|
|
]])
|
|
feed('<C-W>>')
|
|
screen:expect([[
|
|
aaa │ │ ^aaa |
|
|
│ │ |
|
|
a │ │ a |
|
|
aaaaaa │ │ aaaaaa |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
[No Name] [+] <] [No Name] [+] |
|
|
|
|
|
]])
|
|
feed('<C-W>>')
|
|
screen:expect([[
|
|
aaa │ │ ^aaa |
|
|
│ │ |
|
|
a │ │ a |
|
|
aaaaaa │ │ aaaaaa |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
~ │~ │~ |
|
|
[No Name] [+] < [No Name] [+] |
|
|
|
|
|
]])
|
|
feed('<C-W>>')
|
|
screen:expect([[
|
|
aaa │ │ ^aaa |
|
|
│ │ |
|
|
a │ │ a |
|
|
aaaaaa │ │ aaaaaa |
|
|
~ │~│~ |
|
|
~ │~│~ |
|
|
~ │~│~ |
|
|
~ │~│~ |
|
|
[No Name] [+] < [No Name] [+] |
|
|
|
|
|
]])
|
|
end)
|
|
end)
|