averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'vim/master'

Browse Source
This commit is contained in:
Kazuki Sakamoto
2016-01-05 19:31:05 -08:00
parent 48288d29db 2795e21eaa
commit 565be0b5aa
4 changed files with 292 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/syntax.c
+10 -2
View File
@@ -3022,6 +3022,8 @@ find_endpos(idx, startpos, m_endpos, hl_endpos, flagsp, end_endpos,
if (r && regmatch.startpos[0].col
<= best_regmatch.startpos[0].col)
{
int line_len;
/* Add offset to skip pattern match */
syn_add_end_off(&pos, &regmatch, spp_skip, SPO_ME_OFF, 1);
@@ -3031,6 +3033,7 @@ find_endpos(idx, startpos, m_endpos, hl_endpos, flagsp, end_endpos,
break;
line = ml_get_buf(syn_buf, startpos->lnum, FALSE);
line_len = (int)STRLEN(line);
/* take care of an empty match or negative offset */
if (pos.col <= matchcol)
@@ -3040,12 +3043,12 @@ find_endpos(idx, startpos, m_endpos, hl_endpos, flagsp, end_endpos,
else
/* Be careful not to jump over the NUL at the end-of-line */
for (matchcol = regmatch.endpos[0].col;
line[matchcol] != NUL && matchcol < pos.col;
matchcol < line_len && matchcol < pos.col;
++matchcol)
;
/* if the skip pattern includes end-of-line, break here */
if (line[matchcol] == NUL)
if (matchcol >= line_len)
break;
continue; /* start with first end pattern again */
@@ -5830,6 +5833,11 @@ syn_cmd_sync(eap, syncing)
}
else if (STRCMP(key, "LINECONT") == 0)
{
if (*next_arg == NUL) /* missing pattern */
{
illegal = TRUE;
break;
}
if (curwin->w_s->b_syn_linecont_pat != NULL)
{
EMSG(_("E403: syntax sync: line continuations pattern specified twice"));
src/testdir/Make_all.mak
+1
View File
@@ -174,6 +174,7 @@ SCRIPTS_GUI = test16.out
# Keep test_alot.res as the last one, sort the others.
NEW_TESTS = test_assert.res \
test_cdo.res \
test_quickfix.res \
test_viml.res \
test_alot.res
src/testdir/test_quickfix.vim
+275
View File
@@ -0,0 +1,275 @@
" Test for the quickfix commands.
if !has('quickfix')
finish
endif
" Tests for the :clist and :llist commands
function XlistTests(cchar)
let Xlist = a:cchar . 'list'
let Xgetexpr = a:cchar . 'getexpr'
" With an empty list, command should return error
exe Xgetexpr . ' []'
exe 'silent! ' . Xlist
call assert_true(v:errmsg ==# 'E42: No Errors')
" Populate the list and then try
exe Xgetexpr . " ['non-error 1', 'Xtestfile1:1:3:Line1',
\ 'non-error 2', 'Xtestfile2:2:2:Line2',
\ 'non-error 3', 'Xtestfile3:3:1:Line3']"
" List only valid entries
redir => result
exe Xlist
redir END
let l = split(result, "\n")
call assert_equal([' 2 Xtestfile1:1 col 3: Line1',
\ ' 4 Xtestfile2:2 col 2: Line2',
\ ' 6 Xtestfile3:3 col 1: Line3'], l)
" List all the entries
redir => result
exe Xlist . "!"
redir END
let l = split(result, "\n")
call assert_equal([' 1: non-error 1', ' 2 Xtestfile1:1 col 3: Line1',
\ ' 3: non-error 2', ' 4 Xtestfile2:2 col 2: Line2',
\ ' 5: non-error 3', ' 6 Xtestfile3:3 col 1: Line3'], l)
" List a range of errors
redir => result
exe Xlist . " 3,6"
redir END
let l = split(result, "\n")
call assert_equal([' 4 Xtestfile2:2 col 2: Line2',
\ ' 6 Xtestfile3:3 col 1: Line3'], l)
redir => result
exe Xlist . "! 3,4"
redir END
let l = split(result, "\n")
call assert_equal([' 3: non-error 2', ' 4 Xtestfile2:2 col 2: Line2'], l)
redir => result
exe Xlist . " -6,-4"
redir END
let l = split(result, "\n")
call assert_equal([' 2 Xtestfile1:1 col 3: Line1'], l)
redir => result
exe Xlist . "! -5,-3"
redir END
let l = split(result, "\n")
call assert_equal([' 2 Xtestfile1:1 col 3: Line1',
\ ' 3: non-error 2', ' 4 Xtestfile2:2 col 2: Line2'], l)
endfunction
function Test_clist()
call XlistTests('c')
call XlistTests('l')
endfunction
" Tests for the :colder, :cnewer, :lolder and :lnewer commands
" Note that this test assumes that a quickfix/location list is
" already set by previous tests
function XageTests(cchar)
let Xolder = a:cchar . 'older'
let Xnewer = a:cchar . 'newer'
let Xgetexpr = a:cchar . 'getexpr'
if a:cchar == 'c'
let Xgetlist = 'getqflist()'
else
let Xgetlist = 'getloclist(0)'
endif
" Jumping to a non existent list should return error
exe 'silent! ' . Xolder . ' 99'
call assert_true(v:errmsg ==# 'E380: At bottom of quickfix stack')
exe 'silent! ' . Xnewer . ' 99'
call assert_true(v:errmsg ==# 'E381: At top of quickfix stack')
" Add three quickfix/location lists
exe Xgetexpr . " ['Xtestfile1:1:3:Line1']"
exe Xgetexpr . " ['Xtestfile2:2:2:Line2']"
exe Xgetexpr . " ['Xtestfile3:3:1:Line3']"
" Go back two lists
exe Xolder
exe 'let l = ' . Xgetlist
call assert_equal('Line2', l[0].text)
" Go forward two lists
exe Xnewer
exe 'let l = ' . Xgetlist
call assert_equal('Line3', l[0].text)
" Test for the optional count argument
exe Xolder . ' 2'
exe 'let l = ' . Xgetlist
call assert_equal('Line1', l[0].text)
exe Xnewer . ' 2'
exe 'let l = ' . Xgetlist
call assert_equal('Line3', l[0].text)
endfunction
function Test_cage()
call XageTests('c')
call XageTests('l')
endfunction
" Tests for the :cwindow, :lwindow :cclose, :lclose, :copen and :lopen
" commands
function XwindowTests(cchar)
let Xwindow = a:cchar . 'window'
let Xclose = a:cchar . 'close'
let Xopen = a:cchar . 'open'
let Xgetexpr = a:cchar . 'getexpr'
" Create a list with no valid entries
exe Xgetexpr . " ['non-error 1', 'non-error 2', 'non-error 3']"
" Quickfix/Location window should not open with no valid errors
exe Xwindow
call assert_true(winnr('$') == 1)
" Create a list with valid entries
exe Xgetexpr . " ['Xtestfile1:1:3:Line1', 'Xtestfile2:2:2:Line2',
\ 'Xtestfile3:3:1:Line3']"
" Open the window
exe Xwindow
call assert_true(winnr('$') == 2 && winnr() == 2 &&
\ getline('.') ==# 'Xtestfile1|1 col 3| Line1')
" Close the window
exe Xclose
call assert_true(winnr('$') == 1)
" Create a list with no valid entries
exe Xgetexpr . " ['non-error 1', 'non-error 2', 'non-error 3']"
" Open the window
exe Xopen . ' 5'
call assert_true(winnr('$') == 2 && getline('.') ==# '|| non-error 1'
\ && winheight('.') == 5)
" Opening the window again, should move the cursor to that window
wincmd t
exe Xopen . ' 7'
call assert_true(winnr('$') == 2 && winnr() == 2 &&
\ winheight('.') == 7 &&
\ getline('.') ==# '|| non-error 1')
" Calling cwindow should close the quickfix window with no valid errors
exe Xwindow
call assert_true(winnr('$') == 1)
endfunction
function Test_cwindow()
call XwindowTests('c')
call XwindowTests('l')
endfunction
" Tests for the :cfile, :lfile, :caddfile, :laddfile, :cgetfile and :lgetfile
" commands.
function XfileTests(cchar)
let Xfile = a:cchar . 'file'
let Xgetfile = a:cchar . 'getfile'
let Xaddfile = a:cchar . 'addfile'
if a:cchar == 'c'
let Xgetlist = 'getqflist()'
else
let Xgetlist = 'getloclist(0)'
endif
call writefile(['Xtestfile1:700:10:Line 700',
\ 'Xtestfile2:800:15:Line 800'], 'Xqftestfile1')
enew!
exe Xfile . ' Xqftestfile1'
exe 'let l = ' . Xgetlist
call assert_true(len(l) == 2 &&
\ l[0].lnum == 700 && l[0].col == 10 && l[0].text ==# 'Line 700' &&
\ l[1].lnum == 800 && l[1].col == 15 && l[1].text ==# 'Line 800')
" Run cfile/lfile from a modified buffer
enew!
silent! put ='Quickfix'
exe 'silent! ' . Xfile . ' Xqftestfile1'
call assert_true(v:errmsg ==# 'E37: No write since last change (add ! to override)')
call writefile(['Xtestfile3:900:30:Line 900'], 'Xqftestfile1')
exe Xaddfile . ' Xqftestfile1'
exe 'let l = ' . Xgetlist
call assert_true(len(l) == 3 &&
\ l[2].lnum == 900 && l[2].col == 30 && l[2].text ==# 'Line 900')
call writefile(['Xtestfile1:222:77:Line 222',
\ 'Xtestfile2:333:88:Line 333'], 'Xqftestfile1')
enew!
exe Xgetfile . ' Xqftestfile1'
exe 'let l = ' . Xgetlist
call assert_true(len(l) == 2 &&
\ l[0].lnum == 222 && l[0].col == 77 && l[0].text ==# 'Line 222' &&
\ l[1].lnum == 333 && l[1].col == 88 && l[1].text ==# 'Line 333')
call delete('Xqftestfile1')
endfunction
function Test_cfile()
call XfileTests('c')
call XfileTests('l')
endfunction
" Tests for the :cbuffer, :lbuffer, :caddbuffer, :laddbuffer, :cgetbuffer and
" :lgetbuffer commands.
function XbufferTests(cchar)
let Xbuffer = a:cchar . 'buffer'
let Xgetbuffer = a:cchar . 'getbuffer'
let Xaddbuffer = a:cchar . 'addbuffer'
if a:cchar == 'c'
let Xgetlist = 'getqflist()'
else
let Xgetlist = 'getloclist(0)'
endif
enew!
silent! call setline(1, ['Xtestfile7:700:10:Line 700',
\ 'Xtestfile8:800:15:Line 800'])
exe Xbuffer . "!"
exe 'let l = ' . Xgetlist
call assert_true(len(l) == 2 &&
\ l[0].lnum == 700 && l[0].col == 10 && l[0].text ==# 'Line 700' &&
\ l[1].lnum == 800 && l[1].col == 15 && l[1].text ==# 'Line 800')
enew!
silent! call setline(1, ['Xtestfile9:900:55:Line 900',
\ 'Xtestfile10:950:66:Line 950'])
exe Xgetbuffer
exe 'let l = ' . Xgetlist
call assert_true(len(l) == 2 &&
\ l[0].lnum == 900 && l[0].col == 55 && l[0].text ==# 'Line 900' &&
\ l[1].lnum == 950 && l[1].col == 66 && l[1].text ==# 'Line 950')
enew!
silent! call setline(1, ['Xtestfile11:700:20:Line 700',
\ 'Xtestfile12:750:25:Line 750'])
exe Xaddbuffer
exe 'let l = ' . Xgetlist
call assert_true(len(l) == 4 &&
\ l[1].lnum == 950 && l[1].col == 66 && l[1].text ==# 'Line 950' &&
\ l[2].lnum == 700 && l[2].col == 20 && l[2].text ==# 'Line 700' &&
\ l[3].lnum == 750 && l[3].col == 25 && l[3].text ==# 'Line 750')
endfunction
function Test_cbuffer()
call XbufferTests('c')
call XbufferTests('l')
endfunction
src/version.c
+6
View File
@@ -756,6 +756,12 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1054,
/**/
1053,
/**/
1052,
/**/
1051,
/**/