mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-06-07 15:37:14 +02:00
Merge remote-tracking branch 'vim/master'
This commit is contained in:
Kazuki Sakamoto
+2
-2
@@ -2089,8 +2089,6 @@ test1 \
|
||||
test_getcwd \
|
||||
test_insertcount \
|
||||
test_listchars \
|
||||
test_listlbr \
|
||||
test_listlbr_utf8 \
|
||||
test_search_mbyte \
|
||||
test_wordcount \
|
||||
test3 test4 test5 test6 test7 test8 test9 \
|
||||
@@ -2165,6 +2163,8 @@ test_arglist \
|
||||
test_langmap \
|
||||
test_largefile \
|
||||
test_lispwords \
|
||||
test_listlbr \
|
||||
test_listlbr_utf8 \
|
||||
test_lua \
|
||||
test_man \
|
||||
test_mapping \
|
||||
|
||||
+27
-19
@@ -1861,39 +1861,42 @@ channel_save(channel_T *channel, ch_part_T part, char_u *buf, int len,
|
||||
return OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* Try to fill the buffer of "reader".
|
||||
* Returns FALSE when nothing was added.
|
||||
*/
|
||||
static int
|
||||
channel_fill(js_read_T *reader)
|
||||
{
|
||||
channel_T *channel = (channel_T *)reader->js_cookie;
|
||||
ch_part_T part = reader->js_cookie_arg;
|
||||
char_u *next = channel_get(channel, part);
|
||||
int unused;
|
||||
int len;
|
||||
int keeplen;
|
||||
int addlen;
|
||||
char_u *p;
|
||||
|
||||
if (next == NULL)
|
||||
return FALSE;
|
||||
|
||||
unused = reader->js_end - reader->js_buf - reader->js_used;
|
||||
if (unused > 0)
|
||||
keeplen = reader->js_end - reader->js_buf;
|
||||
if (keeplen > 0)
|
||||
{
|
||||
/* Prepend unused text. */
|
||||
len = (int)STRLEN(next);
|
||||
p = alloc(unused + len + 1);
|
||||
addlen = (int)STRLEN(next);
|
||||
p = alloc(keeplen + addlen + 1);
|
||||
if (p == NULL)
|
||||
{
|
||||
vim_free(next);
|
||||
return FALSE;
|
||||
}
|
||||
mch_memmove(p, reader->js_buf + reader->js_used, unused);
|
||||
mch_memmove(p + unused, next, len + 1);
|
||||
mch_memmove(p, reader->js_buf, keeplen);
|
||||
mch_memmove(p + keeplen, next, addlen + 1);
|
||||
vim_free(next);
|
||||
next = p;
|
||||
}
|
||||
|
||||
vim_free(reader->js_buf);
|
||||
reader->js_buf = next;
|
||||
reader->js_used = 0;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -1973,16 +1976,20 @@ channel_parse_json(channel_T *channel, ch_part_T part)
|
||||
}
|
||||
|
||||
if (status == OK)
|
||||
chanpart->ch_waiting = FALSE;
|
||||
chanpart->ch_wait_len = 0;
|
||||
else if (status == MAYBE)
|
||||
{
|
||||
if (!chanpart->ch_waiting)
|
||||
size_t buflen = STRLEN(reader.js_buf);
|
||||
|
||||
if (chanpart->ch_wait_len < buflen)
|
||||
{
|
||||
/* First time encountering incomplete message, set a deadline of
|
||||
* 100 msec. */
|
||||
ch_log(channel, "Incomplete message - wait for more");
|
||||
/* First time encountering incomplete message or after receiving
|
||||
* more (but still incomplete): set a deadline of 100 msec. */
|
||||
ch_logn(channel,
|
||||
"Incomplete message (%d bytes) - wait 100 msec for more",
|
||||
buflen);
|
||||
reader.js_used = 0;
|
||||
chanpart->ch_waiting = TRUE;
|
||||
chanpart->ch_wait_len = buflen;
|
||||
#ifdef WIN32
|
||||
chanpart->ch_deadline = GetTickCount() + 100L;
|
||||
#else
|
||||
@@ -2013,7 +2020,8 @@ channel_parse_json(channel_T *channel, ch_part_T part)
|
||||
if (timeout)
|
||||
{
|
||||
status = FAIL;
|
||||
chanpart->ch_waiting = FALSE;
|
||||
chanpart->ch_wait_len = 0;
|
||||
ch_log(channel, "timed out");
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2027,7 +2035,7 @@ channel_parse_json(channel_T *channel, ch_part_T part)
|
||||
{
|
||||
ch_error(channel, "Decoding failed - discarding input");
|
||||
ret = FALSE;
|
||||
chanpart->ch_waiting = FALSE;
|
||||
chanpart->ch_wait_len = 0;
|
||||
}
|
||||
else if (reader.js_buf[reader.js_used] != NUL)
|
||||
{
|
||||
@@ -3394,7 +3402,7 @@ channel_read_json_block(
|
||||
/* Wait for up to the timeout. If there was an incomplete message
|
||||
* use the deadline for that. */
|
||||
timeout = timeout_arg;
|
||||
if (chanpart->ch_waiting)
|
||||
if (chanpart->ch_wait_len > 0)
|
||||
{
|
||||
#ifdef WIN32
|
||||
timeout = chanpart->ch_deadline - GetTickCount() + 1;
|
||||
@@ -3414,7 +3422,7 @@ channel_read_json_block(
|
||||
{
|
||||
/* Something went wrong, channel_parse_json() didn't
|
||||
* discard message. Cancel waiting. */
|
||||
chanpart->ch_waiting = FALSE;
|
||||
chanpart->ch_wait_len = 0;
|
||||
timeout = timeout_arg;
|
||||
}
|
||||
else if (timeout > timeout_arg)
|
||||
|
||||
+5
-3
@@ -1566,9 +1566,11 @@ typedef struct {
|
||||
jsonq_T ch_json_head; /* header for circular json read queue */
|
||||
int ch_block_id; /* ID that channel_read_json_block() is
|
||||
waiting for */
|
||||
/* When ch_waiting is TRUE use ch_deadline to wait for incomplete message
|
||||
* to be complete. */
|
||||
int ch_waiting;
|
||||
/* When ch_wait_len is non-zero use ch_deadline to wait for incomplete
|
||||
* message to be complete. The value is the length of the incomplete
|
||||
* message when the deadline was set. If it gets longer (something was
|
||||
* received) the deadline is reset. */
|
||||
size_t ch_wait_len;
|
||||
#ifdef WIN32
|
||||
DWORD ch_deadline;
|
||||
#else
|
||||
|
||||
@@ -82,7 +82,6 @@ SCRIPTS_ALL = \
|
||||
test_getcwd.out \
|
||||
test_insertcount.out \
|
||||
test_listchars.out \
|
||||
test_listlbr.out \
|
||||
test_search_mbyte.out \
|
||||
test_wordcount.out
|
||||
|
||||
@@ -101,8 +100,7 @@ SCRIPTS_MORE2 = \
|
||||
test12.out \
|
||||
test25.out \
|
||||
test49.out \
|
||||
test97.out \
|
||||
test_listlbr_utf8.out
|
||||
test97.out
|
||||
|
||||
|
||||
# Tests that run on most systems, but not MingW and Cygwin.
|
||||
@@ -164,6 +162,8 @@ NEW_TESTS = test_arglist.res \
|
||||
test_job_fails.res \
|
||||
test_json.res \
|
||||
test_langmap.res \
|
||||
test_listlbr.res \
|
||||
test_listlbr_utf8.res \
|
||||
test_lua.res \
|
||||
test_man.res \
|
||||
test_marks.res \
|
||||
|
||||
@@ -2,171 +2,209 @@
|
||||
"
|
||||
" Note: if you get strange failures when adding new tests, it might be that
|
||||
" while the test is run, the breakindent cacheing gets in its way.
|
||||
" It helps to change the tabastop setting and force a redraw (e.g. see
|
||||
" It helps to change the tabstop setting and force a redraw (e.g. see
|
||||
" Test_breakindent08())
|
||||
if !exists('+breakindent')
|
||||
finish
|
||||
endif
|
||||
|
||||
source view_util.vim
|
||||
|
||||
let s:input ="\tabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOP"
|
||||
|
||||
function s:screenline(lnum, width) abort
|
||||
" always get 4 screen lines
|
||||
redraw!
|
||||
let line = []
|
||||
for j in range(3)
|
||||
for c in range(1, a:width)
|
||||
call add(line, nr2char(screenchar(a:lnum+j, c)))
|
||||
endfor
|
||||
call add(line, "\n")
|
||||
endfor
|
||||
return join(line, '')
|
||||
function s:screen_lines(lnum, width) abort
|
||||
return ScreenLines([a:lnum, a:lnum + 2], a:width)
|
||||
endfunction
|
||||
|
||||
function s:testwindows(...)
|
||||
10new
|
||||
vsp
|
||||
vert resize 20
|
||||
setl ts=4 sw=4 sts=4 breakindent
|
||||
function! s:compare_lines(expect, actual)
|
||||
call assert_equal(join(a:expect, "\n"), join(a:actual, "\n"))
|
||||
endfunction
|
||||
|
||||
function s:test_windows(...)
|
||||
call NewWindow(10, 20)
|
||||
setl ts=4 sw=4 sts=4 breakindent
|
||||
put =s:input
|
||||
if a:0
|
||||
exe a:1
|
||||
endif
|
||||
exe get(a:000, 0, '')
|
||||
endfunction
|
||||
|
||||
function s:close_windows(...)
|
||||
bw!
|
||||
if a:0
|
||||
exe a:1
|
||||
endif
|
||||
unlet! g:line g:expect
|
||||
call CloseWindow()
|
||||
exe get(a:000, 0, '')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent01()
|
||||
" simple breakindent test
|
||||
call s:testwindows('setl briopt=min:0')
|
||||
let g:line=s:screenline(line('.'),8)
|
||||
let g:expect=" abcd\n qrst\n GHIJ\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl briopt=min:0')
|
||||
let lines=s:screen_lines(line('.'),8)
|
||||
let expect=[
|
||||
\ " abcd",
|
||||
\ " qrst",
|
||||
\ " GHIJ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunction
|
||||
|
||||
function Test_breakindent02()
|
||||
" simple breakindent test with showbreak set
|
||||
call s:testwindows('setl briopt=min:0 sbr=>>')
|
||||
let g:line=s:screenline(line('.'),8)
|
||||
let g:expect=" abcd\n >>qr\n >>EF\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl briopt=min:0 sbr=>>')
|
||||
let lines=s:screen_lines(line('.'),8)
|
||||
let expect=[
|
||||
\ " abcd",
|
||||
\ " >>qr",
|
||||
\ " >>EF",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows('set sbr=')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent03()
|
||||
" simple breakindent test with showbreak set and briopt including sbr
|
||||
call s:testwindows('setl briopt=sbr,min:0 sbr=++')
|
||||
let g:line=s:screenline(line('.'),8)
|
||||
let g:expect=" abcd\n++ qrst\n++ GHIJ\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl briopt=sbr,min:0 sbr=++')
|
||||
let lines=s:screen_lines(line('.'),8)
|
||||
let expect=[
|
||||
\ " abcd",
|
||||
\ "++ qrst",
|
||||
\ "++ GHIJ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
" clean up
|
||||
call s:close_windows('set sbr=')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent04()
|
||||
" breakindent set with min width 18
|
||||
call s:testwindows('setl sbr= briopt=min:18')
|
||||
let g:line=s:screenline(line('.'),8)
|
||||
let g:expect=" abcd\n qrstuv\n IJKLMN\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl sbr= briopt=min:18')
|
||||
let lines=s:screen_lines(line('.'),8)
|
||||
let expect=[
|
||||
\ " abcd",
|
||||
\ " qrstuv",
|
||||
\ " IJKLMN",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
" clean up
|
||||
call s:close_windows('set sbr=')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent05()
|
||||
" breakindent set and shift by 2
|
||||
call s:testwindows('setl briopt=shift:2,min:0')
|
||||
let g:line=s:screenline(line('.'),8)
|
||||
let g:expect=" abcd\n qr\n EF\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl briopt=shift:2,min:0')
|
||||
let lines=s:screen_lines(line('.'),8)
|
||||
let expect=[
|
||||
\ " abcd",
|
||||
\ " qr",
|
||||
\ " EF",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunction
|
||||
|
||||
function Test_breakindent06()
|
||||
" breakindent set and shift by -1
|
||||
call s:testwindows('setl briopt=shift:-1,min:0')
|
||||
let g:line=s:screenline(line('.'),8)
|
||||
let g:expect=" abcd\n qrstu\n HIJKL\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl briopt=shift:-1,min:0')
|
||||
let lines=s:screen_lines(line('.'),8)
|
||||
let expect=[
|
||||
\ " abcd",
|
||||
\ " qrstu",
|
||||
\ " HIJKL",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunction
|
||||
|
||||
function Test_breakindent07()
|
||||
" breakindent set and shift by 1, Number set sbr=? and briopt:sbr
|
||||
call s:testwindows('setl briopt=shift:1,sbr,min:0 nu sbr=? nuw=4 cpo+=n')
|
||||
let g:line=s:screenline(line('.'),10)
|
||||
let g:expect=" 2 ab\n? m\n? x\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl briopt=shift:1,sbr,min:0 nu sbr=? nuw=4 cpo+=n')
|
||||
let lines=s:screen_lines(line('.'),10)
|
||||
let expect=[
|
||||
\ " 2 ab",
|
||||
\ "? m",
|
||||
\ "? x",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
" clean up
|
||||
call s:close_windows('set sbr= cpo-=n')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent07a()
|
||||
" breakindent set and shift by 1, Number set sbr=? and briopt:sbr
|
||||
call s:testwindows('setl briopt=shift:1,sbr,min:0 nu sbr=? nuw=4')
|
||||
let g:line=s:screenline(line('.'),10)
|
||||
let g:expect=" 2 ab\n ? m\n ? x\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl briopt=shift:1,sbr,min:0 nu sbr=? nuw=4')
|
||||
let lines=s:screen_lines(line('.'),10)
|
||||
let expect=[
|
||||
\ " 2 ab",
|
||||
\ " ? m",
|
||||
\ " ? x",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
" clean up
|
||||
call s:close_windows('set sbr=')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent08()
|
||||
" breakindent set and shift by 1, Number and list set sbr=# and briopt:sbr
|
||||
call s:testwindows('setl briopt=shift:1,sbr,min:0 nu nuw=4 sbr=# list cpo+=n ts=4')
|
||||
call s:test_windows('setl briopt=shift:1,sbr,min:0 nu nuw=4 sbr=# list cpo+=n ts=4')
|
||||
" make sure, cache is invalidated!
|
||||
set ts=8
|
||||
redraw!
|
||||
set ts=4
|
||||
redraw!
|
||||
let g:line=s:screenline(line('.'),10)
|
||||
let g:expect=" 2 ^Iabcd\n# opq\n# BCD\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
let lines=s:screen_lines(line('.'),10)
|
||||
let expect=[
|
||||
\ " 2 ^Iabcd",
|
||||
\ "# opq",
|
||||
\ "# BCD",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows('set sbr= cpo-=n')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent08a()
|
||||
" breakindent set and shift by 1, Number and list set sbr=# and briopt:sbr
|
||||
call s:testwindows('setl briopt=shift:1,sbr,min:0 nu nuw=4 sbr=# list')
|
||||
let g:line=s:screenline(line('.'),10)
|
||||
let g:expect=" 2 ^Iabcd\n # opq\n # BCD\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl briopt=shift:1,sbr,min:0 nu nuw=4 sbr=# list')
|
||||
let lines=s:screen_lines(line('.'),10)
|
||||
let expect=[
|
||||
\ " 2 ^Iabcd",
|
||||
\ " # opq",
|
||||
\ " # BCD",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows('set sbr=')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent09()
|
||||
" breakindent set and shift by 1, Number and list set sbr=#
|
||||
call s:testwindows('setl briopt=shift:1,min:0 nu nuw=4 sbr=# list')
|
||||
let g:line=s:screenline(line('.'),10)
|
||||
let g:expect=" 2 ^Iabcd\n #op\n #AB\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl briopt=shift:1,min:0 nu nuw=4 sbr=# list')
|
||||
let lines=s:screen_lines(line('.'),10)
|
||||
let expect=[
|
||||
\ " 2 ^Iabcd",
|
||||
\ " #op",
|
||||
\ " #AB",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows('set sbr=')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent10()
|
||||
" breakindent set, Number set sbr=~
|
||||
call s:testwindows('setl cpo+=n sbr=~ nu nuw=4 nolist briopt=sbr,min:0')
|
||||
call s:test_windows('setl cpo+=n sbr=~ nu nuw=4 nolist briopt=sbr,min:0')
|
||||
" make sure, cache is invalidated!
|
||||
set ts=8
|
||||
redraw!
|
||||
set ts=4
|
||||
redraw!
|
||||
let g:line=s:screenline(line('.'),10)
|
||||
let g:expect=" 2 ab\n~ mn\n~ yz\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
let lines=s:screen_lines(line('.'),10)
|
||||
let expect=[
|
||||
\ " 2 ab",
|
||||
\ "~ mn",
|
||||
\ "~ yz",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows('set sbr= cpo-=n')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent11()
|
||||
" test strdisplaywidth()
|
||||
call s:testwindows('setl cpo-=n sbr=>> nu nuw=4 nolist briopt= ts=4')
|
||||
call s:test_windows('setl cpo-=n sbr=>> nu nuw=4 nolist briopt= ts=4')
|
||||
let text=getline(2)
|
||||
let width = strlen(text[1:])+indent(2)+strlen(&sbr)*3 " text wraps 3 times
|
||||
call assert_equal(width, strdisplaywidth(text))
|
||||
@@ -176,16 +214,20 @@ endfunction
|
||||
function Test_breakindent12()
|
||||
" test breakindent with long indent
|
||||
let s:input="\t\t\t\t\t{"
|
||||
call s:testwindows('setl breakindent linebreak briopt=min:10 nu numberwidth=3 ts=4 list listchars=tab:>-')
|
||||
let g:line=s:screenline(2,16)
|
||||
let g:expect=" 2 >--->--->--->\n ---{ \n~ \n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
call s:test_windows('setl breakindent linebreak briopt=min:10 nu numberwidth=3 ts=4 list listchars=tab:>-')
|
||||
let lines=s:screen_lines(2,16)
|
||||
let expect=[
|
||||
\ " 2 >--->--->--->",
|
||||
\ " ---{ ",
|
||||
\ "~ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows('set nuw=4 listchars=')
|
||||
endfunction
|
||||
|
||||
function Test_breakindent13()
|
||||
let s:input=""
|
||||
call s:testwindows('setl breakindent briopt=min:10 ts=8')
|
||||
call s:test_windows('setl breakindent briopt=min:10 ts=8')
|
||||
vert resize 20
|
||||
call setline(1, [" a\tb\tc\td\te", " z y x w v"])
|
||||
1
|
||||
@@ -199,26 +241,34 @@ endfunction
|
||||
|
||||
function Test_breakindent14()
|
||||
let s:input=""
|
||||
call s:testwindows('setl breakindent briopt= ts=8')
|
||||
call s:test_windows('setl breakindent briopt= ts=8')
|
||||
vert resize 30
|
||||
norm! 3a1234567890
|
||||
norm! a abcde
|
||||
exec "norm! 0\<C-V>tex"
|
||||
let g:line=s:screenline(line('.'),8)
|
||||
let g:expect="e \n~ \n~ \n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
let lines=s:screen_lines(line('.'),8)
|
||||
let expect=[
|
||||
\ "e ",
|
||||
\ "~ ",
|
||||
\ "~ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunction
|
||||
|
||||
function Test_breakindent15()
|
||||
let s:input=""
|
||||
call s:testwindows('setl breakindent briopt= ts=8 sw=8')
|
||||
call s:test_windows('setl breakindent briopt= ts=8 sw=8')
|
||||
vert resize 30
|
||||
norm! 4a1234567890
|
||||
exe "normal! >>\<C-V>3f0x"
|
||||
let g:line=s:screenline(line('.'),20)
|
||||
let g:expect=" 1234567890 \n~ \n~ \n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
let lines=s:screen_lines(line('.'),20)
|
||||
let expect=[
|
||||
\ " 1234567890 ",
|
||||
\ "~ ",
|
||||
\ "~ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunction
|
||||
|
||||
@@ -226,16 +276,24 @@ function Test_breakindent16()
|
||||
" Check that overlong lines are indented correctly.
|
||||
" TODO: currently it does not fail even when the bug is not fixed.
|
||||
let s:input=""
|
||||
call s:testwindows('setl breakindent briopt=min:0 ts=4')
|
||||
call s:test_windows('setl breakindent briopt=min:0 ts=4')
|
||||
call setline(1, "\t".repeat("1234567890", 10))
|
||||
resize 6
|
||||
norm! 1gg$
|
||||
redraw!
|
||||
let g:line=s:screenline(1,10)
|
||||
let g:expect=" 123456\n 789012\n 345678\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
let g:line=s:screenline(4,10)
|
||||
let g:expect=" 901234\n 567890\n 123456\n"
|
||||
call assert_equal(g:expect, g:line)
|
||||
let lines=s:screen_lines(1,10)
|
||||
let expect=[
|
||||
\ " 123456",
|
||||
\ " 789012",
|
||||
\ " 345678",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
let lines=s:screen_lines(4,10)
|
||||
let expect=[
|
||||
\ " 901234",
|
||||
\ " 567890",
|
||||
\ " 123456",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunction
|
||||
|
||||
@@ -1141,7 +1141,11 @@ func Test_out_cb()
|
||||
|
||||
let dict = {'thisis': 'dict: '}
|
||||
func dict.outHandler(chan, msg) dict
|
||||
let g:Ch_outmsg = self.thisis . a:msg
|
||||
if type(a:msg) == v:t_string
|
||||
let g:Ch_outmsg = self.thisis . a:msg
|
||||
else
|
||||
let g:Ch_outobj = a:msg
|
||||
endif
|
||||
endfunc
|
||||
func dict.errHandler(chan, msg) dict
|
||||
let g:Ch_errmsg = self.thisis . a:msg
|
||||
@@ -1161,6 +1165,12 @@ func Test_out_cb()
|
||||
call assert_equal("dict: hello", g:Ch_outmsg)
|
||||
call WaitFor('g:Ch_errmsg != ""')
|
||||
call assert_equal("dict: there", g:Ch_errmsg)
|
||||
|
||||
" Receive a json object split in pieces
|
||||
unlet! g:Ch_outobj
|
||||
call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n")
|
||||
call WaitFor('exists("g:Ch_outobj")')
|
||||
call assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)
|
||||
finally
|
||||
call job_stop(job)
|
||||
endtry
|
||||
|
||||
@@ -29,6 +29,11 @@ if __name__ == "__main__":
|
||||
if typed.startswith("echo "):
|
||||
print(typed[5:-1])
|
||||
sys.stdout.flush()
|
||||
if typed.startswith("echosplit "):
|
||||
for part in typed[10:-1].split('|'):
|
||||
sys.stdout.write(part)
|
||||
sys.stdout.flush()
|
||||
time.sleep(0.05)
|
||||
if typed.startswith("double "):
|
||||
print(typed[7:-1] + "\nAND " + typed[7:-1])
|
||||
sys.stdout.flush()
|
||||
|
||||
@@ -330,4 +330,36 @@ func Test_cmdline_search_range()
|
||||
bwipe!
|
||||
endfunc
|
||||
|
||||
" Tests for getcmdline(), getcmdpos() and getcmdtype()
|
||||
func Check_cmdline(cmdtype)
|
||||
call assert_equal('MyCmd a', getcmdline())
|
||||
call assert_equal(8, getcmdpos())
|
||||
call assert_equal(a:cmdtype, getcmdtype())
|
||||
return ''
|
||||
endfunc
|
||||
|
||||
func Test_getcmdtype()
|
||||
call feedkeys(":MyCmd a\<C-R>=Check_cmdline(':')\<CR>\<Esc>", "xt")
|
||||
|
||||
let cmdtype = ''
|
||||
debuggreedy
|
||||
call feedkeys(":debug echo 'test'\<CR>", "t")
|
||||
call feedkeys("let cmdtype = \<C-R>=string(getcmdtype())\<CR>\<CR>", "t")
|
||||
call feedkeys("cont\<CR>", "xt")
|
||||
0debuggreedy
|
||||
call assert_equal('>', cmdtype)
|
||||
|
||||
call feedkeys("/MyCmd a\<C-R>=Check_cmdline('/')\<CR>\<Esc>", "xt")
|
||||
call feedkeys("?MyCmd a\<C-R>=Check_cmdline('?')\<CR>\<Esc>", "xt")
|
||||
|
||||
call feedkeys(":call input('Answer?')\<CR>", "t")
|
||||
call feedkeys("MyCmd a\<C-R>=Check_cmdline('@')\<CR>\<Esc>", "xt")
|
||||
|
||||
call feedkeys(":insert\<CR>MyCmd a\<C-R>=Check_cmdline('-')\<CR>\<Esc>", "xt")
|
||||
|
||||
cnoremap <expr> <F6> Check_cmdline('=')
|
||||
call feedkeys("a\<C-R>=MyCmd a\<F6>\<Esc>\<Esc>", "xt")
|
||||
cunmap <F6>
|
||||
endfunc
|
||||
|
||||
set cpo&
|
||||
|
||||
@@ -35,11 +35,48 @@ func Test_1_set_secure()
|
||||
call assert_equal(1, has('gui_running'))
|
||||
endfunc
|
||||
|
||||
func Test_getfontname_with_arg()
|
||||
if has('gui_athena') || has('gui_motif')
|
||||
" Invalid font name. The result should be an empty string.
|
||||
call assert_equal('', getfontname('notexist'))
|
||||
|
||||
" Valid font name. This is usually the real name of 7x13 by default.
|
||||
let l:fname = '-Misc-Fixed-Medium-R-Normal--13-120-75-75-C-70-ISO10646-1'
|
||||
call assert_equal(l:fname, getfontname(l:fname))
|
||||
|
||||
elseif has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3')
|
||||
" Invalid font name. The result should be the name plus the default size.
|
||||
call assert_equal('notexist 10', getfontname('notexist'))
|
||||
|
||||
" Valid font name. This is usually the real name of Monospace by default.
|
||||
let l:fname = 'Bitstream Vera Sans Mono 12'
|
||||
call assert_equal(l:fname, getfontname(l:fname))
|
||||
else
|
||||
throw "Skipped: Matched font name unpredictable to test on this GUI"
|
||||
endif
|
||||
endfunc
|
||||
|
||||
func Test_getfontname_without_arg()
|
||||
let l:fname = getfontname()
|
||||
if has('gui_kde')
|
||||
" 'expected' is the value specified by SetUp() above.
|
||||
call assert_equal('Courier 10 Pitch/8/-1/5/50/0/0/0/0/0', l:fname)
|
||||
elseif has('gui_athena') || has('gui_motif')
|
||||
" 'expected' is DFLT_FONT of gui_x11.c.
|
||||
call assert_equal('7x13', l:fname)
|
||||
elseif has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3')
|
||||
" 'expected' is DEFAULT_FONT of gui_gtk_x11.c.
|
||||
call assert_equal('Monospace 10', l:fname)
|
||||
else
|
||||
throw "Skipped: Default font name unpredictable to test on this GUI"
|
||||
endif
|
||||
endfunc
|
||||
|
||||
func Test_getwinpos()
|
||||
call assert_match('Window position: X \d\+, Y \d\+', execute('winpos'))
|
||||
call assert_true(getwinposx() >= 0)
|
||||
call assert_true(getwinposy() >= 0)
|
||||
endfunction
|
||||
endfunc
|
||||
|
||||
func Test_shell_command()
|
||||
new
|
||||
@@ -54,4 +91,4 @@ func Test_windowid_variable()
|
||||
else
|
||||
call assert_equal(0, v:windowid)
|
||||
endif
|
||||
endfunction
|
||||
endfunc
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
Test for linebreak and list option (non-utf8)
|
||||
|
||||
STARTTEST
|
||||
:so small.vim
|
||||
:if !exists("+linebreak") || !has("conceal") | e! test.ok | w! test.out | qa! | endif
|
||||
:10new|:vsp|:vert resize 20
|
||||
:put =\"\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP \"
|
||||
:norm! zt
|
||||
:set ts=4 sw=4 sts=4 linebreak sbr=+ wrap
|
||||
: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
|
||||
:"
|
||||
:let g:test="Test 1: set linebreak"
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0))
|
||||
:call DoRecordScreen()
|
||||
:"
|
||||
:let g:test="Test 2: set linebreak + set list"
|
||||
:set linebreak list listchars=
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0))
|
||||
:call DoRecordScreen()
|
||||
:"
|
||||
:let g:test ="Test 3: set linebreak nolist"
|
||||
:set nolist linebreak
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0))
|
||||
:call DoRecordScreen()
|
||||
:"
|
||||
:let g:test ="Test 4: set linebreak with tab and 1 line as long as screen: should break!"
|
||||
:set nolist linebreak ts=8
|
||||
:let line="1\t".repeat('a', winwidth(0)-2)
|
||||
:$put =line
|
||||
:$
|
||||
:norm! zt
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0))
|
||||
:call DoRecordScreen()
|
||||
:let line="_S_\t bla"
|
||||
:$put =line
|
||||
:$
|
||||
:norm! zt
|
||||
:"
|
||||
:let g:test ="Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)"
|
||||
:set cpo&vim list linebreak conceallevel=2 concealcursor=nv listchars=tab:ab
|
||||
:syn match ConcealVar contained /_/ conceal
|
||||
:syn match All /.*/ contains=ConcealVar
|
||||
:let line=ScreenChar(winwidth(0))
|
||||
:call DoRecordScreen()
|
||||
:set cpo&vim linebreak
|
||||
:"
|
||||
:let g:test ="Test 6: set linebreak with visual block mode"
|
||||
:let line="REMOVE: this not"
|
||||
:$put =g:test
|
||||
:$put =line
|
||||
:let line="REMOVE: aaaaaaaaaaaaa"
|
||||
:$put =line
|
||||
:1/^REMOVE:
|
||||
0jf x:$put
|
||||
:set cpo&vim linebreak
|
||||
:"
|
||||
:let g:test ="Test 7: set linebreak with visual block mode and v_b_A"
|
||||
:$put =g:test
|
||||
Golong line: 40afoobar aTARGET at end
|
||||
:exe "norm! $3B\<C-v>eAx\<Esc>"
|
||||
:set cpo&vim linebreak sbr=
|
||||
:"
|
||||
:let g:test ="Test 8: set linebreak with visual char mode and changing block"
|
||||
:$put =g:test
|
||||
Go1111-1111-1111-11-1111-1111-11110f-lv3lc2222bgj.
|
||||
:"
|
||||
:let g:test ="Test 9: using redo after block visual mode"
|
||||
:$put =g:test
|
||||
Go
|
||||
aaa
|
||||
aaa
|
||||
a2k2j~e.
|
||||
:"
|
||||
:let g:test ="Test 10: using normal commands after block-visual"
|
||||
:$put =g:test
|
||||
:set linebreak
|
||||
Go
|
||||
abcd{ef
|
||||
ghijklm
|
||||
no}pqrs2k0f{c%
|
||||
:"
|
||||
:let g:test ="Test 11: using block replace mode after wrapping"
|
||||
:$put =g:test
|
||||
:set linebreak wrap
|
||||
Go150aayypk147|jr0
|
||||
:"
|
||||
:let g:test ="Test 12: set linebreak list listchars=space:_,tab:>-,tail:-,eol:$"
|
||||
:set list listchars=space:_,trail:-,tab:>-,eol:$
|
||||
:$put =g:test
|
||||
:let line="a aaaaaaaaaaaaaaaaaaaaaa\ta "
|
||||
:$put =line
|
||||
:$
|
||||
:norm! zt
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0))
|
||||
:call DoRecordScreen()
|
||||
:%w! test.out
|
||||
:qa!
|
||||
ENDTEST
|
||||
dummy text
|
||||
@@ -1,62 +0,0 @@
|
||||
|
||||
abcdef hijklmn pqrstuvwxyz_1060ABCDEFGHIJKLMNOP
|
||||
|
||||
Test 1: set linebreak
|
||||
abcdef
|
||||
+hijklmn
|
||||
+pqrstuvwxyz_1060ABC
|
||||
+DEFGHIJKLMNOP
|
||||
|
||||
Test 2: set linebreak + set list
|
||||
^Iabcdef hijklmn^I
|
||||
+pqrstuvwxyz_1060ABC
|
||||
+DEFGHIJKLMNOP
|
||||
|
||||
|
||||
Test 3: set linebreak nolist
|
||||
abcdef
|
||||
+hijklmn
|
||||
+pqrstuvwxyz_1060ABC
|
||||
+DEFGHIJKLMNOP
|
||||
1 aaaaaaaaaaaaaaaaaa
|
||||
|
||||
Test 4: set linebreak with tab and 1 line as long as screen: should break!
|
||||
1
|
||||
+aaaaaaaaaaaaaaaaaa
|
||||
~
|
||||
~
|
||||
_S_ bla
|
||||
|
||||
Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)
|
||||
Sabbbbbb bla
|
||||
~
|
||||
~
|
||||
~
|
||||
Test 6: set linebreak with visual block mode
|
||||
this not
|
||||
aaaaaaaaaaaaa
|
||||
REMOVE:
|
||||
REMOVE:
|
||||
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
|
||||
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-$
|
||||
~
|
||||
@@ -0,0 +1,219 @@
|
||||
" Test for linebreak and list option (non-utf8)
|
||||
|
||||
set encoding=latin1
|
||||
scriptencoding latin1
|
||||
|
||||
if !exists("+linebreak") || !has("conceal")
|
||||
finish
|
||||
endif
|
||||
|
||||
source view_util.vim
|
||||
|
||||
function s:screen_lines(lnum, width) abort
|
||||
return ScreenLines(a:lnum, a:width)
|
||||
endfunction
|
||||
|
||||
function! s:compare_lines(expect, actual)
|
||||
call assert_equal(join(a:expect, "\n"), join(a:actual, "\n"))
|
||||
endfunction
|
||||
|
||||
function s:test_windows(...)
|
||||
call NewWindow(10, 20)
|
||||
setl ts=8 sw=4 sts=4 linebreak sbr= wrap
|
||||
exe get(a:000, 0, '')
|
||||
endfunction
|
||||
|
||||
function s:close_windows(...)
|
||||
call CloseWindow()
|
||||
exe get(a:000, 0, '')
|
||||
endfunction
|
||||
|
||||
func Test_set_linebreak()
|
||||
call s:test_windows('setl ts=4 sbr=+')
|
||||
call setline(1, "\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP ")
|
||||
let lines = s:screen_lines([1, 4], winwidth(0))
|
||||
let expect = [
|
||||
\ " abcdef ",
|
||||
\ "+hijklmn ",
|
||||
\ "+pqrstuvwxyz_1060ABC",
|
||||
\ "+DEFGHIJKLMNOP ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_linebreak_with_list()
|
||||
call s:test_windows('setl ts=4 sbr=+ list listchars=')
|
||||
call setline(1, "\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP ")
|
||||
let lines = s:screen_lines([1, 4], winwidth(0))
|
||||
let expect = [
|
||||
\ "^Iabcdef hijklmn^I ",
|
||||
\ "+pqrstuvwxyz_1060ABC",
|
||||
\ "+DEFGHIJKLMNOP ",
|
||||
\ "~ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_linebreak_with_nolist()
|
||||
call s:test_windows('setl ts=4 sbr=+ nolist')
|
||||
call setline(1, "\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP ")
|
||||
let lines = s:screen_lines([1, 4], winwidth(0))
|
||||
let expect = [
|
||||
\ " abcdef ",
|
||||
\ "+hijklmn ",
|
||||
\ "+pqrstuvwxyz_1060ABC",
|
||||
\ "+DEFGHIJKLMNOP ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_should_break()
|
||||
call s:test_windows('setl sbr=+ nolist')
|
||||
call setline(1, "1\t" . repeat('a', winwidth(0)-2))
|
||||
let lines = s:screen_lines([1, 4], winwidth(0))
|
||||
let expect = [
|
||||
\ "1 ",
|
||||
\ "+aaaaaaaaaaaaaaaaaa ",
|
||||
\ "~ ",
|
||||
\ "~ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_linebreak_with_conceal()
|
||||
call s:test_windows('setl cpo&vim sbr=+ list conceallevel=2 concealcursor=nv listchars=tab:ab')
|
||||
call setline(1, "_S_\t bla")
|
||||
syn match ConcealVar contained /_/ conceal
|
||||
syn match All /.*/ contains=ConcealVar
|
||||
let lines = s:screen_lines([1, 4], winwidth(0))
|
||||
let expect = [
|
||||
\ "Sabbbbbb bla ",
|
||||
\ "~ ",
|
||||
\ "~ ",
|
||||
\ "~ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_virtual_block()
|
||||
call s:test_windows('setl sbr=+')
|
||||
call setline(1, [
|
||||
\ "REMOVE: this not",
|
||||
\ "REMOVE: aaaaaaaaaaaaa",
|
||||
\ ])
|
||||
exe "norm! 1/^REMOVE:"
|
||||
exe "norm! 0\<C-V>jf x"
|
||||
$put
|
||||
let lines = s:screen_lines([1, 4], winwidth(0))
|
||||
let expect = [
|
||||
\ "this not ",
|
||||
\ "aaaaaaaaaaaaa ",
|
||||
\ "REMOVE: ",
|
||||
\ "REMOVE: ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_virtual_block_and_vbA()
|
||||
call s:test_windows()
|
||||
call setline(1, "long line: " . repeat("foobar ", 40) . "TARGET at end")
|
||||
exe "norm! $3B\<C-v>eAx\<Esc>"
|
||||
let lines = s:screen_lines([1, 10], winwidth(0))
|
||||
let expect = [
|
||||
\ "foobar foobar ",
|
||||
\ "foobar foobar ",
|
||||
\ "foobar foobar ",
|
||||
\ "foobar foobar ",
|
||||
\ "foobar foobar ",
|
||||
\ "foobar foobar ",
|
||||
\ "foobar foobar ",
|
||||
\ "foobar foobar ",
|
||||
\ "foobar foobar ",
|
||||
\ "foobar TARGETx at ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_virtual_char_and_block()
|
||||
call s:test_windows()
|
||||
call setline(1, "1111-1111-1111-11-1111-1111-1111")
|
||||
exe "norm! 0f-lv3lc2222\<Esc>bgj."
|
||||
let lines = s:screen_lines([1, 2], winwidth(0))
|
||||
let expect = [
|
||||
\ "1111-2222-1111-11- ",
|
||||
\ "1111-2222-1111 ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_undo_after_block_visual()
|
||||
call s:test_windows()
|
||||
call setline(1, ["aaa", "aaa", "a"])
|
||||
exe "norm! gg\<C-V>2j~e."
|
||||
let lines = s:screen_lines([1, 3], winwidth(0))
|
||||
let expect = [
|
||||
\ "AaA ",
|
||||
\ "AaA ",
|
||||
\ "A ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_norm_after_block_visual()
|
||||
call s:test_windows()
|
||||
call setline(1, ["abcd{ef", "ghijklm", "no}pgrs"])
|
||||
exe "norm! ggf{\<C-V>\<C-V>c%"
|
||||
let lines = s:screen_lines([1, 3], winwidth(0))
|
||||
let expect = [
|
||||
\ "abcdpgrs ",
|
||||
\ "~ ",
|
||||
\ "~ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_block_replace_after_wrapping()
|
||||
call s:test_windows()
|
||||
call setline(1, repeat("a", 150))
|
||||
exe "norm! 0yypk147|\<C-V>jr0"
|
||||
call assert_equal(repeat("a", 146) . "0aaa", getline(1))
|
||||
call assert_equal(repeat("a", 146) . "0aaa", getline(2))
|
||||
let lines = s:screen_lines([1, 10], winwidth(0))
|
||||
let expect = [
|
||||
\ "aaaaaaaaaaaaaaaaaaaa",
|
||||
\ "aaaaaaaaaaaaaaaaaaaa",
|
||||
\ "aaaaaaaaaaaaaaaaaaaa",
|
||||
\ "aaaaaaaaaaaaaaaaaaaa",
|
||||
\ "aaaaaaaaaaaaaaaaaaaa",
|
||||
\ "aaaaaaaaaaaaaaaaaaaa",
|
||||
\ "aaaaaaaaaaaaaaaaaaaa",
|
||||
\ "aaaaaa0aaa ",
|
||||
\ "@ ",
|
||||
\ "@ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_list_with_listchars()
|
||||
call s:test_windows('setl list listchars=space:_,trail:-,tab:>-,eol:$')
|
||||
call setline(1, "a aaaaaaaaaaaaaaaaaaaaaa\ta ")
|
||||
let lines = s:screen_lines([1, 3], winwidth(0))
|
||||
let expect = [
|
||||
\ "a_ ",
|
||||
\ "aaaaaaaaaaaaaaaaaaaa",
|
||||
\ "aa>-----a-$ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
@@ -1,134 +0,0 @@
|
||||
Test for linebreak and list option in utf-8 mode
|
||||
|
||||
STARTTEST
|
||||
:so small.vim
|
||||
:if !exists("+linebreak") || !has("conceal") || !has("signs") | e! test.ok | w! test.out | qa! | endif
|
||||
:so mbyte.vim
|
||||
:set encoding=utf8
|
||||
:if &enc !=? 'utf-8'|:e! test.ok|:w! test.out|qa!|endif
|
||||
:10new|:vsp|:vert resize 20
|
||||
:put =\"\tabcdef hijklmn\tpqrstuvwxyz\u00a01060ABCDEFGHIJKLMNOP \"
|
||||
:norm! zt
|
||||
:set ts=4 sw=4 sts=4 linebreak sbr=+ wrap
|
||||
:fu! ScreenChar(width, lines)
|
||||
: let c=''
|
||||
: for j in range(1,a:lines)
|
||||
: 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
|
||||
:"
|
||||
:let g:test ="Test 1: set linebreak + set list + fancy listchars"
|
||||
:exe "set linebreak list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6"
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0),4)
|
||||
:call DoRecordScreen()
|
||||
:"
|
||||
:let g:test ="Test 2: set nolinebreak list"
|
||||
:set list nolinebreak
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0),4)
|
||||
:call DoRecordScreen()
|
||||
:"
|
||||
:let g:test ="Test 3: set linebreak nolist"
|
||||
:$put =\"\t*mask = nil;\"
|
||||
:$
|
||||
:norm! zt
|
||||
:set nolist linebreak
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0),4)
|
||||
:call DoRecordScreen()
|
||||
:"
|
||||
:let g:test ="Test 4: set linebreak list listchars and concealing"
|
||||
:let c_defines=['#define ABCDE 1','#define ABCDEF 1','#define ABCDEFG 1','#define ABCDEFGH 1', '#define MSG_MODE_FILE 1','#define MSG_MODE_CONSOLE 2','#define MSG_MODE_FILE_AND_CONSOLE 3','#define MSG_MODE_FILE_THEN_CONSOLE 4']
|
||||
:call append('$', c_defines)
|
||||
:vert resize 40
|
||||
:$-7
|
||||
:norm! zt
|
||||
:set list linebreak listchars=tab:>- cole=1
|
||||
:syn match Conceal conceal cchar=>'AB\|MSG_MODE'
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0),7)
|
||||
:call DoRecordScreen()
|
||||
:"
|
||||
:let g:test ="Test 5: set linebreak list listchars and concealing part2"
|
||||
:let c_defines=['bbeeeeee ; some text']
|
||||
:call append('$', c_defines)
|
||||
:$
|
||||
:norm! zt
|
||||
:set nowrap ts=2 list linebreak listchars=tab:>- cole=2 concealcursor=n
|
||||
:syn clear
|
||||
:syn match meaning /;\s*\zs.*/
|
||||
:syn match hasword /^\x\{8}/ contains=word
|
||||
:syn match word /\<\x\{8}\>/ contains=beginword,endword contained
|
||||
:syn match beginword /\<\x\x/ contained conceal
|
||||
:syn match endword /\x\{6}\>/ contained
|
||||
:hi meaning guibg=blue
|
||||
:hi beginword guibg=green
|
||||
:hi endword guibg=red
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0),1)
|
||||
:call DoRecordScreen()
|
||||
:"
|
||||
:let g:test ="Test 6: Screenattributes for comment"
|
||||
:$put =g:test
|
||||
:call append('$', ' /* and some more */')
|
||||
:exe "set ft=c ts=7 linebreak list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6"
|
||||
:syntax on
|
||||
:hi SpecialKey term=underline ctermfg=red guifg=red
|
||||
:let attr=[]
|
||||
:nnoremap <expr> GG ":let attr += ['".screenattr(screenrow(),screencol())."']\n"
|
||||
:$
|
||||
:norm! zt0
|
||||
GGlGGlGGlGGlGGlGGlGGlGGlGGlGGl
|
||||
:call append('$', ['ScreenAttributes for test6:'])
|
||||
:if attr[0] != attr[1] && attr[1] != attr[3] && attr[3] != attr[5]
|
||||
: call append('$', "Attribut 0 and 1 and 3 and 5 are different!")
|
||||
:else
|
||||
: call append('$', "Not all attributes are different")
|
||||
:endif
|
||||
:set cpo&vim linebreak selection=exclusive
|
||||
:"
|
||||
:let g:test ="Test 8: set linebreak with visual block mode and v_b_A and selection=exclusive and multibyte char"
|
||||
:$put =g:test
|
||||
Golong line: 40afoobar aTARGETÃ' at end
|
||||
:exe "norm! $3B\<C-v>eAx\<Esc>"
|
||||
:"
|
||||
:let g:test ="Test 9: a multibyte sign and colorcolumn"
|
||||
:let attr=[]
|
||||
:let attr2=[]
|
||||
:$put =''
|
||||
:$put ='a b c'
|
||||
:$put ='a b c'
|
||||
:set list nolinebreak cc=3
|
||||
:sign define foo text=uff0b
|
||||
:sign place 1 name=foo line=50 buffer=2
|
||||
:norm! 2kztj
|
||||
:let line1=line('.')
|
||||
0GGlGGlGGlGGl
|
||||
:let line2=line('.')
|
||||
:let attr2=attr
|
||||
:let attr=[]
|
||||
0GGlGGlGGlGGl
|
||||
:redraw!
|
||||
:let line=ScreenChar(winwidth(0),3)
|
||||
:call DoRecordScreen()
|
||||
:" expected: attr[2] is different because of colorcolumn
|
||||
:if attr[0] != attr2[0] || attr[1] != attr2[1] || attr[2] != attr2[2]
|
||||
: call append('$', "Screen attributes are different!")
|
||||
:else
|
||||
: call append('$', "Screen attributes are the same!")
|
||||
:endif
|
||||
:%w! test.out
|
||||
:qa!
|
||||
ENDTEST
|
||||
dummy text
|
||||
@@ -1,57 +0,0 @@
|
||||
|
||||
abcdef hijklmn pqrstuvwxyz 1060ABCDEFGHIJKLMNOP
|
||||
|
||||
Test 1: set linebreak + set list + fancy listchars
|
||||
▕———abcdef
|
||||
+hijklmn▕———
|
||||
+pqrstuvwxyz␣1060ABC
|
||||
+DEFGHIJKLMNOPˑ¶
|
||||
|
||||
Test 2: set nolinebreak list
|
||||
▕———abcdef hijklmn▕—
|
||||
+pqrstuvwxyz␣1060ABC
|
||||
+DEFGHIJKLMNOPˑ¶
|
||||
¶
|
||||
*mask = nil;
|
||||
|
||||
Test 3: set linebreak nolist
|
||||
*mask = nil;
|
||||
~
|
||||
~
|
||||
~
|
||||
#define ABCDE 1
|
||||
#define ABCDEF 1
|
||||
#define ABCDEFG 1
|
||||
#define ABCDEFGH 1
|
||||
#define MSG_MODE_FILE 1
|
||||
#define MSG_MODE_CONSOLE 2
|
||||
#define MSG_MODE_FILE_AND_CONSOLE 3
|
||||
#define MSG_MODE_FILE_THEN_CONSOLE 4
|
||||
|
||||
Test 4: set linebreak list listchars and concealing
|
||||
#define ABCDE>-->---1
|
||||
#define >CDEF>-->---1
|
||||
#define >CDEFG>->---1
|
||||
#define >CDEFGH>----1
|
||||
#define >_FILE>--------->--->---1
|
||||
#define >_CONSOLE>---------->---2
|
||||
#define >_FILE_AND_CONSOLE>---------3
|
||||
bbeeeeee ; some text
|
||||
|
||||
Test 5: set linebreak list listchars and concealing part2
|
||||
eeeeee>--->-;>some text
|
||||
Test 6: Screenattributes for comment
|
||||
/* and some more */
|
||||
ScreenAttributes for test6:
|
||||
Attribut 0 and 1 and 3 and 5 are different!
|
||||
Test 8: set linebreak with visual block mode and v_b_A and selection=exclusive and multibyte char
|
||||
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 TARGETÃx' at end
|
||||
|
||||
a b c
|
||||
a b c
|
||||
|
||||
Test 9: a multibyte sign and colorcolumn
|
||||
¶
|
||||
＋a b c¶
|
||||
a b c¶
|
||||
Screen attributes are the same!
|
||||
@@ -0,0 +1,195 @@
|
||||
" Test for linebreak and list option in utf-8 mode
|
||||
|
||||
set encoding=utf-8
|
||||
scriptencoding utf-8
|
||||
|
||||
if !exists("+linebreak") || !has("conceal") || !has("signs")
|
||||
finish
|
||||
endif
|
||||
|
||||
source view_util.vim
|
||||
|
||||
function s:screen_lines(lnum, width) abort
|
||||
return ScreenLines(a:lnum, a:width)
|
||||
endfunction
|
||||
|
||||
function! s:compare_lines(expect, actual)
|
||||
call assert_equal(a:expect, a:actual)
|
||||
endfunction
|
||||
|
||||
function s:screen_attr(lnum, chars, ...) abort
|
||||
let line = getline(a:lnum)
|
||||
let attr = []
|
||||
let prefix = get(a:000, 0, 0)
|
||||
for i in range(a:chars[0], a:chars[1])
|
||||
let scol = strdisplaywidth(strcharpart(line, 0, i-1)) + 1
|
||||
let attr += [screenattr(a:lnum, scol + prefix)]
|
||||
endfor
|
||||
return attr
|
||||
endfunction
|
||||
|
||||
function s:test_windows(...)
|
||||
call NewWindow(10, 20)
|
||||
setl ts=4 sw=4 sts=4 linebreak sbr=+ wrap
|
||||
exe get(a:000, 0, '')
|
||||
endfunction
|
||||
|
||||
function s:close_windows(...)
|
||||
call CloseWindow()
|
||||
exe get(a:000, 0, '')
|
||||
endfunction
|
||||
|
||||
func Test_linebreak_with_fancy_listchars()
|
||||
call s:test_windows("setl list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6")
|
||||
call setline(1, "\tabcdef hijklmn\tpqrstuvwxyz\u00a01060ABCDEFGHIJKLMNOP ")
|
||||
redraw!
|
||||
let lines = s:screen_lines([1, 4], winwidth(0))
|
||||
let expect = [
|
||||
\ "▕———abcdef ",
|
||||
\ "+hijklmn▕——— ",
|
||||
\ "+pqrstuvwxyz␣1060ABC",
|
||||
\ "+DEFGHIJKLMNOPˑ¶ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_nolinebreak_with_list()
|
||||
call s:test_windows("setl nolinebreak list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6")
|
||||
call setline(1, "\tabcdef hijklmn\tpqrstuvwxyz\u00a01060ABCDEFGHIJKLMNOP ")
|
||||
redraw!
|
||||
let lines = s:screen_lines([1, 4], winwidth(0))
|
||||
let expect = [
|
||||
\ "▕———abcdef hijklmn▕—",
|
||||
\ "+pqrstuvwxyz␣1060ABC",
|
||||
\ "+DEFGHIJKLMNOPˑ¶ ",
|
||||
\ "~ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_linebreak_with_nolist()
|
||||
call s:test_windows('setl nolist')
|
||||
call setline(1, "\t*mask = nil;")
|
||||
redraw!
|
||||
let lines = s:screen_lines([1, 4], winwidth(0))
|
||||
let expect = [
|
||||
\ " *mask = nil; ",
|
||||
\ "~ ",
|
||||
\ "~ ",
|
||||
\ "~ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_list_and_concealing1()
|
||||
call s:test_windows('setl list listchars=tab:>- cole=1')
|
||||
call setline(1, [
|
||||
\ "#define ABCDE\t\t1",
|
||||
\ "#define ABCDEF\t\t1",
|
||||
\ "#define ABCDEFG\t\t1",
|
||||
\ "#define ABCDEFGH\t1",
|
||||
\ "#define MSG_MODE_FILE\t\t\t1",
|
||||
\ "#define MSG_MODE_CONSOLE\t\t2",
|
||||
\ "#define MSG_MODE_FILE_AND_CONSOLE\t3",
|
||||
\ "#define MSG_MODE_FILE_THEN_CONSOLE\t4",
|
||||
\ ])
|
||||
vert resize 40
|
||||
syn match Conceal conceal cchar=>'AB\|MSG_MODE'
|
||||
redraw!
|
||||
let lines = s:screen_lines([1, 7], winwidth(0))
|
||||
let expect = [
|
||||
\ "#define ABCDE>-->---1 ",
|
||||
\ "#define >CDEF>-->---1 ",
|
||||
\ "#define >CDEFG>->---1 ",
|
||||
\ "#define >CDEFGH>----1 ",
|
||||
\ "#define >_FILE>--------->--->---1 ",
|
||||
\ "#define >_CONSOLE>---------->---2 ",
|
||||
\ "#define >_FILE_AND_CONSOLE>---------3 ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_list_and_concealing2()
|
||||
call s:test_windows('setl nowrap ts=2 list listchars=tab:>- cole=2 concealcursor=n')
|
||||
call setline(1, "bbeeeeee\t\t;\tsome text")
|
||||
vert resize 40
|
||||
syn clear
|
||||
syn match meaning /;\s*\zs.*/
|
||||
syn match hasword /^\x\{8}/ contains=word
|
||||
syn match word /\<\x\{8}\>/ contains=beginword,endword contained
|
||||
syn match beginword /\<\x\x/ contained conceal
|
||||
syn match endword /\x\{6}\>/ contained
|
||||
hi meaning guibg=blue
|
||||
hi beginword guibg=green
|
||||
hi endword guibg=red
|
||||
redraw!
|
||||
let lines = s:screen_lines([1, 1], winwidth(0))
|
||||
let expect = [
|
||||
\ "eeeeee>--->-;>some text ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_screenattr_for_comment()
|
||||
call s:test_windows("setl ft=c ts=7 list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6")
|
||||
call setline(1, " /*\t\t and some more */")
|
||||
norm! gg0
|
||||
syntax on
|
||||
hi SpecialKey term=underline ctermfg=red guifg=red
|
||||
redraw!
|
||||
let line = getline(1)
|
||||
let attr = s:screen_attr(1, [1, 6])
|
||||
call assert_notequal(attr[0], attr[1])
|
||||
call assert_notequal(attr[1], attr[3])
|
||||
call assert_notequal(attr[3], attr[5])
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_visual_block_and_selection_exclusive()
|
||||
call s:test_windows('setl selection=exclusive')
|
||||
call setline(1, "long line: " . repeat("foobar ", 40) . "TARGETÃ' at end")
|
||||
exe "norm! $3B\<C-v>eAx\<Esc>"
|
||||
let lines = s:screen_lines([1, 10], winwidth(0))
|
||||
let expect = [
|
||||
\ "+foobar foobar ",
|
||||
\ "+foobar foobar ",
|
||||
\ "+foobar foobar ",
|
||||
\ "+foobar foobar ",
|
||||
\ "+foobar foobar ",
|
||||
\ "+foobar foobar ",
|
||||
\ "+foobar foobar ",
|
||||
\ "+foobar foobar ",
|
||||
\ "+foobar foobar ",
|
||||
\ "+foobar TARGETÃx' ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
|
||||
func Test_multibyte_sign_and_colorcolumn()
|
||||
call s:test_windows("setl nolinebreak cc=3 list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6")
|
||||
call setline(1, ["", "a b c", "a b c"])
|
||||
exe "sign define foo text=\uff0b"
|
||||
exe "sign place 1 name=foo line=2 buffer=" . bufnr('%')
|
||||
redraw!
|
||||
norm! ggj0
|
||||
let signwidth = strdisplaywidth("\uff0b")
|
||||
let attr1 = s:screen_attr(2, [1, 3], signwidth)
|
||||
let attr2 = s:screen_attr(3, [1, 3], signwidth)
|
||||
call assert_equal(attr1[0], attr2[0])
|
||||
call assert_equal(attr1[1], attr2[1])
|
||||
call assert_equal(attr1[2], attr2[2])
|
||||
let lines = s:screen_lines([1, 3], winwidth(0))
|
||||
let expect = [
|
||||
\ " ¶ ",
|
||||
\ "＋a b c¶ ",
|
||||
\ " a b c¶ ",
|
||||
\ ]
|
||||
call s:compare_lines(expect, lines)
|
||||
call s:close_windows()
|
||||
endfunc
|
||||
@@ -0,0 +1,30 @@
|
||||
" Functions about view shared by several tests
|
||||
|
||||
" ScreenLines(lnum, width) or
|
||||
" ScreenLines([start, end], width)
|
||||
function! ScreenLines(lnum, width) abort
|
||||
redraw!
|
||||
if type(a:lnum) == v:t_list
|
||||
let start = a:lnum[0]
|
||||
let end = a:lnum[1]
|
||||
else
|
||||
let start = a:lnum
|
||||
let end = a:lnum
|
||||
endif
|
||||
let lines = []
|
||||
for l in range(start, end)
|
||||
let lines += [join(map(range(1, a:width), 'nr2char(screenchar(l, v:val))'), '')]
|
||||
endfor
|
||||
return lines
|
||||
endfunction
|
||||
|
||||
function! NewWindow(height, width) abort
|
||||
exe a:height . 'new'
|
||||
exe a:width . 'vsp'
|
||||
redraw!
|
||||
endfunction
|
||||
|
||||
function! CloseWindow() abort
|
||||
bw!
|
||||
redraw!
|
||||
endfunction
|
||||
@@ -779,6 +779,14 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
314,
|
||||
/**/
|
||||
313,
|
||||
/**/
|
||||
312,
|
||||
/**/
|
||||
311,
|
||||
/**/
|
||||
310,
|
||||
/**/
|
||||
|
||||
Reference in New Issue
Block a user