mirror of
https://github.com/neovim/neovim.git
synced 2026-04-25 00:35:36 +00:00
Update migrated test after patch recent patches in master.
The following upstream patches that modified the original test have reached master: 7.4.798, 7.4.818, 7.4.883, 7.4.977. The changes are incorporated into the migrated test. Also improve readability and some string delimiters.
This commit is contained in:
Lucas Hoffmann
@@ -1,15 +1,15 @@
|
||||
-- Test for linebreak and list option (non-utf8)
|
||||
|
||||
local helpers = require('test.functional.helpers')
|
||||
local feed, insert = helpers.feed, helpers.insert
|
||||
local feed, insert, source = helpers.feed, helpers.insert, helpers.source
|
||||
local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
|
||||
|
||||
describe('listlbr', function()
|
||||
setup(clear)
|
||||
|
||||
it('is working', function()
|
||||
insert([=[
|
||||
dummy text]=])
|
||||
insert([[
|
||||
dummy text]])
|
||||
|
||||
execute('set wildchar=^E')
|
||||
execute('10new')
|
||||
@@ -18,36 +18,41 @@ describe('listlbr', function()
|
||||
execute([[put =\"\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP \"]])
|
||||
execute('norm! zt')
|
||||
execute('set ts=4 sw=4 sts=4 linebreak sbr=+ wrap')
|
||||
execute('fu! ScreenChar(width)')
|
||||
execute([[ let c='']])
|
||||
execute(' for j in range(1,4)')
|
||||
execute(' for i in range(1,a:width)')
|
||||
execute(' let c.=nr2char(screenchar(j, i))')
|
||||
execute(' endfor')
|
||||
execute([[ let c.="\n"]])
|
||||
execute(' endfor')
|
||||
execute(' return c')
|
||||
execute('endfu')
|
||||
execute('fu! DoRecordScreen()')
|
||||
execute(' wincmd l')
|
||||
execute([[ $put =printf(\"\n%s\", g:test)]])
|
||||
execute(' $put =g:line')
|
||||
execute(' wincmd p')
|
||||
execute('endfu')
|
||||
source([[
|
||||
fu! ScreenChar(width)
|
||||
let c=''
|
||||
for j in range(1,4)
|
||||
for i in range(1,a:width)
|
||||
let c.=nr2char(screenchar(j, i))
|
||||
endfor
|
||||
let c.="\n"
|
||||
endfor
|
||||
return c
|
||||
endfu
|
||||
fu! DoRecordScreen()
|
||||
wincmd l
|
||||
$put =printf(\"\n%s\", g:test)
|
||||
$put =g:line
|
||||
wincmd p
|
||||
endfu
|
||||
]])
|
||||
execute('let g:test="Test 1: set linebreak"')
|
||||
execute('redraw!')
|
||||
execute('let line=ScreenChar(winwidth(0))')
|
||||
execute('call DoRecordScreen()')
|
||||
|
||||
execute('let g:test="Test 2: set linebreak + set list"')
|
||||
execute('set linebreak list listchars=')
|
||||
execute('redraw!')
|
||||
execute('let line=ScreenChar(winwidth(0))')
|
||||
execute('call DoRecordScreen()')
|
||||
|
||||
execute('let g:test ="Test 3: set linebreak nolist"')
|
||||
execute('set nolist linebreak')
|
||||
execute('redraw!')
|
||||
execute('let line=ScreenChar(winwidth(0))')
|
||||
execute('call DoRecordScreen()')
|
||||
|
||||
execute('let g:test ="Test 4: set linebreak with tab and 1 line as long as screen: should break!"')
|
||||
execute('set nolist linebreak ts=8')
|
||||
execute([[let line="1\t".repeat('a', winwidth(0)-2)]])
|
||||
@@ -61,6 +66,7 @@ describe('listlbr', function()
|
||||
execute('$put =line')
|
||||
execute('$')
|
||||
execute('norm! zt')
|
||||
|
||||
execute('let g:test ="Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)"')
|
||||
execute('set cpo&vim list linebreak conceallevel=2 concealcursor=nv listchars=tab:ab')
|
||||
execute('syn match ConcealVar contained /_/ conceal')
|
||||
@@ -68,6 +74,7 @@ describe('listlbr', function()
|
||||
execute('let line=ScreenChar(winwidth(0))')
|
||||
execute('call DoRecordScreen()')
|
||||
execute('set cpo&vim linebreak')
|
||||
|
||||
execute('let g:test ="Test 6: set linebreak with visual block mode"')
|
||||
execute('let line="REMOVE: this not"')
|
||||
execute('$put =g:test')
|
||||
@@ -78,17 +85,50 @@ describe('listlbr', function()
|
||||
feed('0<C-V>jf x')
|
||||
execute('$put')
|
||||
execute('set cpo&vim linebreak')
|
||||
|
||||
execute('let g:test ="Test 7: set linebreak with visual block mode and v_b_A"')
|
||||
execute('$put =g:test')
|
||||
feed('Golong line: <esc>40afoobar <esc>aTARGET at end<esc>')
|
||||
execute([[exe "norm! $3B\<C-v>eAx\<Esc>"]])
|
||||
execute('set cpo&vim linebreak sbr=')
|
||||
|
||||
execute('let g:test ="Test 8: set linebreak with visual char mode and changing block"')
|
||||
execute('$put =g:test')
|
||||
feed('Go1111-1111-1111-11-1111-1111-1111<esc>0f-lv3lc2222<esc>bgj.')
|
||||
|
||||
execute('let g:test ="Test 9: using redo after block visual mode"')
|
||||
execute('$put =g:test')
|
||||
feed('Go<CR>')
|
||||
feed('aaa<CR>')
|
||||
feed('aaa<CR>')
|
||||
feed('a<ESC>2k<C-V>2j~e.<CR>')
|
||||
|
||||
execute('let g:test ="Test 10: using normal commands after block-visual"')
|
||||
execute('$put =g:test')
|
||||
execute('set linebreak')
|
||||
feed('Go<cr>')
|
||||
feed('abcd{ef<cr>')
|
||||
feed('ghijklm<cr>')
|
||||
feed('no}pqrs<esc>2k0f{<C-V><C-V>c%<esc>')
|
||||
|
||||
execute('let g:test ="Test 11: using block replace mode after wrapping"')
|
||||
execute('$put =g:test')
|
||||
execute('set linebreak wrap')
|
||||
feed('Go<esc>150aa<esc>yypk147|<C-V>jr0<cr>')
|
||||
|
||||
execute('let g:test ="Test 12: set linebreak list listchars=space:_,tab:>-,tail:-,eol:$"')
|
||||
execute('set list listchars=space:_,trail:-,tab:>-,eol:$')
|
||||
execute('$put =g:test')
|
||||
execute([[let line="a aaaaaaaaaaaaaaaaaaaaaa\ta "]])
|
||||
execute('$put =line')
|
||||
execute('$')
|
||||
execute('norm! zt')
|
||||
execute('redraw!')
|
||||
execute('let line=ScreenChar(winwidth(0))')
|
||||
execute('call DoRecordScreen()')
|
||||
|
||||
-- Assert buffer contents.
|
||||
expect([=[
|
||||
expect([[
|
||||
|
||||
abcdef hijklmn pqrstuvwxyz_1060ABCDEFGHIJKLMNOP
|
||||
|
||||
@@ -131,6 +171,25 @@ describe('listlbr', function()
|
||||
Test 7: set linebreak with visual block mode and v_b_A
|
||||
long line: foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar TARGETx at end
|
||||
Test 8: set linebreak with visual char mode and changing block
|
||||
1111-2222-1111-11-1111-2222-1111]=])
|
||||
1111-2222-1111-11-1111-2222-1111
|
||||
Test 9: using redo after block visual mode
|
||||
|
||||
AaA
|
||||
AaA
|
||||
A
|
||||
Test 10: using normal commands after block-visual
|
||||
|
||||
abcdpqrs
|
||||
Test 11: using block replace mode after wrapping
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0aaa
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0aaa
|
||||
Test 12: set linebreak list listchars=space:_,tab:>-,tail:-,eol:$
|
||||
a aaaaaaaaaaaaaaaaaaaaaa a
|
||||
|
||||
Test 12: set linebreak list listchars=space:_,tab:>-,tail:-,eol:$
|
||||
a_
|
||||
aaaaaaaaaaaaaaaaaaaa
|
||||
aa>-----a-$
|
||||
~ ]])
|
||||
end)
|
||||
end)
|
||||
|
||||
Reference in New Issue
Block a user