aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-06 21:53:38 -04:00
Code

patch 8.1.2421: test88 is old style

Browse Source 
Problem:    Test88 is old style.
Solution:   Turn into a new style test. (Yegappan Lakshmanan, closes #5347)
This commit is contained in:
Bram Moolenaar 2019-12-11 20:12:26 +01:00
parent 4954019c93
commit 213ed008bb
9 changed files with 107 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -2257,7 +2257,7 @@ test1 \
test52 test59 \
test64 test69 \
test70 test72 \
test86 test87 test88 \
test86 test87 \
test95 test99:
cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTESTTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)

1
src/testdir/Make_all.mak
View File

@ -18,7 +18,6 @@ SCRIPTS_ALL = \
test64.out \
test69.out \
test70.out \
test88.out \
test95.out \
test99.out \
test_eval.out

2
src/testdir/Make_vms.mms
View File

@ -76,7 +76,7 @@ VIMPROG = <->vim.exe
SCRIPT = test1.out \
test42.out test44.out test49.out \
test64.out test69.out \
test72.out test77a.out test88.out \
test72.out test77a.out \
test95.out test99.out \
test_eval.out

99
src/testdir/test88.in
View File

@ -1,99 +0,0 @@
vim: set ft=vim
Tests for correct display (cursor column position) with +conceal and
tabulators.
STARTTEST
:so small.vim
:if !has('conceal')
e! test.ok
wq! test.out
:endif
:" Conceal settings.
:set conceallevel=2
:set concealcursor=nc
:syntax match test /|/ conceal
:" Save current cursor position. Only works in <expr> mode, can't be used
:" with :normal because it moves the cursor to the command line. Thanks to ZyX
:" <zyx.vim@gmail.com> for the idea to use an <expr> mapping.
:let positions = []
:nnoremap <expr> GG ":let positions += ['".screenrow().":".screencol()."']\n"
:" Start test.
/^start:
:normal ztj
GGk
:" We should end up in the same column when running these commands on the two
:" lines.
:normal ft
GGk
:normal $
GGk
:normal 0j
GGk
:normal ft
GGk
:normal $
GGk
:normal 0j0j
GGk
:" Same for next test block.
:normal ft
GGk
:normal $
GGk
:normal 0j
GGk
:normal ft
GGk
:normal $
GGk
:normal 0j0j
GGk
:" And check W with multiple tabs and conceals in a line.
:normal W
GGk
:normal W
GGk
:normal W
GGk
:normal $
GGk
:normal 0j
GGk
:normal W
GGk
:normal W
GGk
:normal W
GGk
:normal $
GGk
:set lbr
:normal $
GGk
:set list listchars=tab:>-
:normal 0
GGk
:normal W
GGk
:normal W
GGk
:normal W
GGk
:normal $
GGk
:" Display result.
:call append('$', 'end:')
:call append('$', positions)
:/^end/,$wq! test.out
ENDTEST
start:
.concealed. text
|concealed| text
.concealed. text
|concealed| text
.a. .b. .c. .d.
|a| |b| |c| |d|

29
src/testdir/test88.ok
View File

@ -1,29 +0,0 @@
end:
2:1
2:17
2:20
3:1
3:17
3:20
5:8
5:25
5:28
6:8
6:25
6:28
8:1
8:9
8:17
8:25
8:27
9:1
9:9
9:17
9:25
9:26
9:26
9:1
9:9
9:17
9:25
9:26

102
src/testdir/test_conceal.vim
View File

@ -1,5 +1,4 @@
" Tests for 'conceal'.
" Also see test88.in (should be converted to a test function here).
source check.vim
CheckFeature conceal
@ -155,3 +154,104 @@ func Test_conceal_resize_term()
call StopVimInTerminal(buf)
call delete('XTest_conceal_resize')
endfunc
" Tests for correct display (cursor column position) with +conceal and
" tabulators. Need to run this test in a separate Vim instance. Otherwise the
" screen is not updated (lazy redraw) and the cursor position is wrong.
func Test_conceal_cursor_pos()
let code =<< trim [CODE]
:let l = ['start:', '.concealed. text', "|concealed|\ttext"]
:let l += ['', "\t.concealed.\ttext", "\t|concealed|\ttext", '']
:let l += [".a.\t.b.\t.c.\t.d.", "|a|\t|b|\t|c|\t|d|"]
:call append(0, l)
:call cursor(1, 1)
:" Conceal settings.
:set conceallevel=2
:set concealcursor=nc
:syntax match test /|/ conceal
:" Save current cursor position. Only works in <expr> mode, can't be used
:" with :normal because it moves the cursor to the command line. Thanks
:" to ZyX <zyx.vim@gmail.com> for the idea to use an <expr> mapping.
:let curpos = []
:nnoremap <expr> GG ":let curpos += ['".screenrow().":".screencol()."']\n"
:normal ztj
GGk
:" We should end up in the same column when running these commands on the
:" two lines.
:normal ft
GGk
:normal $
GGk
:normal 0j
GGk
:normal ft
GGk
:normal $
GGk
:normal 0j0j
GGk
:" Same for next test block.
:normal ft
GGk
:normal $
GGk
:normal 0j
GGk
:normal ft
GGk
:normal $
GGk
:normal 0j0j
GGk
:" And check W with multiple tabs and conceals in a line.
:normal W
GGk
:normal W
GGk
:normal W
GGk
:normal $
GGk
:normal 0j
GGk
:normal W
GGk
:normal W
GGk
:normal W
GGk
:normal $
GGk
:set lbr
:normal $
GGk
:set list listchars=tab:>-
:normal 0
GGk
:normal W
GGk
:normal W
GGk
:normal W
GGk
:normal $
GGk
:call writefile(curpos, 'Xconceal_curpos.out')
:q!
[CODE]
call writefile(code, 'XTest_conceal_curpos')
if RunVim([], [], '-s XTest_conceal_curpos')
call assert_equal([
\ '2:1', '2:17', '2:20', '3:1', '3:17', '3:20', '5:8', '5:25',
\ '5:28', '6:8', '6:25', '6:28', '8:1', '8:9', '8:17', '8:25',
\ '8:27', '9:1', '9:9', '9:17', '9:25', '9:26', '9:26', '9:1',
\ '9:9', '9:17', '9:25', '9:26'], readfile('Xconceal_curpos.out'))
endif
call delete('Xconceal_curpos.out')
call delete('XTest_conceal_curpos')
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
src/testdir/test_python2.vim
View File

@ -1,5 +1,5 @@
" Test for python 2 commands.
" TODO: move tests from test87.in here.
" TODO: move tests from test86.in here.
source check.vim
CheckFeature python

2
src/testdir/test_python3.vim
View File

@ -1,5 +1,5 @@
" Test for python 3 commands.
" TODO: move tests from test88.in here.
" TODO: move tests from test87.in here.
source check.vim
CheckFeature python3

2
src/version.c
View File

@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2421,
/**/
2420,
/**/