thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1585: :let-heredoc does not trim enough

Browse Source 
Problem:    :let-heredoc does not trim enough.
Solution:   Trim indent from the contents based on the indent of the first
            line.  Use let-heredoc in more tests.
This commit is contained in:
Bram Moolenaar
2019-06-24 00:58:07 +02:00
parent 0a1f56fcfe
commit e7eb92708e
22 changed files with 754 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
runtime/doc/eval.txt
View File

@@ -11565,13 +11565,24 @@ text...
If {marker} is not supplied, then "." is used as the If {marker} is not supplied, then "." is used as the
default marker. default marker.
Any white space characters in the lines of text are Without "trim" any white space characters in the lines
preserved. If "trim" is specified before {marker}, of text are preserved. If "trim" is specified before
then all the leading indentation exactly matching the {marker}, then indentation is stripped so you can do: >
leading indentation before `let` is stripped from the let text =<< trim END
input lines and the line containing {marker}. Note if ok
that the difference between space and tab matters echo 'done'
here. endif
END
< Results in: ["if ok", " echo 'done'", "endif"]
The marker must line up with "let" and the indentation
of the first line is removed from all the text lines.
Specifically: all the leading indentation exactly
matching the leading indentation of the first
non-empty text line is stripped from the input lines.
All leading indentation exactly matching the leading
indentation before `let` is stripped from the line
containing {marker}. Note that the difference between
space and tab matters here.
If {var-name} didn't exist yet, it is created. If {var-name} didn't exist yet, it is created.
Cannot be followed by another command, but can be Cannot be followed by another command, but can be

51
src/eval.c
View File

@@ -1254,7 +1254,9 @@ heredoc_get(exarg_T *eap, char_u *cmd)
char_u *marker; char_u *marker;
list_T *l; list_T *l;
char_u *p; char_u *p;
int indent_len = 0; int marker_indent_len = 0;
int text_indent_len = 0;
char_u *text_indent = NULL;
if (eap->getline == NULL) if (eap->getline == NULL)
{ {
@@ -1268,15 +1270,17 @@ heredoc_get(exarg_T *eap, char_u *cmd)
{ {
cmd = skipwhite(cmd + 4); cmd = skipwhite(cmd + 4);
// Trim the indentation from all the lines in the here document // Trim the indentation from all the lines in the here document.
// The amount of indentation trimmed is the same as the indentation of // The amount of indentation trimmed is the same as the indentation of
// the :let command line. // the first line after the :let command line. To find the end marker
// the indent of the :let command line is trimmed.
p = *eap->cmdlinep; p = *eap->cmdlinep;
while (VIM_ISWHITE(*p)) while (VIM_ISWHITE(*p))
{ {
p++; p++;
indent_len++; marker_indent_len++;
} }
text_indent_len = -1;
} }
// The marker is the next word. Default marker is "." // The marker is the next word. Default marker is "."
@@ -1300,31 +1304,50 @@ heredoc_get(exarg_T *eap, char_u *cmd)
for (;;) for (;;)
{ {
int i = 0; int mi = 0;
int ti = 0;
theline = eap->getline(NUL, eap->cookie, 0); theline = eap->getline(NUL, eap->cookie, 0);
if (theline != NULL && indent_len > 0)
{
// trim the indent matching the first line
if (STRNCMP(theline, *eap->cmdlinep, indent_len) == 0)
i = indent_len;
}
if (theline == NULL) if (theline == NULL)
{ {
semsg(_("E990: Missing end marker '%s'"), marker); semsg(_("E990: Missing end marker '%s'"), marker);
break; break;
} }
if (STRCMP(marker, theline + i) == 0)
// with "trim": skip the indent matching the :let line to find the
// marker
if (marker_indent_len > 0
&& STRNCMP(theline, *eap->cmdlinep, marker_indent_len) == 0)
mi = marker_indent_len;
if (STRCMP(marker, theline + mi) == 0)
{ {
vim_free(theline); vim_free(theline);
break; break;
} }
if (list_append_string(l, theline + i, -1) == FAIL) if (text_indent_len == -1 && *theline != NUL)
{
// set the text indent from the first line.
p = theline;
text_indent_len = 0;
while (VIM_ISWHITE(*p))
{
p++;
text_indent_len++;
}
text_indent = vim_strnsave(theline, text_indent_len);
}
// with "trim": skip the indent matching the first line
if (text_indent != NULL)
for (ti = 0; ti < text_indent_len; ++ti)
if (theline[ti] != text_indent[ti])
break;
if (list_append_string(l, theline + ti, -1) == FAIL)
break; break;
vim_free(theline); vim_free(theline);
} }
vim_free(text_indent);
return l; return l;
} }

2
src/testdir/test_balloon.vim
View File

@@ -13,7 +13,7 @@ if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps' throw 'Skipped: cannot make screendumps'
endif endif
let s:common_script =<< [CODE] let s:common_script =<< trim [CODE]
call setline(1, ["one one one", "two tXo two", "three three three"]) call setline(1, ["one one one", "two tXo two", "three three three"])
set balloonevalterm balloonexpr=MyBalloonExpr() balloondelay=100 set balloonevalterm balloonexpr=MyBalloonExpr() balloondelay=100
func MyBalloonExpr() func MyBalloonExpr()

114
src/testdir/test_cindent.vim
View File

@@ -18,23 +18,23 @@ func Test_cino_extern_c()
" Test for cino-E " Test for cino-E
let without_ind =<< trim [CODE] let without_ind =<< trim [CODE]
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
int func_a(void); int func_a(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
[CODE] [CODE]
let with_ind =<< trim [CODE] let with_ind =<< trim [CODE]
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
int func_a(void); int func_a(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
[CODE] [CODE]
new new
setlocal cindent cinoptions=E0 setlocal cindent cinoptions=E0
@@ -89,30 +89,30 @@ func Test_cindent_expr()
endfunc endfunc
setl expandtab sw=8 indentkeys+=; indentexpr=MyIndentFunction() setl expandtab sw=8 indentkeys+=; indentexpr=MyIndentFunction()
let testinput =<< trim [CODE] let testinput =<< trim [CODE]
var_a = something() var_a = something()
b = something() b = something()
[CODE] [CODE]
call setline(1, testinput) call setline(1, testinput)
call cursor(1, 1) call cursor(1, 1)
call feedkeys("^\<c-v>j$A;\<esc>", 'tnix') call feedkeys("^\<c-v>j$A;\<esc>", 'tnix')
let expected =<< trim [CODE] let expected =<< [CODE]
var_a = something(); var_a = something();
b = something(); b = something();
[CODE] [CODE]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
%d %d
let testinput =<< trim [CODE] let testinput =<< [CODE]
var_a = something() var_a = something()
b = something() b = something()
[CODE] [CODE]
call setline(1, testinput) call setline(1, testinput)
call cursor(1, 1) call cursor(1, 1)
call feedkeys("^\<c-v>j$A;\<esc>", 'tnix') call feedkeys("^\<c-v>j$A;\<esc>", 'tnix')
let expected =<< trim [CODE] let expected =<< [CODE]
var_a = something(); var_a = something();
b = something() b = something()
[CODE] [CODE]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
bw! bw!
endfunc endfunc
@@ -2069,14 +2069,14 @@ func Test_cindent_2()
let &wm = &columns - 20 let &wm = &columns - 20
let code =<< trim [CODE] let code =<< trim [CODE]
{ {
/* this is /* this is
* a real serious important big * a real serious important big
* comment * comment
*/ */
/* insert " about life, the universe, and the rest" after "serious" */ /* insert " about life, the universe, and the rest" after "serious" */
} }
[CODE] [CODE]
call append(0, code) call append(0, code)
@@ -3243,32 +3243,32 @@ func Test_cindent_30()
setl cindent ts=4 sw=4 setl cindent ts=4 sw=4
setl cino=+20 setl cino=+20
let code =<< trim [CODE] let code =<< [CODE]
void void
foo() foo()
{ {
if (a) if (a)
{ {
} else } else
asdf; asdf;
} }
[CODE] [CODE]
call append(0, code) call append(0, code)
normal gg normal gg
normal ]]=][ normal ]]=][
let expected =<< trim [CODE] let expected =<< [CODE]
void void
foo() foo()
{ {
if (a) if (a)
{ {
} else } else
asdf; asdf;
} }
[CODE] [CODE]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
enew! | close enew! | close
@@ -3461,7 +3461,7 @@ func Test_cindent_34()
normal =][ normal =][
let expected =<< trim [CODE] let expected =<< trim [CODE]
void void
func(int a func(int a
#if defined(FOO) #if defined(FOO)

4
src/testdir/test_const.vim
View File

@@ -18,7 +18,7 @@ func Test_define_var_with_lock()
const n = v:null const n = v:null
const bl = 0zC0FFEE const bl = 0zC0FFEE
const here =<< trim EOS const here =<< trim EOS
hello hello
EOS EOS
call assert_true(exists('i')) call assert_true(exists('i'))
@@ -84,7 +84,7 @@ func Test_define_l_var_with_lock()
const l:n = v:null const l:n = v:null
const l:bl = 0zC0FFEE const l:bl = 0zC0FFEE
const l:here =<< trim EOS const l:here =<< trim EOS
hello hello
EOS EOS
call assert_fails('let l:i = 1', 'E741:') call assert_fails('let l:i = 1', 'E741:')

56
src/testdir/test_debugger.vim
View File

@@ -26,27 +26,29 @@ func Test_Debugger()
endif endif
" Create a Vim script with some functions " Create a Vim script with some functions
call writefile([ let lines =<< trim END
\ 'func Foo()', func Foo()
\ ' let var1 = 1', let var1 = 1
\ ' let var2 = Bar(var1) + 9', let var2 = Bar(var1) + 9
\ ' return var2', return var2
\ 'endfunc', endfunc
\ 'func Bar(var)', func Bar(var)
\ ' let var1 = 2 + a:var', let var1 = 2 + a:var
\ ' let var2 = Bazz(var1) + 4', let var2 = Bazz(var1) + 4
\ ' return var2', return var2
\ 'endfunc', endfunc
\ 'func Bazz(var)', func Bazz(var)
\ ' try', try
\ ' let var1 = 3 + a:var', let var1 = 3 + a:var
\ ' let var3 = "another var"', let var3 = "another var"
\ ' let var3 = "value2"', let var3 = "value2"
\ ' catch', catch
\ ' let var4 = "exception"', let var4 = "exception"
\ ' endtry', endtry
\ ' return var1', return var1
\ 'endfunc'], 'Xtest.vim') endfunc
END
call writefile(lines, 'Xtest.vim')
" Start Vim in a terminal " Start Vim in a terminal
let buf = RunVimInTerminal('-S Xtest.vim', {}) let buf = RunVimInTerminal('-S Xtest.vim', {})
@@ -294,11 +296,13 @@ func Test_Debugger()
" Tests for :breakadd file and :breakadd here " Tests for :breakadd file and :breakadd here
" Breakpoints should be set before sourcing the file " Breakpoints should be set before sourcing the file
call writefile([ let lines =<< trim END
\ 'let var1 = 10', let var1 = 10
\ 'let var2 = 20', let var2 = 20
\ 'let var3 = 30', let var3 = 30
\ 'let var4 = 40'], 'Xtest.vim') let var4 = 40
END
call writefile(lines, 'Xtest.vim')
" Start Vim in a terminal " Start Vim in a terminal
let buf = RunVimInTerminal('Xtest.vim', {}) let buf = RunVimInTerminal('Xtest.vim', {})

15
src/testdir/test_functions.vim
View File

@@ -277,13 +277,14 @@ func Test_resolve_win32()
if executable('cscript') if executable('cscript')
new Xfile new Xfile
wq wq
call writefile([ let lines =<< trim END
\ 'Set fs = CreateObject("Scripting.FileSystemObject")', Set fs = CreateObject("Scripting.FileSystemObject")
\ 'Set ws = WScript.CreateObject("WScript.Shell")', Set ws = WScript.CreateObject("WScript.Shell")
\ 'Set shortcut = ws.CreateShortcut("Xlink.lnk")', Set shortcut = ws.CreateShortcut("Xlink.lnk")
\ 'shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xfile")', shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xfile")
\ 'shortcut.Save' shortcut.Save
\], 'link.vbs') END
call writefile(lines, 'link.vbs')
silent !cscript link.vbs silent !cscript link.vbs
call delete('link.vbs') call delete('link.vbs')
call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk'))) call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk')))

288
src/testdir/test_goto.vim
View File

@@ -16,12 +16,12 @@ endfunc
func Test_gD() func Test_gD()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int x; int x;
int func(void) int func(void)
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gD', lines, 1, 5) call XTest_goto_decl('gD', lines, 1, 5)
@@ -29,12 +29,12 @@ endfunc
func Test_gD_too() func Test_gD_too()
let lines =<< trim [CODE] let lines =<< trim [CODE]
Filename x;
int Filename
int func() {
Filename x; Filename x;
return x;
int Filename
int func() {
Filename x;
return x;
[CODE] [CODE]
call XTest_goto_decl('gD', lines, 1, 10) call XTest_goto_decl('gD', lines, 1, 10)
@@ -42,13 +42,13 @@ endfunc
func Test_gD_comment() func Test_gD_comment()
let lines =<< trim [CODE] let lines =<< trim [CODE]
/* int x; */ /* int x; */
int x; int x;
int func(void) int func(void)
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gD', lines, 2, 5) call XTest_goto_decl('gD', lines, 2, 5)
@@ -56,13 +56,13 @@ endfunc
func Test_gD_inline_comment() func Test_gD_inline_comment()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int y /* , x */; int y /* , x */;
int x; int x;
int func(void) int func(void)
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gD', lines, 2, 5) call XTest_goto_decl('gD', lines, 2, 5)
@@ -70,13 +70,13 @@ endfunc
func Test_gD_string() func Test_gD_string()
let lines =<< trim [CODE] let lines =<< trim [CODE]
char *s[] = "x"; char *s[] = "x";
int x = 1; int x = 1;
int func(void) int func(void)
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gD', lines, 2, 5) call XTest_goto_decl('gD', lines, 2, 5)
@@ -84,12 +84,12 @@ endfunc
func Test_gD_string_same_line() func Test_gD_string_same_line()
let lines =<< trim [CODE] let lines =<< trim [CODE]
char *s[] = "x", int x = 1; char *s[] = "x", int x = 1;
int func(void) int func(void)
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gD', lines, 1, 22) call XTest_goto_decl('gD', lines, 1, 22)
@@ -97,13 +97,13 @@ endfunc
func Test_gD_char() func Test_gD_char()
let lines =<< trim [CODE] let lines =<< trim [CODE]
char c = 'x'; char c = 'x';
int x = 1; int x = 1;
int func(void) int func(void)
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gD', lines, 2, 5) call XTest_goto_decl('gD', lines, 2, 5)
@@ -111,12 +111,12 @@ endfunc
func Test_gd() func Test_gd()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int x; int x;
int func(int x) int func(int x)
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 3, 14) call XTest_goto_decl('gd', lines, 3, 14)
@@ -124,15 +124,15 @@ endfunc
func Test_gd_not_local() func Test_gd_not_local()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func1(void) int func1(void)
{ {
return x; return x;
} }
int func2(int x) int func2(int x)
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 3, 10) call XTest_goto_decl('gd', lines, 3, 10)
@@ -140,11 +140,11 @@ endfunc
func Test_gd_kr_style() func Test_gd_kr_style()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(x) int func(x)
int x; int x;
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 2, 7) call XTest_goto_decl('gd', lines, 2, 7)
@@ -152,15 +152,15 @@ endfunc
func Test_gd_missing_braces() func Test_gd_missing_braces()
let lines =<< trim [CODE] let lines =<< trim [CODE]
def func1(a) def func1(a)
a + 1 a + 1
end end
a = 1 a = 1
def func2() def func2()
return a return a
end end
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 1, 11) call XTest_goto_decl('gd', lines, 1, 11)
@@ -168,12 +168,12 @@ endfunc
func Test_gd_comment() func Test_gd_comment()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(void) int func(void)
{ {
/* int x; */ /* int x; */
int x; int x;
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 4, 7) call XTest_goto_decl('gd', lines, 4, 7)
@@ -181,12 +181,12 @@ endfunc
func Test_gd_comment_in_string() func Test_gd_comment_in_string()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(void) int func(void)
{ {
char *s ="//"; int x; char *s ="//"; int x;
int x; int x;
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 3, 22) call XTest_goto_decl('gd', lines, 3, 22)
@@ -195,12 +195,12 @@ endfunc
func Test_gd_string_in_comment() func Test_gd_string_in_comment()
set comments= set comments=
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(void) int func(void)
{ {
/* " */ int x; /* " */ int x;
int x; int x;
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 3, 15) call XTest_goto_decl('gd', lines, 3, 15)
@@ -209,10 +209,10 @@ endfunc
func Test_gd_inline_comment() func Test_gd_inline_comment()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(/* x is an int */ int x) int func(/* x is an int */ int x)
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 1, 32) call XTest_goto_decl('gd', lines, 1, 32)
@@ -220,10 +220,10 @@ endfunc
func Test_gd_inline_comment_only() func Test_gd_inline_comment_only()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(void) /* one lonely x */ int func(void) /* one lonely x */
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 3, 10) call XTest_goto_decl('gd', lines, 3, 10)
@@ -231,16 +231,16 @@ endfunc
func Test_gd_inline_comment_body() func Test_gd_inline_comment_body()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(void) int func(void)
{ {
int y /* , x */; int y /* , x */;
for (/* int x = 0 */; y < 2; y++); for (/* int x = 0 */; y < 2; y++);
int x = 0; int x = 0;
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 7, 7) call XTest_goto_decl('gd', lines, 7, 7)
@@ -248,10 +248,10 @@ endfunc
func Test_gd_trailing_multiline_comment() func Test_gd_trailing_multiline_comment()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(int x) /* x is an int */ int func(int x) /* x is an int */
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 1, 14) call XTest_goto_decl('gd', lines, 1, 14)
@@ -259,10 +259,10 @@ endfunc
func Test_gd_trailing_comment() func Test_gd_trailing_comment()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(int x) // x is an int int func(int x) // x is an int
{ {
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 1, 14) call XTest_goto_decl('gd', lines, 1, 14)
@@ -270,25 +270,25 @@ endfunc
func Test_gd_string() func Test_gd_string()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(void) int func(void)
{ {
char *s = "x"; char *s = "x";
int x = 1; int x = 1;
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 4, 7) call XTest_goto_decl('gd', lines, 4, 7)
endfunc endfunc
func Test_gd_string_only() func Test_gd_string_only()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int func(void) int func(void)
{ {
char *s = "x"; char *s = "x";
return x; return x;
} }
[CODE] [CODE]
call XTest_goto_decl('gd', lines, 5, 10) call XTest_goto_decl('gd', lines, 5, 10)
@@ -311,21 +311,21 @@ endfunc
func Test_gd_local_block() func Test_gd_local_block()
let lines =<< trim [CODE] let lines =<< trim [CODE]
int main() int main()
{
char *a = "NOT NULL";
if(a)
{ {
char *b = a; char *a = "NOT NULL";
printf("%s\n", b); if(a)
{
char *b = a;
printf("%s\n", b);
}
else
{
char *b = "NULL";
return b;
}
return 0;
} }
else
{
char *b = "NULL";
return b;
}
return 0;
}
[CODE] [CODE]
call XTest_goto_decl('1gd', lines, 11, 11) call XTest_goto_decl('1gd', lines, 11, 11)

18
src/testdir/test_gui.vim
View File

@@ -792,10 +792,11 @@ endfunc
func Test_gui_dash_g() func Test_gui_dash_g()
let cmd = GetVimCommand('Xscriptgui') let cmd = GetVimCommand('Xscriptgui')
call writefile([""], "Xtestgui") call writefile([""], "Xtestgui")
call writefile([ let lines =<< trim END
\ 'au GUIEnter * call writefile(["insertmode: " . &insertmode], "Xtestgui")', au GUIEnter * call writefile(["insertmode: " . &insertmode], "Xtestgui")
\ 'au GUIEnter * qall', au GUIEnter * qall
\ ], 'Xscriptgui') END
call writefile(lines, 'Xscriptgui')
call system(cmd . ' -g') call system(cmd . ' -g')
call WaitForAssert({-> assert_equal(['insertmode: 0'], readfile('Xtestgui'))}) call WaitForAssert({-> assert_equal(['insertmode: 0'], readfile('Xtestgui'))})
@@ -807,10 +808,11 @@ endfunc
func Test_gui_dash_y() func Test_gui_dash_y()
let cmd = GetVimCommand('Xscriptgui') let cmd = GetVimCommand('Xscriptgui')
call writefile([""], "Xtestgui") call writefile([""], "Xtestgui")
call writefile([ let lines =<< trim END
\ 'au GUIEnter * call writefile(["insertmode: " . &insertmode], "Xtestgui")', au GUIEnter * call writefile(["insertmode: " . &insertmode], "Xtestgui")
\ 'au GUIEnter * qall', au GUIEnter * qall
\ ], 'Xscriptgui') END
call writefile(lines, 'Xscriptgui')
call system(cmd . ' -y') call system(cmd . ' -y')
call WaitForAssert({-> assert_equal(['insertmode: 1'], readfile('Xtestgui'))}) call WaitForAssert({-> assert_equal(['insertmode: 1'], readfile('Xtestgui'))})

13
src/testdir/test_highlight.vim
View File

@@ -578,12 +578,13 @@ func Test_wincolor()
throw 'Skipped: cannot make screendumps' throw 'Skipped: cannot make screendumps'
endif endif
call writefile([ let lines =<< trim END
\ 'set cursorline cursorcolumn rnu', set cursorline cursorcolumn rnu
\ 'call setline(1, ["","1111111111","22222222222","3 here 3",""])', call setline(1, ["","1111111111","22222222222","3 here 3",""])
\ 'set wincolor=Pmenu', set wincolor=Pmenu
\ '/here', /here
\ ], 'Xtest_wincolor') END
call writefile(lines, 'Xtest_wincolor')
let buf = RunVimInTerminal('-S Xtest_wincolor', {'rows': 8}) let buf = RunVimInTerminal('-S Xtest_wincolor', {'rows': 8})
call term_wait(buf) call term_wait(buf)
call term_sendkeys(buf, "2G5lvj") call term_sendkeys(buf, "2G5lvj")

166
src/testdir/test_join.vim
View File

@@ -100,22 +100,22 @@ ert
" Expected output " Expected output
let expected =<< trim [DATA] let expected =<< trim [DATA]
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
zx cvn. as dfg? hjkl iop! ert ernop zx cvn. as dfg? hjkl iop! ert ernop
zx cvn. as dfg? hjkl iop! ert ernop zx cvn. as dfg? hjkl iop! ert ernop
[DATA] [DATA]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
@@ -142,22 +142,22 @@ ert
" Expected output " Expected output
let expected =<< trim [DATA] let expected =<< trim [DATA]
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
zx cvn. as dfg? hjkl iop! ert enop zx cvn. as dfg? hjkl iop! ert enop
zx cvn. as dfg? hjkl iop! ert ernop zx cvn. as dfg? hjkl iop! ert ernop
[DATA] [DATA]
@@ -176,21 +176,21 @@ ert
" Expected output " Expected output
let expected =<< trim [DATA] let expected =<< trim [DATA]
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf. asdf asdfasdf. asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
asdfasdf asdf asdfasdf asdf
zx cvn. as dfg? hjkl iop! ert a zx cvn. as dfg? hjkl iop! ert a
[DATA] [DATA]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
@@ -255,18 +255,18 @@ action();
" Expected output " Expected output
let expected =<< trim [CODE] let expected =<< trim [CODE]
{ {
/* Make sure the previous comment leader is not removed. */ /* Make sure the previous comment leader is not removed. */
/* Make sure the previous comment leader is not removed. */ /* Make sure the previous comment leader is not removed. */
// Should the next comment leader be left alone? Yes. // Should the next comment leader be left alone? Yes.
// Should the next comment leader be left alone? Yes. // Should the next comment leader be left alone? Yes.
/* Here the comment leader should be left intact. */ // And so should this one. /* Here the comment leader should be left intact. */ // And so should this one.
/* Here the comment leader should be left intact. */ // And so should this one. /* Here the comment leader should be left intact. */ // And so should this one.
if (condition) // Remove the next comment leader! OK, I will. if (condition) // Remove the next comment leader! OK, I will.
action(); action();
if (condition) // Remove the next comment leader! OK, I will. if (condition) // Remove the next comment leader! OK, I will.
action(); action();
} }
[CODE] [CODE]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
@@ -378,30 +378,30 @@ int i = 7 /* foo *// 3
exe "normal oSome code!\<CR>// Make sure backspacing does not remove this comment leader.\<Esc>0i\<C-H>\<Esc>" exe "normal oSome code!\<CR>// Make sure backspacing does not remove this comment leader.\<Esc>0i\<C-H>\<Esc>"
" Expected output " Expected output
let expected =<< [CODE] let expected =<< trim [CODE]
{ {
/* Make sure the previous comment leader is not removed. */ /* Make sure the previous comment leader is not removed. */
/* Make sure the previous comment leader is not removed. */ /* Make sure the previous comment leader is not removed. */
/* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */ /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
/* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */ /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
// Should the next comment leader be left alone? Yes. // Should the next comment leader be left alone? Yes.
// Should the next comment leader be left alone? Yes. // Should the next comment leader be left alone? Yes.
/* Here the comment leader should be left intact. */ // And so should this one. /* Here the comment leader should be left intact. */ // And so should this one.
/* Here the comment leader should be left intact. */ // And so should this one. /* Here the comment leader should be left intact. */ // And so should this one.
if (condition) // Remove the next comment leader! OK, I will. if (condition) // Remove the next comment leader! OK, I will.
action(); action();
if (condition) // Remove the next comment leader! OK, I will. if (condition) // Remove the next comment leader! OK, I will.
action(); action();
int i = 7 /* foo *// 3 // comment int i = 7 /* foo *// 3 // comment
; ;
int i = 7 /* foo *// 3 // comment int i = 7 /* foo *// 3 // comment
; ;
># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader. ># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader.
># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader. ># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader.
Some code!// Make sure backspacing does not remove this comment leader. Some code!// Make sure backspacing does not remove this comment leader.
} }
[CODE] [CODE]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
close! close!

10
src/testdir/test_let.vim
View File

@@ -210,10 +210,18 @@ END
END END
call assert_equal(['Line1', ' Line2', "\tLine3", ' END'], var1) call assert_equal(['Line1', ' Line2', "\tLine3", ' END'], var1)
let var1 =<< trim !!!
Line1
line2
Line3
!!!
!!!
call assert_equal(['Line1', ' line2', "\tLine3", '!!!',], var1)
let var1 =<< trim let var1 =<< trim
Line1 Line1
. .
call assert_equal([' Line1'], var1) call assert_equal(['Line1'], var1)
" ignore "endfunc" " ignore "endfunc"
let var1 =<< END let var1 =<< END

34
src/testdir/test_memory_usage.vim
View File

@@ -85,14 +85,15 @@ func Test_memory_func_capture_vargs()
" Case: if a local variable captures a:000, funccall object will be free " Case: if a local variable captures a:000, funccall object will be free
" just after it finishes. " just after it finishes.
let testfile = 'Xtest.vim' let testfile = 'Xtest.vim'
call writefile([ let lines =<< trim END
\ 'func s:f(...)', func s:f(...)
\ ' let x = a:000', let x = a:000
\ 'endfunc', endfunc
\ 'for _ in range(10000)', for _ in range(10000)
\ ' call s:f(0)', call s:f(0)
\ 'endfor', endfor
\ ], testfile) END
call writefile(lines, testfile)
let vim = s:vim_new() let vim = s:vim_new()
call vim.start('--clean', '-c', 'set noswapfile', testfile) call vim.start('--clean', '-c', 'set noswapfile', testfile)
@@ -122,14 +123,15 @@ func Test_memory_func_capture_lvars()
" free until garbage collector runs, but after that memory usage doesn't " free until garbage collector runs, but after that memory usage doesn't
" increase so much even when rerun Xtest.vim since system memory caches. " increase so much even when rerun Xtest.vim since system memory caches.
let testfile = 'Xtest.vim' let testfile = 'Xtest.vim'
call writefile([ let lines =<< trim END
\ 'func s:f()', func s:f()
\ ' let x = l:', let x = l:
\ 'endfunc', endfunc
\ 'for _ in range(10000)', for _ in range(10000)
\ ' call s:f()', call s:f()
\ 'endfor', endfor
\ ], testfile) END
call writefile(lines, testfile)
let vim = s:vim_new() let vim = s:vim_new()
call vim.start('--clean', '-c', 'set noswapfile', testfile) call vim.start('--clean', '-c', 'set noswapfile', testfile)

24
src/testdir/test_messages.vim
View File

@@ -102,13 +102,14 @@ func Test_mode_message_at_leaving_insert_by_ctrl_c()
" Set custom statusline built by user-defined function. " Set custom statusline built by user-defined function.
let testfile = 'Xtest.vim' let testfile = 'Xtest.vim'
call writefile([ let lines =<< trim END
\ 'func StatusLine() abort', func StatusLine() abort
\ ' return ""', return ""
\ 'endfunc', endfunc
\ 'set statusline=%!StatusLine()', set statusline=%!StatusLine()
\ 'set laststatus=2', set laststatus=2
\ ], testfile) END
call writefile(lines, testfile)
let rows = 10 let rows = 10
let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows}) let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})
@@ -133,10 +134,11 @@ func Test_mode_message_at_leaving_insert_with_esc_mapped()
" Set custom statusline built by user-defined function. " Set custom statusline built by user-defined function.
let testfile = 'Xtest.vim' let testfile = 'Xtest.vim'
call writefile([ let lines =<< trim END
\ 'set laststatus=2', set laststatus=2
\ 'inoremap <Esc> <Esc>00', inoremap <Esc> <Esc>00
\ ], testfile) END
call writefile(lines, testfile)
let rows = 10 let rows = 10
let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows}) let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})

36
src/testdir/test_mksession_utf8.vim
View File

@@ -65,32 +65,32 @@ func Test_mksession_utf8()
mksession! test_mks.out mksession! test_mks.out
let li = filter(readfile('test_mks.out'), 'v:val =~# "\\(^ *normal! 0\\|^ *exe ''normal!\\)"') let li = filter(readfile('test_mks.out'), 'v:val =~# "\\(^ *normal! 0\\|^ *exe ''normal!\\)"')
let expected =<< trim [DATA] let expected =<< trim [DATA]
normal! 016|
normal! 016|
normal! 016|
normal! 08|
normal! 08|
normal! 016|
normal! 016|
normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016| normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016| normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016| normal! 016|
exe 'normal! ' . s:c . '|zs' . 8 . '|'
normal! 08| normal! 08|
exe 'normal! ' . s:c . '|zs' . 8 . '|'
normal! 08| normal! 08|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016| normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016| normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016| normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
exe 'normal! ' . s:c . '|zs' . 8 . '|'
normal! 08|
exe 'normal! ' . s:c . '|zs' . 8 . '|'
normal! 08|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
[DATA] [DATA]
call assert_equal(expected, li) call assert_equal(expected, li)

178
src/testdir/test_normal.vim
View File

@@ -1556,34 +1556,34 @@ endfunc
fun! Test_normal29_brace() fun! Test_normal29_brace()
" basic test for { and } movements " basic test for { and } movements
let text =<< trim [DATA] let text =<< trim [DATA]
A paragraph begins after each empty line, and also at each of a set of A paragraph begins after each empty line, and also at each of a set of
paragraph macros, specified by the pairs of characters in the 'paragraphs' paragraph macros, specified by the pairs of characters in the 'paragraphs'
option. The default is "IPLPPPQPP TPHPLIPpLpItpplpipbp", which corresponds to option. The default is "IPLPPPQPP TPHPLIPpLpItpplpipbp", which corresponds to
the macros ".IP", ".LP", etc. (These are nroff macros, so the dot must be in the macros ".IP", ".LP", etc. (These are nroff macros, so the dot must be in
the first column). A section boundary is also a paragraph boundary. the first column). A section boundary is also a paragraph boundary.
Note that a blank line (only containing white space) is NOT a paragraph Note that a blank line (only containing white space) is NOT a paragraph
boundary. boundary.
Also note that this does not include a '{' or '}' in the first column. When Also note that this does not include a '{' or '}' in the first column. When
the '{' flag is in 'cpoptions' then '{' in the first column is used as a the '{' flag is in 'cpoptions' then '{' in the first column is used as a
paragraph boundary |posix|. paragraph boundary |posix|.
{ {
This is no paragraph This is no paragraph
unless the '{' is set unless the '{' is set
in 'cpoptions' in 'cpoptions'
} }
.IP .IP
The nroff macros IP separates a paragraph The nroff macros IP separates a paragraph
That means, it must be a '.' That means, it must be a '.'
followed by IP followed by IP
.LPIt does not matter, if afterwards some .LPIt does not matter, if afterwards some
more characters follow. more characters follow.
.SHAlso section boundaries from the nroff .SHAlso section boundaries from the nroff
macros terminate a paragraph. That means macros terminate a paragraph. That means
a character like this: a character like this:
.NH .NH
End of text here End of text here
[DATA] [DATA]
new new
@@ -1592,17 +1592,17 @@ fun! Test_normal29_brace()
norm! 0d2} norm! 0d2}
let expected =<< trim [DATA] let expected =<< trim [DATA]
.IP .IP
The nroff macros IP separates a paragraph The nroff macros IP separates a paragraph
That means, it must be a '.' That means, it must be a '.'
followed by IP followed by IP
.LPIt does not matter, if afterwards some .LPIt does not matter, if afterwards some
more characters follow. more characters follow.
.SHAlso section boundaries from the nroff .SHAlso section boundaries from the nroff
macros terminate a paragraph. That means macros terminate a paragraph. That means
a character like this: a character like this:
.NH .NH
End of text here End of text here
[DATA] [DATA]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
@@ -1610,14 +1610,14 @@ fun! Test_normal29_brace()
norm! 0d} norm! 0d}
let expected =<< trim [DATA] let expected =<< trim [DATA]
.LPIt does not matter, if afterwards some .LPIt does not matter, if afterwards some
more characters follow. more characters follow.
.SHAlso section boundaries from the nroff .SHAlso section boundaries from the nroff
macros terminate a paragraph. That means macros terminate a paragraph. That means
a character like this: a character like this:
.NH .NH
End of text here End of text here
[DATA] [DATA]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
@@ -1625,11 +1625,11 @@ fun! Test_normal29_brace()
norm! d{ norm! d{
let expected =<< trim [DATA] let expected =<< trim [DATA]
.LPIt does not matter, if afterwards some .LPIt does not matter, if afterwards some
more characters follow. more characters follow.
.SHAlso section boundaries from the nroff .SHAlso section boundaries from the nroff
macros terminate a paragraph. That means macros terminate a paragraph. That means
a character like this: a character like this:
[DATA] [DATA]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
@@ -1637,8 +1637,8 @@ fun! Test_normal29_brace()
norm! d{ norm! d{
let expected =<< trim [DATA] let expected =<< trim [DATA]
.LPIt does not matter, if afterwards some .LPIt does not matter, if afterwards some
more characters follow. more characters follow.
[DATA] [DATA]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
@@ -1651,22 +1651,22 @@ fun! Test_normal29_brace()
norm! 0d2} norm! 0d2}
let expected =<< trim [DATA] let expected =<< trim [DATA]
{ {
This is no paragraph This is no paragraph
unless the '{' is set unless the '{' is set
in 'cpoptions' in 'cpoptions'
} }
.IP .IP
The nroff macros IP separates a paragraph The nroff macros IP separates a paragraph
That means, it must be a '.' That means, it must be a '.'
followed by IP followed by IP
.LPIt does not matter, if afterwards some .LPIt does not matter, if afterwards some
more characters follow. more characters follow.
.SHAlso section boundaries from the nroff .SHAlso section boundaries from the nroff
macros terminate a paragraph. That means macros terminate a paragraph. That means
a character like this: a character like this:
.NH .NH
End of text here End of text here
[DATA] [DATA]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
@@ -1675,22 +1675,22 @@ fun! Test_normal29_brace()
norm! d} norm! d}
let expected =<< trim [DATA] let expected =<< trim [DATA]
{ {
This is no paragraph This is no paragraph
unless the '{' is set unless the '{' is set
in 'cpoptions' in 'cpoptions'
} }
.IP .IP
The nroff macros IP separates a paragraph The nroff macros IP separates a paragraph
That means, it must be a '.' That means, it must be a '.'
followed by IP followed by IP
.LPIt does not matter, if afterwards some .LPIt does not matter, if afterwards some
more characters follow. more characters follow.
.SHAlso section boundaries from the nroff .SHAlso section boundaries from the nroff
macros terminate a paragraph. That means macros terminate a paragraph. That means
a character like this: a character like this:
.NH .NH
End of text here End of text here
[DATA] [DATA]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))
@@ -1699,11 +1699,11 @@ fun! Test_normal29_brace()
norm! d5} norm! d5}
let expected =<< trim [DATA] let expected =<< trim [DATA]
{ {
This is no paragraph This is no paragraph
unless the '{' is set unless the '{' is set
in 'cpoptions' in 'cpoptions'
} }
[DATA] [DATA]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))

35
src/testdir/test_popup.vim
View File

@@ -737,12 +737,13 @@ func Test_popup_and_previewwindow_dump()
if !CanRunVimInTerminal() if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps' throw 'Skipped: cannot make screendumps'
endif endif
call writefile([ let lines =<< trim END
\ 'set previewheight=9', set previewheight=9
\ 'silent! pedit', silent! pedit
\ 'call setline(1, map(repeat(["ab"], 10), "v:val. v:key"))', call setline(1, map(repeat(["ab"], 10), "v:val. v:key"))
\ 'exec "norm! G\<C-E>\<C-E>"', exec "norm! G\<C-E>\<C-E>"
\ ], 'Xscript') END
call writefile(lines, 'Xscript')
let buf = RunVimInTerminal('-S Xscript', {}) let buf = RunVimInTerminal('-S Xscript', {})
" Test that popup and previewwindow do not overlap. " Test that popup and previewwindow do not overlap.
@@ -799,11 +800,12 @@ func Test_popup_position()
if !CanRunVimInTerminal() if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps' throw 'Skipped: cannot make screendumps'
endif endif
call writefile([ let lines =<< trim END
\ '123456789_123456789_123456789_a', 123456789_123456789_123456789_a
\ '123456789_123456789_123456789_b', 123456789_123456789_123456789_b
\ ' 123', 123
\ ], 'Xtest') END
call writefile(lines, 'Xtest')
let buf = RunVimInTerminal('Xtest', {}) let buf = RunVimInTerminal('Xtest', {})
call term_sendkeys(buf, ":vsplit\<CR>") call term_sendkeys(buf, ":vsplit\<CR>")
@@ -842,11 +844,12 @@ func Test_popup_command()
throw 'Skipped: cannot make screendumps and/or menu feature missing' throw 'Skipped: cannot make screendumps and/or menu feature missing'
endif endif
call writefile([ let lines =<< trim END
\ 'one two three four five', one two three four five
\ 'and one two Xthree four five', and one two Xthree four five
\ 'one more two three four five', one more two three four five
\ ], 'Xtest') END
call writefile(lines, 'Xtest')
let buf = RunVimInTerminal('Xtest', {}) let buf = RunVimInTerminal('Xtest', {})
call term_sendkeys(buf, ":source $VIMRUNTIME/menu.vim\<CR>") call term_sendkeys(buf, ":source $VIMRUNTIME/menu.vim\<CR>")
call term_sendkeys(buf, "/X\<CR>:popup PopUp\<CR>") call term_sendkeys(buf, "/X\<CR>:popup PopUp\<CR>")

134
src/testdir/test_popupwin.vim
View File

@@ -9,16 +9,17 @@ func Test_simple_popup()
if !CanRunVimInTerminal() if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps' throw 'Skipped: cannot make screendumps'
endif endif
call writefile([ let lines =<< trim END
\ "call setline(1, range(1, 100))", call setline(1, range(1, 100))
\ "hi PopupColor1 ctermbg=lightblue", hi PopupColor1 ctermbg=lightblue
\ "hi PopupColor2 ctermbg=lightcyan", hi PopupColor2 ctermbg=lightcyan
\ "hi Comment ctermfg=red", hi Comment ctermfg=red
\ "call prop_type_add('comment', {'highlight': 'Comment'})", call prop_type_add('comment', {'highlight': 'Comment'})
\ "let winid = popup_create('hello there', {'line': 3, 'col': 11, 'minwidth': 20, 'highlight': 'PopupColor1'})", let winid = popup_create('hello there', {'line': 3, 'col': 11, 'minwidth': 20, 'highlight': 'PopupColor1'})
\ "let winid2 = popup_create(['another one', 'another two', 'another three'], {'line': 3, 'col': 25, 'minwidth': 20})", let winid2 = popup_create(['another one', 'another two', 'another three'], {'line': 3, 'col': 25, 'minwidth': 20})
\ "call setwinvar(winid2, '&wincolor', 'PopupColor2')", call setwinvar(winid2, '&wincolor', 'PopupColor2')
\], 'XtestPopup') END
call writefile(lines, 'XtestPopup')
let buf = RunVimInTerminal('-S XtestPopup', {'rows': 10}) let buf = RunVimInTerminal('-S XtestPopup', {'rows': 10})
call VerifyScreenDump(buf, 'Test_popupwin_01', {}) call VerifyScreenDump(buf, 'Test_popupwin_01', {})
@@ -80,16 +81,18 @@ func Test_popup_with_border_and_padding()
endif endif
for iter in range(0, 1) for iter in range(0, 1)
call writefile([iter == 1 ? '' : 'set enc=latin1', let lines =<< trim END
\ "call setline(1, range(1, 100))", call setline(1, range(1, 100))
\ "call popup_create('hello border', {'line': 2, 'col': 3, 'border': []})", call popup_create('hello border', {'line': 2, 'col': 3, 'border': []})
\ "call popup_create('hello padding', {'line': 2, 'col': 23, 'padding': []})", call popup_create('hello padding', {'line': 2, 'col': 23, 'padding': []})
\ "call popup_create('hello both', {'line': 2, 'col': 43, 'border': [], 'padding': []})", call popup_create('hello both', {'line': 2, 'col': 43, 'border': [], 'padding': []})
\ "call popup_create('border TL', {'line': 6, 'col': 3, 'border': [1, 0, 0, 4]})", call popup_create('border TL', {'line': 6, 'col': 3, 'border': [1, 0, 0, 4]})
\ "call popup_create('paddings', {'line': 6, 'col': 23, 'padding': [1, 3, 2, 4]})", call popup_create('paddings', {'line': 6, 'col': 23, 'padding': [1, 3, 2, 4]})
\ "call popup_create('wrapped longer text', {'line': 8, 'col': 55, 'padding': [0, 3, 0, 3], 'border': [0, 1, 0, 1]})", call popup_create('wrapped longer text', {'line': 8, 'col': 55, 'padding': [0, 3, 0, 3], 'border': [0, 1, 0, 1]})
\ "call popup_create('right aligned text', {'line': 11, 'col': 56, 'wrap': 0, 'padding': [0, 3, 0, 3], 'border': [0, 1, 0, 1]})", call popup_create('right aligned text', {'line': 11, 'col': 56, 'wrap': 0, 'padding': [0, 3, 0, 3], 'border': [0, 1, 0, 1]})
\], 'XtestPopupBorder') END
call insert(lines, iter == 1 ? '' : 'set enc=latin1')
call writefile(lines, 'XtestPopupBorder')
let buf = RunVimInTerminal('-S XtestPopupBorder', {'rows': 15}) let buf = RunVimInTerminal('-S XtestPopupBorder', {'rows': 15})
call VerifyScreenDump(buf, 'Test_popupwin_2' .. iter, {}) call VerifyScreenDump(buf, 'Test_popupwin_2' .. iter, {})
@@ -97,20 +100,21 @@ func Test_popup_with_border_and_padding()
call delete('XtestPopupBorder') call delete('XtestPopupBorder')
endfor endfor
call writefile([ let lines =<< trim END
\ "call setline(1, range(1, 100))", call setline(1, range(1, 100))
\ "hi BlueColor ctermbg=lightblue", hi BlueColor ctermbg=lightblue
\ "hi TopColor ctermbg=253", hi TopColor ctermbg=253
\ "hi RightColor ctermbg=245", hi RightColor ctermbg=245
\ "hi BottomColor ctermbg=240", hi BottomColor ctermbg=240
\ "hi LeftColor ctermbg=248", hi LeftColor ctermbg=248
\ "call popup_create('hello border', {'line': 2, 'col': 3, 'border': [], 'borderhighlight': ['BlueColor']})", call popup_create('hello border', {'line': 2, 'col': 3, 'border': [], 'borderhighlight': ['BlueColor']})
\ "call popup_create(['hello border', 'and more'], {'line': 2, 'col': 23, 'border': [], 'borderhighlight': ['TopColor', 'RightColor', 'BottomColor', 'LeftColor']})", call popup_create(['hello border', 'and more'], {'line': 2, 'col': 23, 'border': [], 'borderhighlight': ['TopColor', 'RightColor', 'BottomColor', 'LeftColor']})
\ "call popup_create(['hello border', 'lines only'], {'line': 2, 'col': 43, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['x']})", call popup_create(['hello border', 'lines only'], {'line': 2, 'col': 43, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['x']})
\ "call popup_create(['hello border', 'with corners'], {'line': 2, 'col': 60, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['x', '#']})", call popup_create(['hello border', 'with corners'], {'line': 2, 'col': 60, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['x', '#']})
\ "let winid = popup_create(['hello border', 'with numbers'], {'line': 6, 'col': 3, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['0', '1', '2', '3', '4', '5', '6', '7']})", let winid = popup_create(['hello border', 'with numbers'], {'line': 6, 'col': 3, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['0', '1', '2', '3', '4', '5', '6', '7']})
\ "call popup_create(['hello border', 'just blanks'], {'line': 7, 'col': 23, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': [' ']})", call popup_create(['hello border', 'just blanks'], {'line': 7, 'col': 23, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': [' ']})
\], 'XtestPopupBorder') END
call writefile(lines, 'XtestPopupBorder')
let buf = RunVimInTerminal('-S XtestPopupBorder', {'rows': 12}) let buf = RunVimInTerminal('-S XtestPopupBorder', {'rows': 12})
call VerifyScreenDump(buf, 'Test_popupwin_22', {}) call VerifyScreenDump(buf, 'Test_popupwin_22', {})
@@ -176,18 +180,19 @@ func Test_popup_with_syntax_win_execute()
if !CanRunVimInTerminal() if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps' throw 'Skipped: cannot make screendumps'
endif endif
call writefile([ let lines =<< trim END
\ "call setline(1, range(1, 100))", call setline(1, range(1, 100))
\ "hi PopupColor ctermbg=lightblue", hi PopupColor ctermbg=lightblue
\ "let winid = popup_create([", let winid = popup_create([
\ "\\ '#include <stdio.h>',", \ '#include <stdio.h>',
\ "\\ 'int main(void)',", \ 'int main(void)',
\ "\\ '{',", \ '{',
\ "\\ ' printf(123);',", \ ' printf(123);',
\ "\\ '}',", \ '}',
\ "\\], {'line': 3, 'col': 25, 'highlight': 'PopupColor'})", \], {'line': 3, 'col': 25, 'highlight': 'PopupColor'})
\ "call win_execute(winid, 'set syntax=cpp')", call win_execute(winid, 'set syntax=cpp')
\], 'XtestPopup') END
call writefile(lines, 'XtestPopup')
let buf = RunVimInTerminal('-S XtestPopup', {'rows': 10}) let buf = RunVimInTerminal('-S XtestPopup', {'rows': 10})
call VerifyScreenDump(buf, 'Test_popupwin_10', {}) call VerifyScreenDump(buf, 'Test_popupwin_10', {})
@@ -356,6 +361,43 @@ func Test_popup_drag()
call delete('XtestPopupDrag') call delete('XtestPopupDrag')
endfunc endfunc
func Test_popup_with_mask()
if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps'
endif
let lines =<< trim END
call setline(1, repeat([join(range(1, 40), '')], 10))
hi PopupColor ctermbg=lightgrey
let winid = popup_create([
\ 'some text',
\ 'another line',
\], {
\ 'line': 2,
\ 'col': 10,
\ 'zindex': 90,
\ 'padding': [],
\ 'highlight': 'PopupColor',
\ 'mask': [[1,1,1,1], [-5,-1,4,4], [7,9,2,3], [2,4,3,3]]})
call popup_create([
\ 'xxxxxxxxx',
\ 'yyyyyyyyy',
\], {
\ 'line': 3,
\ 'col': 18,
\ 'zindex': 20})
END
call writefile(lines, 'XtestPopupMask')
let buf = RunVimInTerminal('-S XtestPopupMask', {'rows': 10})
call VerifyScreenDump(buf, 'Test_popupwin_mask_1', {})
call term_sendkeys(buf, ":call popup_move(winid, {'col': 11, 'line': 3})\<CR>")
call VerifyScreenDump(buf, 'Test_popupwin_mask_2', {})
" clean up
call StopVimInTerminal(buf)
call delete('XtestPopupMask')
endfunc
func Test_popup_select() func Test_popup_select()
if !CanRunVimInTerminal() if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps' throw 'Skipped: cannot make screendumps'

12
src/testdir/test_profile.vim
View File

@@ -310,13 +310,13 @@ endfunc
func Test_profile_file() func Test_profile_file()
let lines =<< trim [CODE] let lines =<< trim [CODE]
func! Foo() func! Foo()
endfunc endfunc
for i in range(10) for i in range(10)
" a comment " a comment
call Foo()
endfor
call Foo() call Foo()
endfor
call Foo()
[CODE] [CODE]
call writefile(lines, 'Xprofile_file.vim') call writefile(lines, 'Xprofile_file.vim')

174
src/testdir/test_quickfix.vim
View File

@@ -818,67 +818,67 @@ func Test_efm1()
endif endif
let l =<< trim [DATA] let l =<< trim [DATA]
"Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set. "Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set.
"Xtestfile", line 6 col 19; this is an error "Xtestfile", line 6 col 19; this is an error
gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c
Xtestfile:9: parse error before `asd' Xtestfile:9: parse error before `asd'
make: *** [vim] Error 1 make: *** [vim] Error 1
in file "Xtestfile" linenr 10: there is an error in file "Xtestfile" linenr 10: there is an error
2 returned 2 returned
"Xtestfile", line 11 col 1; this is an error "Xtestfile", line 11 col 1; this is an error
"Xtestfile", line 12 col 2; this is another error "Xtestfile", line 12 col 2; this is another error
"Xtestfile", line 14:10; this is an error in column 10 "Xtestfile", line 14:10; this is an error in column 10
=Xtestfile=, line 15:10; this is another error, but in vcol 10 this time =Xtestfile=, line 15:10; this is another error, but in vcol 10 this time
"Xtestfile", linenr 16: yet another problem "Xtestfile", linenr 16: yet another problem
Error in "Xtestfile" at line 17: Error in "Xtestfile" at line 17:
x should be a dot x should be a dot
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17
^ ^
Error in "Xtestfile" at line 18: Error in "Xtestfile" at line 18:
x should be a dot x should be a dot
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18
.............^ .............^
Error in "Xtestfile" at line 19: Error in "Xtestfile" at line 19:
x should be a dot x should be a dot
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19
--------------^ --------------^
Error in "Xtestfile" at line 20: Error in "Xtestfile" at line 20:
x should be a dot x should be a dot
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20
^ ^
Does anyone know what is the problem and how to correction it? Does anyone know what is the problem and how to correction it?
"Xtestfile", line 21 col 9: What is the title of the quickfix window? "Xtestfile", line 21 col 9: What is the title of the quickfix window?
"Xtestfile", line 22 col 9: What is the title of the quickfix window? "Xtestfile", line 22 col 9: What is the title of the quickfix window?
[DATA] [DATA]
call writefile(l, 'Xerrorfile1') call writefile(l, 'Xerrorfile1')
call writefile(l[:-2], 'Xerrorfile2') call writefile(l[:-2], 'Xerrorfile2')
let m =<< trim [DATA] let m =<< [DATA]
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 2 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 2
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 3
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 4 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 4
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 5 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 5
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 6
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 7 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 7
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 8 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 8
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 9 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 9
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 10 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 10
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 11 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 11
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 12 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 12
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 13 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 13
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 14 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 14
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 15 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 15
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 16 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 16
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 21 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 21
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 22 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 22
[DATA] [DATA]
call writefile(m, 'Xtestfile') call writefile(m, 'Xtestfile')
let save_efm = &efm let save_efm = &efm
@@ -1092,20 +1092,20 @@ func Test_efm2()
" Test for %P, %Q and %t format specifiers " Test for %P, %Q and %t format specifiers
let lines =<< trim [DATA] let lines =<< trim [DATA]
[Xtestfile1] [Xtestfile1]
(1,17) error: ';' missing (1,17) error: ';' missing
(21,2) warning: variable 'z' not defined (21,2) warning: variable 'z' not defined
(67,3) error: end of file found before string ended (67,3) error: end of file found before string ended
-- --
[Xtestfile2] [Xtestfile2]
-- --
[Xtestfile3] [Xtestfile3]
NEW compiler v1.1 NEW compiler v1.1
(2,2) warning: variable 'x' not defined (2,2) warning: variable 'x' not defined
(67,3) warning: 's' already defined (67,3) warning: 's' already defined
-- --
[DATA] [DATA]
set efm=%+P[%f]%r,(%l\\,%c)%*[\ ]%t%*[^:]:\ %m,%+Q--%r set efm=%+P[%f]%r,(%l\\,%c)%*[\ ]%t%*[^:]:\ %m,%+Q--%r
@@ -1130,10 +1130,10 @@ func Test_efm2()
" Tests for %E, %C and %Z format specifiers " Tests for %E, %C and %Z format specifiers
let lines =<< trim [DATA] let lines =<< trim [DATA]
Error 275 Error 275
line 42 line 42
column 3 column 3
' ' expected after '--' ' ' expected after '--'
[DATA] [DATA]
set efm=%EError\ %n,%Cline\ %l,%Ccolumn\ %c,%Z%m set efm=%EError\ %n,%Cline\ %l,%Ccolumn\ %c,%Z%m
@@ -1147,8 +1147,8 @@ func Test_efm2()
" Test for %> " Test for %>
let lines =<< trim [DATA] let lines =<< trim [DATA]
Error in line 147 of foo.c: Error in line 147 of foo.c:
unknown variable 'i' unknown variable 'i'
[DATA] [DATA]
set efm=unknown\ variable\ %m,%E%>Error\ in\ line\ %l\ of\ %f:,%Z%m set efm=unknown\ variable\ %m,%E%>Error\ in\ line\ %l\ of\ %f:,%Z%m
@@ -1160,19 +1160,19 @@ func Test_efm2()
" Test for %A, %C and other formats " Test for %A, %C and other formats
let lines =<< trim [DATA] let lines =<< trim [DATA]
============================================================== ==============================================================
FAIL: testGetTypeIdCachesResult (dbfacadeTest.DjsDBFacadeTest) FAIL: testGetTypeIdCachesResult (dbfacadeTest.DjsDBFacadeTest)
-------------------------------------------------------------- --------------------------------------------------------------
Traceback (most recent call last): Traceback (most recent call last):
File "unittests/dbfacadeTest.py", line 89, in testFoo File "unittests/dbfacadeTest.py", line 89, in testFoo
self.assertEquals(34, dtid) self.assertEquals(34, dtid)
File "/usr/lib/python2.2/unittest.py", line 286, in File "/usr/lib/python2.2/unittest.py", line 286, in
failUnlessEqual failUnlessEqual
raise self.failureException, \\ raise self.failureException, \\
AssertionError: 34 != 33 AssertionError: 34 != 33
-------------------------------------------------------------- --------------------------------------------------------------
Ran 27 tests in 0.063s Ran 27 tests in 0.063s
[DATA] [DATA]
set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m

16
src/testdir/test_xxd.vim
View File

@@ -96,10 +96,10 @@ func Test_xxd()
exe '0r! ' . s:xxd_cmd . ' -i XXDfile' exe '0r! ' . s:xxd_cmd . ' -i XXDfile'
$d $d
let expected =<< trim [CODE] let expected =<< trim [CODE]
unsigned char XXDfile[] = { unsigned char XXDfile[] = {
0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
}; };
unsigned int XXDfile_len = 11; unsigned int XXDfile_len = 11;
[CODE] [CODE]
call assert_equal(expected, getline(1,'$'), s:Mess(s:test)) call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
@@ -112,10 +112,10 @@ func Test_xxd()
exe '0r! ' . s:xxd_cmd . ' -i ' . arg . ' XXDfile' exe '0r! ' . s:xxd_cmd . ' -i ' . arg . ' XXDfile'
$d $d
let expected =<< trim [CODE] let expected =<< trim [CODE]
unsigned char XXDFILE[] = { unsigned char XXDFILE[] = {
0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
}; };
unsigned int XXDFILE_LEN = 11; unsigned int XXDFILE_LEN = 11;
[CODE] [CODE]
call assert_equal(expected, getline(1,'$'), s:Mess(s:test)) call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
endfor endfor

2
src/version.c
View File

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