opensourcemirror
/
neovim
mirror of https://github.com/neovim/neovim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge #11077 'vim-patch:8.1.{1354,1356,1362,1588}'

This commit is contained in:
Justin M. Keyes 2019-10-07 21:51:04 -07:00
parent 7faa6c41c8 0586a4b512
commit 3b3a409781
23 changed files with 1193 additions and 766 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
runtime/doc/eval.txt
View File

@ -9779,6 +9779,44 @@ This does NOT work: >
Like above, but append/add/subtract the value for each Like above, but append/add/subtract the value for each
|List| item. |List| item.
*:let=<<* *:let-heredoc* *E990* *E991*
:let {var-name} =<< [trim] {marker}
text...
text...
{marker}
Set internal variable {var-name} to a List containing
the lines of text bounded by the string {marker}.
{marker} must not contain white space.
The last line should end only with the {marker} string
without any other character. Watch out for white
space after {marker}!
If {marker} is not supplied, then "." is used as the
default marker.
Any white space characters in the lines of text are
preserved. If "trim" is specified before {marker},
then all the leading indentation exactly matching the
leading indentation before `let` is stripped from the
input lines and the line containing {marker}. Note
that the difference between space and tab matters
here.
If {var-name} didn't exist yet, it is created.
Cannot be followed by another command, but can be
followed by a comment.
Examples: >
let var1 =<< END
Sample text 1
Sample text 2
Sample text 3
END
let data =<< trim DATA
1 2 3 4
5 6 7 8
DATA
<
*E121* *E121*
:let {var-name} .. List the value of variable {var-name}. Multiple :let {var-name} .. List the value of variable {var-name}. Multiple
variable names may be given. Special names recognized variable names may be given. Special names recognized

2
src/nvim/digraph.c
View File

@ -1887,7 +1887,7 @@ void ex_loadkeymap(exarg_T *eap)
// Get each line of the sourced file, break at the end. // Get each line of the sourced file, break at the end.
for (;;) { for (;;) {
line = eap->getline(0, eap->cookie, 0); line = eap->getline(0, eap->cookie, 0, true);
if (line == NULL) { if (line == NULL) {
break; break;

139
src/nvim/eval.c
View File

@ -1504,6 +1504,87 @@ void ex_const(exarg_T *eap)
ex_let_const(eap, true); ex_let_const(eap, true);
} }
// Get a list of lines from a HERE document. The here document is a list of
// lines surrounded by a marker.
// cmd << {marker}
// {line1}
// {line2}
// ....
// {marker}
//
// The {marker} is a string. If the optional 'trim' word is supplied before the
// marker, then the leading indentation before the lines (matching the
// indentation in the 'cmd' line) is stripped.
// Returns a List with {lines} or NULL.
static list_T *
heredoc_get(exarg_T *eap, char_u *cmd)
{
char_u *marker;
char_u *p;
int indent_len = 0;
if (eap->getline == NULL) {
EMSG(_("E991: cannot use =<< here"));
return NULL;
}
// Check for the optional 'trim' word before the marker
cmd = skipwhite(cmd);
if (STRNCMP(cmd, "trim", 4) == 0
&& (cmd[4] == NUL || ascii_iswhite(cmd[4]))) {
cmd = skipwhite(cmd + 4);
// Trim the indentation from all the lines in the here document
// The amount of indentation trimmed is the same as the indentation of
// the :let command line.
p = *eap->cmdlinep;
while (ascii_iswhite(*p)) {
p++;
indent_len++;
}
}
// The marker is the next word. Default marker is "."
if (*cmd != NUL && *cmd != '"') {
marker = skipwhite(cmd);
p = skiptowhite(marker);
if (*skipwhite(p) != NUL && *skipwhite(p) != '"') {
EMSG(_(e_trailing));
return NULL;
}
*p = NUL;
} else {
marker = (char_u *)".";
}
list_T *l = tv_list_alloc(0);
for (;;) {
int i = 0;
char_u *theline = eap->getline(NUL, eap->cookie, 0, false);
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) {
EMSG2(_("E990: Missing end marker '%s'"), marker);
break;
}
if (STRCMP(marker, theline + i) == 0) {
xfree(theline);
break;
}
tv_list_append_string(l, (char *)(theline + i), -1);
xfree(theline);
}
return l;
}
// ":let" list all variable values // ":let" list all variable values
// ":let var1 var2" list variable values // ":let var1 var2" list variable values
// ":let var = expr" assignment command. // ":let var = expr" assignment command.
@ -1560,6 +1641,17 @@ static void ex_let_const(exarg_T *eap, const bool is_const)
list_vim_vars(&first); list_vim_vars(&first);
} }
eap->nextcmd = check_nextcmd(arg); eap->nextcmd = check_nextcmd(arg);
} else if (expr[0] == '=' && expr[1] == '<' && expr[2] == '<') {
// HERE document
list_T *l = heredoc_get(eap, expr + 3);
if (l != NULL) {
tv_list_set_ret(&rettv, l);
op[0] = '=';
op[1] = NUL;
(void)ex_let_vars(eap->arg, &rettv, false, semicolon, var_count,
is_const, op);
tv_clear(&rettv);
}
} else { } else {
op[0] = '='; op[0] = '=';
op[1] = NUL; op[1] = NUL;
@ -8642,7 +8734,7 @@ typedef struct {
const listitem_T *li; const listitem_T *li;
} GetListLineCookie; } GetListLineCookie;
static char_u *get_list_line(int c, void *cookie, int indent) static char_u *get_list_line(int c, void *cookie, int indent, bool do_concat)
{ {
GetListLineCookie *const p = (GetListLineCookie *)cookie; GetListLineCookie *const p = (GetListLineCookie *)cookie;
@ -21177,6 +21269,7 @@ void ex_function(exarg_T *eap)
int indent; int indent;
int nesting; int nesting;
char_u *skip_until = NULL; char_u *skip_until = NULL;
char_u *trimmed = NULL;
dictitem_T *v; dictitem_T *v;
funcdict_T fudi; funcdict_T fudi;
static int func_nr = 0; /* number for nameless function */ static int func_nr = 0; /* number for nameless function */
@ -21186,6 +21279,7 @@ void ex_function(exarg_T *eap)
hashitem_T *hi; hashitem_T *hi;
int sourcing_lnum_off; int sourcing_lnum_off;
bool show_block = false; bool show_block = false;
bool do_concat = true;
/* /*
* ":function" without argument: list functions. * ":function" without argument: list functions.
@ -21455,9 +21549,9 @@ void ex_function(exarg_T *eap)
} else { } else {
xfree(line_to_free); xfree(line_to_free);
if (eap->getline == NULL) { if (eap->getline == NULL) {
theline = getcmdline(':', 0L, indent); theline = getcmdline(':', 0L, indent, do_concat);
} else { } else {
theline = eap->getline(':', eap->cookie, indent); theline = eap->getline(':', eap->cookie, indent, do_concat);
} }
line_to_free = theline; line_to_free = theline;
} }
@ -21480,10 +21574,15 @@ void ex_function(exarg_T *eap)
sourcing_lnum_off = 0; sourcing_lnum_off = 0;
if (skip_until != NULL) { if (skip_until != NULL) {
/* between ":append" and "." and between ":python <<EOF" and "EOF" // Between ":append" and "." and between ":python <<EOF" and "EOF"
* don't check for ":endfunc". */ // don't check for ":endfunc".
if (STRCMP(theline, skip_until) == 0) { if (trimmed == NULL || STRNCMP(theline, trimmed, STRLEN(trimmed)) == 0) {
XFREE_CLEAR(skip_until); p = trimmed == NULL ? theline : theline + STRLEN(trimmed);
if (STRCMP(p, skip_until) == 0) {
XFREE_CLEAR(skip_until);
XFREE_CLEAR(trimmed);
do_concat = true;
}
} }
} else { } else {
/* skip ':' and blanks*/ /* skip ':' and blanks*/
@ -21582,6 +21681,28 @@ void ex_function(exarg_T *eap)
else else
skip_until = vim_strsave(p); skip_until = vim_strsave(p);
} }
// Check for ":let v =<< [trim] EOF"
arg = skipwhite(skiptowhite(p));
arg = skipwhite(skiptowhite(arg));
if (arg[0] == '=' && arg[1] == '<' && arg[2] =='<'
&& ((p[0] == 'l' && p[1] == 'e'
&& (!ASCII_ISALNUM(p[2])
|| (p[2] == 't' && !ASCII_ISALNUM(p[3])))))) {
// ":let v =<<" continues until a dot
p = skipwhite(arg + 3);
if (STRNCMP(p, "trim", 4) == 0) {
// Ignore leading white space.
p = skipwhite(p + 4);
trimmed = vim_strnsave(theline, (int)(skipwhite(theline) - theline));
}
if (*p == NUL) {
skip_until = vim_strsave((char_u *)".");
} else {
skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
}
do_concat = false;
}
} }
/* Add the line to the function. */ /* Add the line to the function. */
@ -21768,7 +21889,7 @@ ret_free:
if (show_block) { if (show_block) {
ui_ext_cmdline_block_leave(); ui_ext_cmdline_block_leave();
} }
} } // NOLINT(readability/fn_size)
/// Get a function name, translating "<SID>" and "<SNR>". /// Get a function name, translating "<SID>" and "<SNR>".
/// Also handles a Funcref in a List or Dictionary. /// Also handles a Funcref in a List or Dictionary.
@ -23404,7 +23525,7 @@ char_u *get_return_cmd(void *rettv)
* Called by do_cmdline() to get the next line. * Called by do_cmdline() to get the next line.
* Returns allocated string, or NULL for end of function. * Returns allocated string, or NULL for end of function.
*/ */
char_u *get_func_line(int c, void *cookie, int indent) char_u *get_func_line(int c, void *cookie, int indent, bool do_concat)
{ {
funccall_T *fcp = (funccall_T *)cookie; funccall_T *fcp = (funccall_T *)cookie;
ufunc_T *fp = fcp->func; ufunc_T *fp = fcp->func;

4
src/nvim/ex_cmds.c
View File

@ -2767,7 +2767,7 @@ void ex_append(exarg_T *eap)
State = CMDLINE; State = CMDLINE;
theline = eap->getline( theline = eap->getline(
eap->cstack->cs_looplevel > 0 ? -1 : eap->cstack->cs_looplevel > 0 ? -1 :
NUL, eap->cookie, indent); NUL, eap->cookie, indent, true);
State = save_State; State = save_State;
} }
lines_left = Rows - 1; lines_left = Rows - 1;
@ -3630,7 +3630,7 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout,
for (; i <= (long)ec; ++i) for (; i <= (long)ec; ++i)
msg_putchar('^'); msg_putchar('^');
resp = getexmodeline('?', NULL, 0); resp = getexmodeline('?', NULL, 0, true);
if (resp != NULL) { if (resp != NULL) {
typed = *resp; typed = *resp;
xfree(resp); xfree(resp);

6
src/nvim/ex_cmds2.c
View File

@ -3218,7 +3218,7 @@ int do_source(char_u *fname, int check_other, int is_vimrc)
cookie.conv.vc_type = CONV_NONE; // no conversion cookie.conv.vc_type = CONV_NONE; // no conversion
// Read the first line so we can check for a UTF-8 BOM. // Read the first line so we can check for a UTF-8 BOM.
firstline = getsourceline(0, (void *)&cookie, 0); firstline = getsourceline(0, (void *)&cookie, 0, true);
if (firstline != NULL && STRLEN(firstline) >= 3 && firstline[0] == 0xef if (firstline != NULL && STRLEN(firstline) >= 3 && firstline[0] == 0xef
&& firstline[1] == 0xbb && firstline[2] == 0xbf) { && firstline[1] == 0xbb && firstline[2] == 0xbf) {
// Found BOM; setup conversion, skip over BOM and recode the line. // Found BOM; setup conversion, skip over BOM and recode the line.
@ -3381,7 +3381,7 @@ void free_scriptnames(void)
/// ///
/// @return pointer to the line in allocated memory, or NULL for end-of-file or /// @return pointer to the line in allocated memory, or NULL for end-of-file or
/// some error. /// some error.
char_u *getsourceline(int c, void *cookie, int indent) char_u *getsourceline(int c, void *cookie, int indent, bool do_concat)
{ {
struct source_cookie *sp = (struct source_cookie *)cookie; struct source_cookie *sp = (struct source_cookie *)cookie;
char_u *line; char_u *line;
@ -3412,7 +3412,7 @@ char_u *getsourceline(int c, void *cookie, int indent)
// Only concatenate lines starting with a \ when 'cpoptions' doesn't // Only concatenate lines starting with a \ when 'cpoptions' doesn't
// contain the 'C' flag. // contain the 'C' flag.
if (line != NULL && (vim_strchr(p_cpo, CPO_CONCAT) == NULL)) { if (line != NULL && do_concat && (vim_strchr(p_cpo, CPO_CONCAT) == NULL)) {
// compensate for the one line read-ahead // compensate for the one line read-ahead
sourcing_lnum--; sourcing_lnum--;

2
src/nvim/ex_cmds_defs.h
View File

@ -88,7 +88,7 @@ typedef struct exarg exarg_T;
typedef void (*ex_func_T)(exarg_T *eap); typedef void (*ex_func_T)(exarg_T *eap);
typedef char_u *(*LineGetter)(int, void *, int); typedef char_u *(*LineGetter)(int, void *, int, bool);
/// Structure for command definition. /// Structure for command definition.
typedef struct cmdname { typedef struct cmdname {

52
src/nvim/ex_docmd.c
View File

@ -117,11 +117,11 @@ typedef struct {
* reads more lines that may come from the while/for loop. * reads more lines that may come from the while/for loop.
*/ */
struct loop_cookie { struct loop_cookie {
garray_T *lines_gap; /* growarray with line info */ garray_T *lines_gap; // growarray with line info
int current_line; /* last read line from growarray */ int current_line; // last read line from growarray
int repeating; /* TRUE when looping a second time */ int repeating; // TRUE when looping a second time
/* When "repeating" is FALSE use "getline" and "cookie" to get lines */ // When "repeating" is FALSE use "getline" and "cookie" to get lines
char_u *(*getline)(int, void *, int); char_u *(*getline)(int, void *, int, bool);
void *cookie; void *cookie;
}; };
@ -313,8 +313,8 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
struct msglist **saved_msg_list = NULL; struct msglist **saved_msg_list = NULL;
struct msglist *private_msg_list; struct msglist *private_msg_list;
/* "fgetline" and "cookie" passed to do_one_cmd() */ // "fgetline" and "cookie" passed to do_one_cmd()
char_u *(*cmd_getline)(int, void *, int); char_u *(*cmd_getline)(int, void *, int, bool);
void *cmd_cookie; void *cmd_cookie;
struct loop_cookie cmd_loop_cookie; struct loop_cookie cmd_loop_cookie;
void *real_cookie; void *real_cookie;
@ -507,17 +507,20 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
* Need to set msg_didout for the first line after an ":if", * Need to set msg_didout for the first line after an ":if",
* otherwise the ":if" will be overwritten. * otherwise the ":if" will be overwritten.
*/ */
if (count == 1 && getline_equal(fgetline, cookie, getexline)) if (count == 1 && getline_equal(fgetline, cookie, getexline)) {
msg_didout = TRUE; msg_didout = true;
if (fgetline == NULL || (next_cmdline = fgetline(':', cookie, }
cstack.cs_idx < if (fgetline == NULL
0 ? 0 : (cstack.cs_idx + 1) * 2 || (next_cmdline = fgetline(':', cookie,
)) == NULL) { cstack.cs_idx <
/* Don't call wait_return for aborted command line. The NULL 0 ? 0 : (cstack.cs_idx + 1) * 2,
* returned for the end of a sourced file or executed function true)) == NULL) {
* doesn't do this. */ // Don't call wait_return for aborted command line. The NULL
if (KeyTyped && !(flags & DOCMD_REPEAT)) // returned for the end of a sourced file or executed function
need_wait_return = FALSE; // doesn't do this.
if (KeyTyped && !(flags & DOCMD_REPEAT)) {
need_wait_return = false;
}
retval = FAIL; retval = FAIL;
break; break;
} }
@ -951,7 +954,7 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
/* /*
* Obtain a line when inside a ":while" or ":for" loop. * Obtain a line when inside a ":while" or ":for" loop.
*/ */
static char_u *get_loop_line(int c, void *cookie, int indent) static char_u *get_loop_line(int c, void *cookie, int indent, bool do_concat)
{ {
struct loop_cookie *cp = (struct loop_cookie *)cookie; struct loop_cookie *cp = (struct loop_cookie *)cookie;
wcmd_T *wp; wcmd_T *wp;
@ -961,11 +964,12 @@ static char_u *get_loop_line(int c, void *cookie, int indent)
if (cp->repeating) if (cp->repeating)
return NULL; /* trying to read past ":endwhile"/":endfor" */ return NULL; /* trying to read past ":endwhile"/":endfor" */
/* First time inside the ":while"/":for": get line normally. */ // First time inside the ":while"/":for": get line normally.
if (cp->getline == NULL) if (cp->getline == NULL) {
line = getcmdline(c, 0L, indent); line = getcmdline(c, 0L, indent, do_concat);
else } else {
line = cp->getline(c, cp->cookie, indent); line = cp->getline(c, cp->cookie, indent, do_concat);
}
if (line != NULL) { if (line != NULL) {
store_loop_line(cp->lines_gap, line); store_loop_line(cp->lines_gap, line);
++cp->current_line; ++cp->current_line;

23
src/nvim/ex_getln.c
View File

@ -1991,7 +1991,8 @@ char_u *
getcmdline ( getcmdline (
int firstc, int firstc,
long count, // only used for incremental search long count, // only used for incremental search
int indent // indent for inside conditionals int indent, // indent for inside conditionals
bool do_concat // unused
) )
{ {
// Be prepared for situations where cmdline can be invoked recursively. // Be prepared for situations where cmdline can be invoked recursively.
@ -2167,17 +2168,18 @@ static void correct_screencol(int idx, int cells, int *col)
* Get an Ex command line for the ":" command. * Get an Ex command line for the ":" command.
*/ */
char_u * char_u *
getexline ( getexline(
int c, /* normally ':', NUL for ":append" */ int c, // normally ':', NUL for ":append"
void *cookie, void *cookie,
int indent /* indent for inside conditionals */ int indent, // indent for inside conditionals
bool do_concat
) )
{ {
/* When executing a register, remove ':' that's in front of each line. */ /* When executing a register, remove ':' that's in front of each line. */
if (exec_from_reg && vpeekc() == ':') if (exec_from_reg && vpeekc() == ':')
(void)vgetc(); (void)vgetc();
return getcmdline(c, 1L, indent); return getcmdline(c, 1L, indent, do_concat);
} }
/* /*
@ -2187,11 +2189,12 @@ getexline (
* Returns a string in allocated memory or NULL. * Returns a string in allocated memory or NULL.
*/ */
char_u * char_u *
getexmodeline ( getexmodeline(
int promptc, /* normally ':', NUL for ":append" and '?' for int promptc, // normally ':', NUL for ":append" and '?'
:s prompt */ // for :s prompt
void *cookie, void *cookie,
int indent /* indent for inside conditionals */ int indent, // indent for inside conditionals
bool do_concat
) )
{ {
garray_T line_ga; garray_T line_ga;
@ -6308,7 +6311,7 @@ char *script_get(exarg_T *const eap, size_t *const lenp)
for (;;) { for (;;) {
char *const theline = (char *)eap->getline( char *const theline = (char *)eap->getline(
eap->cstack->cs_looplevel > 0 ? -1 : eap->cstack->cs_looplevel > 0 ? -1 :
NUL, eap->cookie, 0); NUL, eap->cookie, 0, true);
if (theline == NULL || strcmp(end_pattern, theline) == 0) { if (theline == NULL || strcmp(end_pattern, theline) == 0) {
xfree(theline); xfree(theline);

10
src/nvim/fileio.c
View File

@ -7100,12 +7100,10 @@ auto_next_pat(
} }
} }
/* /// Get next autocommand command.
* Get next autocommand command. /// Called by do_cmdline() to get the next line for ":if".
* Called by do_cmdline() to get the next line for ":if". /// @return allocated string, or NULL for end of autocommands.
* Returns allocated string, or NULL for end of autocommands. char_u *getnextac(int c, void *cookie, int indent, bool do_concat)
*/
char_u *getnextac(int c, void *cookie, int indent)
{ {
AutoPatCmd *acp = (AutoPatCmd *)cookie; AutoPatCmd *acp = (AutoPatCmd *)cookie;
char_u *retval; char_u *retval;

2
src/nvim/getchar.c
View File

@ -4419,7 +4419,7 @@ mapblock_T *get_maphash(int index, buf_T *buf)
} }
/// Get command argument for <Cmd> key /// Get command argument for <Cmd> key
char_u * getcmdkeycmd(int promptc, void *cookie, int indent) char_u * getcmdkeycmd(int promptc, void *cookie, int indent, bool do_concat)
{ {
garray_T line_ga; garray_T line_ga;
int c1 = -1, c2; int c1 = -1, c2;

2
src/nvim/normal.c
View File

@ -5343,7 +5343,7 @@ static void nv_search(cmdarg_T *cap)
// When using 'incsearch' the cursor may be moved to set a different search // When using 'incsearch' the cursor may be moved to set a different search
// start position. // start position.
cap->searchbuf = getcmdline(cap->cmdchar, cap->count1, 0); cap->searchbuf = getcmdline(cap->cmdchar, cap->count1, 0, true);
if (cap->searchbuf == NULL) { if (cap->searchbuf == NULL) {
clearop(oap); clearop(oap);

10
src/nvim/ops.c
View File

@ -671,13 +671,15 @@ int get_expr_register(void)
{ {
char_u *new_line; char_u *new_line;
new_line = getcmdline('=', 0L, 0); new_line = getcmdline('=', 0L, 0, true);
if (new_line == NULL) if (new_line == NULL) {
return NUL; return NUL;
if (*new_line == NUL) /* use previous line */ }
if (*new_line == NUL) { // use previous line
xfree(new_line); xfree(new_line);
else } else {
set_expr_line(new_line); set_expr_line(new_line);
}
return '='; return '=';
} }

102
src/nvim/testdir/test_autocmd.vim
View File

@ -425,18 +425,20 @@ func Test_autocmd_bufwipe_in_SessLoadPost()
set noswapfile set noswapfile
mksession! mksession!
let content = ['set nocp noswapfile', let content =<< trim [CODE]
\ 'let v:swapchoice="e"', set nocp noswapfile
\ 'augroup test_autocmd_sessionload', let v:swapchoice="e"
\ 'autocmd!', augroup test_autocmd_sessionload
\ 'autocmd SessionLoadPost * exe bufnr("Xsomething") . "bw!"', autocmd!
\ 'augroup END', autocmd SessionLoadPost * exe bufnr("Xsomething") . "bw!"
\ '', augroup END
\ 'func WriteErrors()',
\ ' call writefile([execute("messages")], "Xerrors")', func WriteErrors()
\ 'endfunc', call writefile([execute("messages")], "Xerrors")
\ 'au VimLeave * call WriteErrors()', endfunc
\ ] au VimLeave * call WriteErrors()
[CODE]
call writefile(content, 'Xvimrc') call writefile(content, 'Xvimrc')
call system(v:progpath. ' --headless -i NONE -u Xvimrc --noplugins -S Session.vim -c cq') call system(v:progpath. ' --headless -i NONE -u Xvimrc --noplugins -S Session.vim -c cq')
let errors = join(readfile('Xerrors')) let errors = join(readfile('Xerrors'))
@ -454,27 +456,29 @@ func Test_autocmd_bufwipe_in_SessLoadPost2()
set noswapfile set noswapfile
mksession! mksession!
let content = ['set nocp noswapfile', let content =<< trim [CODE]
\ 'function! DeleteInactiveBufs()', set nocp noswapfile
\ ' tabfirst', function! DeleteInactiveBufs()
\ ' let tabblist = []', tabfirst
\ ' for i in range(1, tabpagenr(''$''))', let tabblist = []
\ ' call extend(tabblist, tabpagebuflist(i))', for i in range(1, tabpagenr(''$''))
\ ' endfor', call extend(tabblist, tabpagebuflist(i))
\ ' for b in range(1, bufnr(''$''))', endfor
\ ' if bufexists(b) && buflisted(b) && (index(tabblist, b) == -1 || bufname(b) =~# ''^$'')', for b in range(1, bufnr(''$''))
\ ' exec ''bwipeout '' . b', if bufexists(b) && buflisted(b) && (index(tabblist, b) == -1 || bufname(b) =~# ''^$'')
\ ' endif', exec ''bwipeout '' . b
\ ' endfor', endif
\ ' echomsg "SessionLoadPost DONE"', endfor
\ 'endfunction', echomsg "SessionLoadPost DONE"
\ 'au SessionLoadPost * call DeleteInactiveBufs()', endfunction
\ '', au SessionLoadPost * call DeleteInactiveBufs()
\ 'func WriteErrors()',
\ ' call writefile([execute("messages")], "Xerrors")', func WriteErrors()
\ 'endfunc', call writefile([execute("messages")], "Xerrors")
\ 'au VimLeave * call WriteErrors()', endfunc
\ ] au VimLeave * call WriteErrors()
[CODE]
call writefile(content, 'Xvimrc') call writefile(content, 'Xvimrc')
call system(v:progpath. ' --headless -i NONE -u Xvimrc --noplugins -S Session.vim -c cq') call system(v:progpath. ' --headless -i NONE -u Xvimrc --noplugins -S Session.vim -c cq')
let errors = join(readfile('Xerrors')) let errors = join(readfile('Xerrors'))
@ -936,21 +940,23 @@ func Test_bufunload_all()
call writefile(['Test file Xxx1'], 'Xxx1')" call writefile(['Test file Xxx1'], 'Xxx1')"
call writefile(['Test file Xxx2'], 'Xxx2')" call writefile(['Test file Xxx2'], 'Xxx2')"
let content = [ let content =<< trim [CODE]
\ "func UnloadAllBufs()", func UnloadAllBufs()
\ " let i = 1", let i = 1
\ " while i <= bufnr('$')", while i <= bufnr('$')
\ " if i != bufnr('%') && bufloaded(i)", if i != bufnr('%') && bufloaded(i)
\ " exe i . 'bunload'", exe i . 'bunload'
\ " endif", endif
\ " let i += 1", let i += 1
\ " endwhile", endwhile
\ "endfunc", endfunc
\ "au BufUnload * call UnloadAllBufs()", au BufUnload * call UnloadAllBufs()
\ "au VimLeave * call writefile(['Test Finished'], 'Xout')", au VimLeave * call writefile(['Test Finished'], 'Xout')
\ "edit Xxx1", edit Xxx1
\ "split Xxx2", split Xxx2
\ "q"] q
[CODE]
call writefile(content, 'Xtest') call writefile(content, 'Xtest')
call delete('Xout') call delete('Xout')

60
src/nvim/testdir/test_cindent.vim
View File

@ -18,25 +18,25 @@ endfunc
func Test_cino_extern_c() func Test_cino_extern_c()
" Test for cino-E " Test for cino-E
let without_ind = [ 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]
let with_ind = [ let with_ind =<< trim [CODE]
\ '#ifdef __cplusplus', #ifdef __cplusplus
\ 'extern "C" {', extern "C" {
\ '#endif', #endif
\ "\tint func_a(void);", int func_a(void);
\ '#ifdef __cplusplus', #ifdef __cplusplus
\ '}', }
\ '#endif' #endif
\ ] [CODE]
new new
setlocal cindent cinoptions=E0 setlocal cindent cinoptions=E0
call setline(1, without_ind) call setline(1, without_ind)
@ -89,16 +89,32 @@ func Test_cindent_expr()
return v:lnum == 1 ? shiftwidth() : 0 return v:lnum == 1 ? shiftwidth() : 0
endfunc endfunc
setl expandtab sw=8 indentkeys+=; indentexpr=MyIndentFunction() setl expandtab sw=8 indentkeys+=; indentexpr=MyIndentFunction()
call setline(1, ['var_a = something()', 'b = something()']) let testinput =<< trim [CODE]
var_a = something()
b = something()
[CODE]
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')
call assert_equal([' var_a = something();', 'b = something();'], getline(1, '$')) let expected =<< trim [CODE]
var_a = something();
b = something();
[CODE]
call assert_equal(expected, getline(1, '$'))
%d %d
call setline(1, [' var_a = something()', ' b = something()']) let testinput =<< trim [CODE]
var_a = something()
b = something()
[CODE]
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')
call assert_equal([' var_a = something();', ' b = something()'], getline(1, '$')) let expected =<< trim [CODE]
var_a = something();
b = something()
[CODE]
call assert_equal(expected, getline(1, '$'))
bw! bw!
endfunc endfunc

66
src/nvim/testdir/test_exit.vim
View File

@ -3,52 +3,56 @@
source shared.vim source shared.vim
func Test_exiting() func Test_exiting()
let after = [ let after =<< trim [CODE]
\ 'au QuitPre * call writefile(["QuitPre"], "Xtestout")', au QuitPre * call writefile(["QuitPre"], "Xtestout")
\ 'au ExitPre * call writefile(["ExitPre"], "Xtestout", "a")', au ExitPre * call writefile(["ExitPre"], "Xtestout", "a")
\ 'quit', quit
\ ] [CODE]
if RunVim([], after, '') if RunVim([], after, '')
call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout')) call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout'))
endif endif
call delete('Xtestout') call delete('Xtestout')
let after = [ let after =<< trim [CODE]
\ 'au QuitPre * call writefile(["QuitPre"], "Xtestout")', au QuitPre * call writefile(["QuitPre"], "Xtestout")
\ 'au ExitPre * call writefile(["ExitPre"], "Xtestout", "a")', au ExitPre * call writefile(["ExitPre"], "Xtestout", "a")
\ 'help', help
\ 'wincmd w', wincmd w
\ 'quit', quit
\ ] [CODE]
if RunVim([], after, '') if RunVim([], after, '')
call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout')) call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout'))
endif endif
call delete('Xtestout') call delete('Xtestout')
let after = [ let after =<< trim [CODE]
\ 'au QuitPre * call writefile(["QuitPre"], "Xtestout")', au QuitPre * call writefile(["QuitPre"], "Xtestout")
\ 'au ExitPre * call writefile(["ExitPre"], "Xtestout", "a")', au ExitPre * call writefile(["ExitPre"], "Xtestout", "a")
\ 'split', split
\ 'new', new
\ 'qall', qall
\ ] [CODE]
if RunVim([], after, '') if RunVim([], after, '')
call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout')) call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout'))
endif endif
call delete('Xtestout') call delete('Xtestout')
let after = [ let after =<< trim [CODE]
\ 'au QuitPre * call writefile(["QuitPre"], "Xtestout", "a")', au QuitPre * call writefile(["QuitPre"], "Xtestout", "a")
\ 'au ExitPre * call writefile(["ExitPre"], "Xtestout", "a")', au ExitPre * call writefile(["ExitPre"], "Xtestout", "a")
\ 'augroup nasty', augroup nasty
\ ' au ExitPre * split', au ExitPre * split
\ 'augroup END', augroup END
\ 'quit', quit
\ 'augroup nasty', augroup nasty
\ ' au! ExitPre', au! ExitPre
\ 'augroup END', augroup END
\ 'quit', quit
\ ] [CODE]
if RunVim([], after, '') if RunVim([], after, '')
call assert_equal(['QuitPre', 'ExitPre', 'QuitPre', 'ExitPre'], call assert_equal(['QuitPre', 'ExitPre', 'QuitPre', 'ExitPre'],
\ readfile('Xtestout')) \ readfile('Xtestout'))

23
src/nvim/testdir/test_fold.vim
View File

@ -520,17 +520,18 @@ func Test_fold_create_marker_in_C()
set fdm=marker fdl=9 set fdm=marker fdl=9
set filetype=c set filetype=c
let content = [ let content =<< trim [CODE]
\ '/*', /*
\ ' * comment', * comment
\ ' * ', *
\ ' *', *
\ ' */', */
\ 'int f(int* p) {', int f(int* p) {
\ ' *p = 3;', *p = 3;
\ ' return 0;', return 0;
\ '}' }
\] [CODE]
for c in range(len(content) - 1) for c in range(len(content) - 1)
bw! bw!
call append(0, content) call append(0, content)

406
src/nvim/testdir/test_goto.vim
View File

@ -15,262 +15,283 @@ func XTest_goto_decl(cmd, lines, line, col)
endfunc endfunc
func Test_gD() func Test_gD()
let lines = [ let lines =<< trim [CODE]
\ 'int x;', int x;
\ '',
\ 'int func(void)', int func(void)
\ '{', {
\ ' return x;', return x;
\ '}', }
\ ] [CODE]
call XTest_goto_decl('gD', lines, 1, 5) call XTest_goto_decl('gD', lines, 1, 5)
endfunc endfunc
func Test_gD_too() func Test_gD_too()
let lines = [ let lines =<< trim [CODE]
\ 'Filename x;', Filename x;
\ '',
\ 'int Filename', int Filename
\ 'int func() {', int func() {
\ ' Filename x;', Filename x;
\ ' return x;', return x;
\ ] [CODE]
call XTest_goto_decl('gD', lines, 1, 10) call XTest_goto_decl('gD', lines, 1, 10)
endfunc endfunc
func Test_gD_comment() func Test_gD_comment()
let lines = [ let lines =<< trim [CODE]
\ '/* int x; */', /* int x; */
\ 'int x;', int x;
\ '',
\ 'int func(void)', int func(void)
\ '{', {
\ ' return x;', return x;
\ '}', }
\ ] [CODE]
call XTest_goto_decl('gD', lines, 2, 5) call XTest_goto_decl('gD', lines, 2, 5)
endfunc endfunc
func Test_gD_inline_comment() func Test_gD_inline_comment()
let lines = [ 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]
call XTest_goto_decl('gD', lines, 2, 5) call XTest_goto_decl('gD', lines, 2, 5)
endfunc endfunc
func Test_gD_string() func Test_gD_string()
let lines = [ 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]
call XTest_goto_decl('gD', lines, 2, 5) call XTest_goto_decl('gD', lines, 2, 5)
endfunc endfunc
func Test_gD_string_same_line() func Test_gD_string_same_line()
let lines = [ 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]
call XTest_goto_decl('gD', lines, 1, 22) call XTest_goto_decl('gD', lines, 1, 22)
endfunc endfunc
func Test_gD_char() func Test_gD_char()
let lines = [ 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]
call XTest_goto_decl('gD', lines, 2, 5) call XTest_goto_decl('gD', lines, 2, 5)
endfunc endfunc
func Test_gd() func Test_gd()
let lines = [ let lines =<< trim [CODE]
\ 'int x;', int x;
\ '',
\ 'int func(int x)', int func(int x)
\ '{', {
\ ' return x;', return x;
\ '}', }
\ ] [CODE]
call XTest_goto_decl('gd', lines, 3, 14) call XTest_goto_decl('gd', lines, 3, 14)
endfunc endfunc
func Test_gd_not_local() func Test_gd_not_local()
let lines = [ 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]
call XTest_goto_decl('gd', lines, 3, 10) call XTest_goto_decl('gd', lines, 3, 10)
endfunc endfunc
func Test_gd_kr_style() func Test_gd_kr_style()
let lines = [ let lines =<< trim [CODE]
\ 'int func(x)', int func(x)
\ ' int x;', int x;
\ '{', {
\ ' return x;', return x;
\ '}', }
\ ] [CODE]
call XTest_goto_decl('gd', lines, 2, 7) call XTest_goto_decl('gd', lines, 2, 7)
endfunc endfunc
func Test_gd_missing_braces() func Test_gd_missing_braces()
let lines = [ 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]
call XTest_goto_decl('gd', lines, 1, 11) call XTest_goto_decl('gd', lines, 1, 11)
endfunc endfunc
func Test_gd_comment() func Test_gd_comment()
let lines = [ let lines =<< trim [CODE]
\ 'int func(void)', int func(void)
\ '{', {
\ ' /* int x; */', /* int x; */
\ ' int x;', int x;
\ ' return x;', return x;
\ '}', }
\] [CODE]
call XTest_goto_decl('gd', lines, 4, 7) call XTest_goto_decl('gd', lines, 4, 7)
endfunc endfunc
func Test_gd_comment_in_string() func Test_gd_comment_in_string()
let lines = [ 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]
call XTest_goto_decl('gd', lines, 3, 22) call XTest_goto_decl('gd', lines, 3, 22)
endfunc endfunc
func Test_gd_string_in_comment() func Test_gd_string_in_comment()
set comments= set comments=
let lines = [ let lines =<< trim [CODE]
\ 'int func(void)', int func(void)
\ '{', {
\ ' /* " */ int x;', /* " */ int x;
\ ' int x;', int x;
\ ' return x;', return x;
\ '}', }
\] [CODE]
call XTest_goto_decl('gd', lines, 3, 15) call XTest_goto_decl('gd', lines, 3, 15)
set comments& set comments&
endfunc endfunc
func Test_gd_inline_comment() func Test_gd_inline_comment()
let lines = [ 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]
call XTest_goto_decl('gd', lines, 1, 32) call XTest_goto_decl('gd', lines, 1, 32)
endfunc endfunc
func Test_gd_inline_comment_only() func Test_gd_inline_comment_only()
let lines = [ let lines =<< trim [CODE]
\ 'int func(void) /* one lonely x */', int func(void) /* one lonely x */
\ '{', {
\ ' return x;', return x;
\ '}', }
\ ] [CODE]
call XTest_goto_decl('gd', lines, 3, 10) call XTest_goto_decl('gd', lines, 3, 10)
endfunc endfunc
func Test_gd_inline_comment_body() func Test_gd_inline_comment_body()
let lines = [ 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]
call XTest_goto_decl('gd', lines, 7, 7) call XTest_goto_decl('gd', lines, 7, 7)
endfunc endfunc
func Test_gd_trailing_multiline_comment() func Test_gd_trailing_multiline_comment()
let lines = [ 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]
call XTest_goto_decl('gd', lines, 1, 14) call XTest_goto_decl('gd', lines, 1, 14)
endfunc endfunc
func Test_gd_trailing_comment() func Test_gd_trailing_comment()
let lines = [ 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]
call XTest_goto_decl('gd', lines, 1, 14) call XTest_goto_decl('gd', lines, 1, 14)
endfunc endfunc
func Test_gd_string() func Test_gd_string()
let lines = [ 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]
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 = [ let lines =<< trim [CODE]
\ 'int func(void)', int func(void)
\ '{', {
\ ' char *s = "x";', char *s = "x";
\ '',
\ ' return x;', return x;
\ '}', }
\ ] [CODE]
call XTest_goto_decl('gd', lines, 5, 10) call XTest_goto_decl('gd', lines, 5, 10)
endfunc endfunc
@ -289,24 +310,25 @@ func Test_cursorline_keep_col()
endfunc endfunc
func Test_gd_local_block() func Test_gd_local_block()
let lines = [ let lines =<< trim [CODE]
\ ' int main()', int main()
\ '{', {
\ ' char *a = "NOT NULL";', char *a = "NOT NULL";
\ ' if(a)', if(a)
\ ' {', {
\ ' char *b = a;', char *b = a;
\ ' printf("%s\n", b);', printf("%s\n", b);
\ ' }', }
\ ' else', else
\ ' {', {
\ ' char *b = "NULL";', char *b = "NULL";
\ ' return b;', return b;
\ ' }', }
\ '',
\ ' return 0;', return 0;
\ '}', }
\ ] [CODE]
call XTest_goto_decl('1gd', lines, 11, 11) call XTest_goto_decl('1gd', lines, 11, 11)
endfunc endfunc

106
src/nvim/testdir/test_let.vim
View File

@ -140,3 +140,109 @@ func Test_let_varg_fail()
call assert_fails('call s:set_varg7(1)', 'E742:') call assert_fails('call s:set_varg7(1)', 'E742:')
call s:set_varg8([0]) call s:set_varg8([0])
endfunction endfunction
func Test_let_heredoc_fails()
call assert_fails('let v =<< marker', 'E991:')
let text =<< trim END
func WrongSyntax()
let v =<< that there
endfunc
END
call writefile(text, 'XheredocFail')
call assert_fails('source XheredocFail', 'E126:')
call delete('XheredocFail')
let text =<< trim END
func MissingEnd()
let v =<< END
endfunc
END
call writefile(text, 'XheredocWrong')
call assert_fails('source XheredocWrong', 'E126:')
call delete('XheredocWrong')
endfunc
" Test for the setting a variable using the heredoc syntax
func Test_let_heredoc()
let var1 =<< END
Some sample text
Text with indent
!@#$%^&*()-+_={}|[]\~`:";'<>?,./
END
call assert_equal(["Some sample text", "\tText with indent", " !@#$%^&*()-+_={}|[]\\~`:\";'<>?,./"], var1)
let var2 =<<
Editor
.
call assert_equal(['Editor'], var2)
let var3 =<<END
END
call assert_equal([], var3)
let var3 =<<END
vim
end
END
END
END
call assert_equal(['vim', '', 'end', ' END', 'END '], var3)
let var1 =<< trim END
Line1
Line2
Line3
END
END
call assert_equal(['Line1', ' Line2', "\tLine3", ' END'], var1)
let var1 =<< trim
Line1
.
call assert_equal([' Line1'], var1)
" ignore "endfunc"
let var1 =<< END
something
endfunc
END
call assert_equal(['something', 'endfunc'], var1)
" ignore "endfunc" with trim
let var1 =<< trim END
something
endfunc
END
call assert_equal(['something', 'endfunc'], var1)
" ignore "python << xx"
let var1 =<<END
something
python << xx
END
call assert_equal(['something', 'python << xx'], var1)
" ignore "python << xx" with trim
let var1 =<< trim END
something
python << xx
END
call assert_equal(['something', 'python << xx'], var1)
" ignore "append"
let var1 =<<
something
app
.
call assert_equal(['something', 'app'], var1)
" ignore "append" with trim
let var1 =<< trim
something
app
.
call assert_equal(['something', 'app'], var1)
endfunc

57
src/nvim/testdir/test_mksession_utf8.vim
View File

@ -65,34 +65,35 @@ func Test_mksession_utf8()
call wincol() call wincol()
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 = [ let expected =<< trim [DATA]
\ 'normal! 016|', normal! 016|
\ 'normal! 016|', normal! 016|
\ 'normal! 016|', normal! 016|
\ 'normal! 08|', normal! 08|
\ 'normal! 08|', normal! 08|
\ 'normal! 016|', normal! 016|
\ 'normal! 016|', normal! 016|
\ 'normal! 016|', normal! 016|
\ " exe 'normal! ' . s:c . '|zs' . 16 . '|'", exe 'normal! ' . s:c . '|zs' . 16 . '|'
\ " normal! 016|", normal! 016|
\ " exe 'normal! ' . s:c . '|zs' . 16 . '|'", exe 'normal! ' . s:c . '|zs' . 16 . '|'
\ " normal! 016|", normal! 016|
\ " exe 'normal! ' . s:c . '|zs' . 16 . '|'", exe 'normal! ' . s:c . '|zs' . 16 . '|'
\ " normal! 016|", normal! 016|
\ " exe 'normal! ' . s:c . '|zs' . 8 . '|'", exe 'normal! ' . s:c . '|zs' . 8 . '|'
\ " normal! 08|", normal! 08|
\ " exe 'normal! ' . s:c . '|zs' . 8 . '|'", exe 'normal! ' . s:c . '|zs' . 8 . '|'
\ " normal! 08|", normal! 08|
\ " exe 'normal! ' . s:c . '|zs' . 16 . '|'", exe 'normal! ' . s:c . '|zs' . 16 . '|'
\ " normal! 016|", normal! 016|
\ " exe 'normal! ' . s:c . '|zs' . 16 . '|'", exe 'normal! ' . s:c . '|zs' . 16 . '|'
\ " normal! 016|", normal! 016|
\ " exe 'normal! ' . s:c . '|zs' . 16 . '|'", exe 'normal! ' . s:c . '|zs' . 16 . '|'
\ " normal! 016|", normal! 016|
\ " exe 'normal! ' . s:c . '|zs' . 16 . '|'", exe 'normal! ' . s:c . '|zs' . 16 . '|'
\ " normal! 016|" normal! 016|
\ ] [DATA]
call assert_equal(expected, li) call assert_equal(expected, li)
tabclose! tabclose!

181
src/nvim/testdir/test_normal.vim
View File

@ -1563,52 +1563,94 @@ endfunc
fun! Test_normal29_brace() fun! Test_normal29_brace()
" basic test for { and } movements " basic test for { and } movements
let text= ['A paragraph begins after each empty line, and also at each of a set of', let text =<< trim [DATA]
\ 'paragraph macros, specified by the pairs of characters in the ''paragraphs''', A paragraph begins after each empty line, and also at each of a set of
\ 'option. The default is "IPLPPPQPP TPHPLIPpLpItpplpipbp", which corresponds to', paragraph macros, specified by the pairs of characters in the 'paragraphs'
\ 'the macros ".IP", ".LP", etc. (These are nroff macros, so the dot must be in', option. The default is "IPLPPPQPP TPHPLIPpLpItpplpipbp", which corresponds to
\ 'the first column). A section boundary is also a paragraph boundary.', the macros ".IP", ".LP", etc. (These are nroff macros, so the dot must be in
\ 'Note that a blank line (only containing white space) is NOT a paragraph', the first column). A section boundary is also a paragraph boundary.
\ 'boundary.', Note that a blank line (only containing white space) is NOT a paragraph
\ '', boundary.
\ '',
\ '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', Also note that this does not include a '{' or '}' in the first column. When
\ 'paragraph boundary |posix|.', the '{' flag is in 'cpoptions' then '{' in the first column is used as a
\ '{', paragraph boundary |posix|.
\ 'This is no paragraph', {
\ 'unless the ''{'' is set', This is no paragraph
\ 'in ''cpoptions''', unless the '{' is set
\ '}', in 'cpoptions'
\ '.IP', }
\ 'The nroff macros IP separates a paragraph', .IP
\ 'That means, it must be a ''.''', The nroff macros IP separates a paragraph
\ 'followed by IP', That means, it must be a '.'
\ '.LPIt does not matter, if afterwards some', followed by IP
\ 'more characters follow.', .LPIt does not matter, if afterwards some
\ '.SHAlso section boundaries from the nroff', more characters follow.
\ 'macros terminate a paragraph. That means', .SHAlso section boundaries from the nroff
\ 'a character like this:', macros terminate a paragraph. That means
\ '.NH', a character like this:
\ 'End of text here'] .NH
End of text here
[DATA]
new new
call append(0, text) call append(0, text)
1 1
norm! 0d2} norm! 0d2}
call assert_equal(['.IP',
\ 'The nroff macros IP separates a paragraph', 'That means, it must be a ''.''', 'followed by IP', let expected =<< trim [DATA]
\ '.LPIt does not matter, if afterwards some', 'more characters follow.', '.SHAlso section boundaries from the nroff', .IP
\ 'macros terminate a paragraph. That means', 'a character like this:', '.NH', 'End of text here', ''], getline(1,'$')) The nroff macros IP separates a paragraph
That means, it must be a '.'
followed by IP
.LPIt does not matter, if afterwards some
more characters follow.
.SHAlso section boundaries from the nroff
macros terminate a paragraph. That means
a character like this:
.NH
End of text here
[DATA]
call assert_equal(expected, getline(1, '$'))
norm! 0d} norm! 0d}
call assert_equal(['.LPIt does not matter, if afterwards some', 'more characters follow.',
\ '.SHAlso section boundaries from the nroff', 'macros terminate a paragraph. That means', let expected =<< trim [DATA]
\ 'a character like this:', '.NH', 'End of text here', ''], getline(1, '$')) .LPIt does not matter, if afterwards some
more characters follow.
.SHAlso section boundaries from the nroff
macros terminate a paragraph. That means
a character like this:
.NH
End of text here
[DATA]
call assert_equal(expected, getline(1, '$'))
$ $
norm! d{ norm! d{
call assert_equal(['.LPIt does not matter, if afterwards some', 'more characters follow.',
\ '.SHAlso section boundaries from the nroff', 'macros terminate a paragraph. That means', 'a character like this:', ''], getline(1, '$')) let expected =<< trim [DATA]
.LPIt does not matter, if afterwards some
more characters follow.
.SHAlso section boundaries from the nroff
macros terminate a paragraph. That means
a character like this:
[DATA]
call assert_equal(expected, getline(1, '$'))
norm! d{ norm! d{
call assert_equal(['.LPIt does not matter, if afterwards some', 'more characters follow.', ''], getline(1,'$'))
let expected =<< trim [DATA]
.LPIt does not matter, if afterwards some
more characters follow.
[DATA]
call assert_equal(expected, getline(1, '$'))
" Test with { in cpooptions " Test with { in cpooptions
%d %d
call append(0, text) call append(0, text)
@ -1616,21 +1658,62 @@ fun! Test_normal29_brace()
" set cpo+={ " set cpo+={
" 1 " 1
" norm! 0d2} " norm! 0d2}
" call assert_equal(['{', 'This is no paragraph', 'unless the ''{'' is set', 'in ''cpoptions''', '}', " let expected =<< trim [DATA]
" \ '.IP', 'The nroff macros IP separates a paragraph', 'That means, it must be a ''.''', " {
" \ 'followed by IP', '.LPIt does not matter, if afterwards some', 'more characters follow.', " This is no paragraph
" \ '.SHAlso section boundaries from the nroff', 'macros terminate a paragraph. That means', " unless the '{' is set
" \ 'a character like this:', '.NH', 'End of text here', ''], getline(1,'$')) " in 'cpoptions'
" }
" .IP
" The nroff macros IP separates a paragraph
" That means, it must be a '.'
" followed by IP
" .LPIt does not matter, if afterwards some
" more characters follow.
" .SHAlso section boundaries from the nroff
" macros terminate a paragraph. That means
" a character like this:
" .NH
" End of text here
"
" [DATA]
" call assert_equal(expected, getline(1, '$'))
"
" $ " $
" norm! d} " norm! d}
" call assert_equal(['{', 'This is no paragraph', 'unless the ''{'' is set', 'in ''cpoptions''', '}', " let expected =<< trim [DATA]
" \ '.IP', 'The nroff macros IP separates a paragraph', 'That means, it must be a ''.''', " {
" \ 'followed by IP', '.LPIt does not matter, if afterwards some', 'more characters follow.', " This is no paragraph
" \ '.SHAlso section boundaries from the nroff', 'macros terminate a paragraph. That means', " unless the '{' is set
" \ 'a character like this:', '.NH', 'End of text here', ''], getline(1,'$')) " in 'cpoptions'
" }
" .IP
" The nroff macros IP separates a paragraph
" That means, it must be a '.'
" followed by IP
" .LPIt does not matter, if afterwards some
" more characters follow.
" .SHAlso section boundaries from the nroff
" macros terminate a paragraph. That means
" a character like this:
" .NH
" End of text here
"
" [DATA]
" call assert_equal(expected, getline(1, '$'))
"
" norm! gg} " norm! gg}
" norm! d5} " norm! d5}
" call assert_equal(['{', 'This is no paragraph', 'unless the ''{'' is set', 'in ''cpoptions''', '}', ''], getline(1,'$')) "
" let expected =<< trim [DATA]
" {
" This is no paragraph
" unless the '{' is set
" in 'cpoptions'
" }
" [DATA]
" call assert_equal(expected, getline(1, '$'))
" clean up " clean up
set cpo-={ set cpo-={

266
src/nvim/testdir/test_profile.vim
View File

@ -6,34 +6,34 @@ endif
source screendump.vim source screendump.vim
func Test_profile_func() func Test_profile_func()
let lines = [ let lines =<< trim [CODE]
\ 'profile start Xprofile_func.log', profile start Xprofile_func.log
\ 'profile func Foo*"', profile func Foo*
\ "func! Foo1()", func! Foo1()
\ "endfunc", endfunc
\ "func! Foo2()", func! Foo2()
\ " let l:count = 100", let l:count = 100
\ " while l:count > 0", while l:count > 0
\ " let l:count = l:count - 1", let l:count = l:count - 1
\ " endwhile", endwhile
\ "endfunc", endfunc
\ "func! Foo3()", func! Foo3()
\ "endfunc", endfunc
\ "func! Bar()", func! Bar()
\ "endfunc", endfunc
\ "call Foo1()", call Foo1()
\ "call Foo1()", call Foo1()
\ "profile pause", profile pause
\ "call Foo1()", call Foo1()
\ "profile continue", profile continue
\ "call Foo2()", call Foo2()
\ "call Foo3()", call Foo3()
\ "call Bar()", call Bar()
\ "if !v:profiling", if !v:profiling
\ " delfunc Foo2", delfunc Foo2
\ "endif", endif
\ "delfunc Foo3", delfunc Foo3
\ ] [CODE]
call writefile(lines, 'Xprofile_func.vim') call writefile(lines, 'Xprofile_func.vim')
call system(v:progpath call system(v:progpath
@ -88,38 +88,38 @@ func Test_profile_func()
endfunc endfunc
func Test_profile_func_with_ifelse() func Test_profile_func_with_ifelse()
let lines = [ let lines =<< trim [CODE]
\ "func! Foo1()", func! Foo1()
\ " if 1", if 1
\ " let x = 0", let x = 0
\ " elseif 1", elseif 1
\ " let x = 1", let x = 1
\ " else", else
\ " let x = 2", let x = 2
\ " endif", endif
\ "endfunc", endfunc
\ "func! Foo2()", func! Foo2()
\ " if 0", if 0
\ " let x = 0", let x = 0
\ " elseif 1", elseif 1
\ " let x = 1", let x = 1
\ " else", else
\ " let x = 2", let x = 2
\ " endif", endif
\ "endfunc", endfunc
\ "func! Foo3()", func! Foo3()
\ " if 0", if 0
\ " let x = 0", let x = 0
\ " elseif 0", elseif 0
\ " let x = 1", let x = 1
\ " else", else
\ " let x = 2", let x = 2
\ " endif", endif
\ "endfunc", endfunc
\ "call Foo1()", call Foo1()
\ "call Foo2()", call Foo2()
\ "call Foo3()", call Foo3()
\ ] [CODE]
call writefile(lines, 'Xprofile_func.vim') call writefile(lines, 'Xprofile_func.vim')
call system(v:progpath call system(v:progpath
@ -198,41 +198,41 @@ func Test_profile_func_with_ifelse()
endfunc endfunc
func Test_profile_func_with_trycatch() func Test_profile_func_with_trycatch()
let lines = [ let lines =<< trim [CODE]
\ "func! Foo1()", func! Foo1()
\ " try", try
\ " let x = 0", let x = 0
\ " catch", catch
\ " let x = 1", let x = 1
\ " finally", finally
\ " let x = 2", let x = 2
\ " endtry", endtry
\ "endfunc", endfunc
\ "func! Foo2()", func! Foo2()
\ " try", try
\ " throw 0", throw 0
\ " catch", catch
\ " let x = 1", let x = 1
\ " finally", finally
\ " let x = 2", let x = 2
\ " endtry", endtry
\ "endfunc", endfunc
\ "func! Foo3()", func! Foo3()
\ " try", try
\ " throw 0", throw 0
\ " catch", catch
\ " throw 1", throw 1
\ " finally", finally
\ " let x = 2", let x = 2
\ " endtry", endtry
\ "endfunc", endfunc
\ "call Foo1()", call Foo1()
\ "call Foo2()", call Foo2()
\ "try", try
\ " call Foo3()", call Foo3()
\ "catch", catch
\ "endtry", endtry
\ ] [CODE]
call writefile(lines, 'Xprofile_func.vim') call writefile(lines, 'Xprofile_func.vim')
call system(v:progpath call system(v:progpath
@ -311,15 +311,15 @@ func Test_profile_func_with_trycatch()
endfunc endfunc
func Test_profile_file() func Test_profile_file()
let lines = [ 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()', call Foo()
\ 'endfor', endfor
\ 'call Foo()', call Foo()
\ ] [CODE]
call writefile(lines, 'Xprofile_file.vim') call writefile(lines, 'Xprofile_file.vim')
call system(v:progpath call system(v:progpath
@ -450,26 +450,27 @@ func Test_profile_truncate_mbyte()
endfunc endfunc
func Test_profdel_func() func Test_profdel_func()
let lines = [ let lines =<< trim [CODE]
\ 'profile start Xprofile_file.log', profile start Xprofile_file.log
\ 'func! Foo1()', func! Foo1()
\ 'endfunc', endfunc
\ 'func! Foo2()', func! Foo2()
\ 'endfunc', endfunc
\ 'func! Foo3()', func! Foo3()
\ 'endfunc', endfunc
\ '',
\ 'profile func Foo1', profile func Foo1
\ 'profile func Foo2', profile func Foo2
\ 'call Foo1()', call Foo1()
\ 'call Foo2()', call Foo2()
\ '',
\ 'profile func Foo3', profile func Foo3
\ 'profdel func Foo2', profdel func Foo2
\ 'profdel func Foo3', profdel func Foo3
\ 'call Foo1()', call Foo1()
\ 'call Foo2()', call Foo2()
\ 'call Foo3()' ] call Foo3()
[CODE]
call writefile(lines, 'Xprofile_file.vim') call writefile(lines, 'Xprofile_file.vim')
call system(v:progpath . ' -es --clean -c "so Xprofile_file.vim" -c q') call system(v:progpath . ' -es --clean -c "so Xprofile_file.vim" -c q')
call assert_equal(0, v:shell_error) call assert_equal(0, v:shell_error)
@ -496,14 +497,15 @@ endfunc
func Test_profdel_star() func Test_profdel_star()
" Foo() is invoked once before and once after 'profdel *'. " Foo() is invoked once before and once after 'profdel *'.
" So profiling should report it only once. " So profiling should report it only once.
let lines = [ let lines =<< trim [CODE]
\ 'profile start Xprofile_file.log', profile start Xprofile_file.log
\ 'func! Foo()', func! Foo()
\ 'endfunc', endfunc
\ 'profile func Foo', profile func Foo
\ 'call Foo()', call Foo()
\ 'profdel *', profdel *
\ 'call Foo()' ] call Foo()
[CODE]
call writefile(lines, 'Xprofile_file.vim') call writefile(lines, 'Xprofile_file.vim')
call system(v:progpath . ' -es --clean -c "so Xprofile_file.vim" -c q') call system(v:progpath . ' -es --clean -c "so Xprofile_file.vim" -c q')
call assert_equal(0, v:shell_error) call assert_equal(0, v:shell_error)

252
src/nvim/testdir/test_quickfix.vim
View File

@ -775,68 +775,68 @@ func Test_efm1()
return return
endif endif
let l = [ 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]
call writefile(l, 'Xerrorfile1') call writefile(l, 'Xerrorfile1')
call writefile(l[:-2], 'Xerrorfile2') call writefile(l[:-2], 'Xerrorfile2')
let m = [ let m =<< trim [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]
call writefile(m, 'Xtestfile') call writefile(m, 'Xtestfile')
let save_efm = &efm let save_efm = &efm
@ -895,20 +895,21 @@ func s:dir_stack_tests(cchar)
let save_efm=&efm let save_efm=&efm
set efm=%DEntering\ dir\ '%f',%f:%l:%m,%XLeaving\ dir\ '%f' set efm=%DEntering\ dir\ '%f',%f:%l:%m,%XLeaving\ dir\ '%f'
let lines = ["Entering dir 'dir1/a'", let lines =<< trim [DATA]
\ 'habits2.txt:1:Nine Healthy Habits', Entering dir 'dir1/a'
\ "Entering dir 'b'", habits2.txt:1:Nine Healthy Habits
\ 'habits3.txt:2:0 Hours of television', Entering dir 'b'
\ 'habits2.txt:7:5 Small meals', habits3.txt:2:0 Hours of television
\ "Entering dir 'dir1/c'", habits2.txt:7:5 Small meals
\ 'habits4.txt:3:1 Hour of exercise', Entering dir 'dir1/c'
\ "Leaving dir 'dir1/c'", habits4.txt:3:1 Hour of exercise
\ "Leaving dir 'dir1/a'", Leaving dir 'dir1/c'
\ 'habits1.txt:4:2 Liters of water', Leaving dir 'dir1/a'
\ "Entering dir 'dir2'", habits1.txt:4:2 Liters of water
\ 'habits5.txt:5:3 Cups of hot green tea', Entering dir 'dir2'
\ "Leaving dir 'dir2'" habits5.txt:5:3 Cups of hot green tea
\] Leaving dir 'dir2
[DATA]
Xexpr "" Xexpr ""
for l in lines for l in lines
@ -942,18 +943,20 @@ func Test_efm_dirstack()
call mkdir('dir1/c') call mkdir('dir1/c')
call mkdir('dir2') call mkdir('dir2')
let lines = ["Nine Healthy Habits", let lines =<< trim [DATA]
\ "0 Hours of television", Nine Healthy Habits,
\ "1 Hour of exercise", 0 Hours of television,
\ "2 Liters of water", 1 Hour of exercise,
\ "3 Cups of hot green tea", 2 Liters of water,
\ "4 Short mental breaks", 3 Cups of hot green tea,
\ "5 Small meals", 4 Short mental breaks,
\ "6 AM wake up time", 5 Small meals,
\ "7 Minutes of laughter", 6 AM wake up time,
\ "8 Hours of sleep (at least)", 7 Minutes of laughter,
\ "9 PM end of the day and off to bed" 8 Hours of sleep (at least),
\ ] 9 PM end of the day and off to bed
[DATA]
call writefile(lines, 'habits1.txt') call writefile(lines, 'habits1.txt')
call writefile(lines, 'dir1/a/habits2.txt') call writefile(lines, 'dir1/a/habits2.txt')
call writefile(lines, 'dir1/a/b/habits3.txt') call writefile(lines, 'dir1/a/b/habits3.txt')
@ -1049,21 +1052,22 @@ func Test_efm2()
call assert_equal([' 1 Xtestfile:^\VLine search text\$: '], l) call assert_equal([' 1 Xtestfile:^\VLine search text\$: '], l)
" Test for %P, %Q and %t format specifiers " Test for %P, %Q and %t format specifiers
let lines=["[Xtestfile1]", let lines =<< trim [DATA]
\ "(1,17) error: ';' missing", [Xtestfile1]
\ "(21,2) warning: variable 'z' not defined", (1,17) error: ';' missing
\ "(67,3) error: end of file found before string ended", (21,2) warning: variable 'z' not defined
\ "--", (67,3) error: end of file found before string ended
\ "", --
\ "[Xtestfile2]",
\ "--", [Xtestfile2]
\ "", --
\ "[Xtestfile3]",
\ "NEW compiler v1.1", [Xtestfile3]
\ "(2,2) warning: variable 'x' not defined", NEW compiler v1.1
\ "(67,3) warning: 's' already defined", (2,2) warning: variable 'x' not defined
\ "--" (67,3) warning: 's' already defined
\] -
[DATA]
set efm=%+P[%f]%r,(%l\\,%c)%*[\ ]%t%*[^:]:\ %m,%+Q--%r set efm=%+P[%f]%r,(%l\\,%c)%*[\ ]%t%*[^:]:\ %m,%+Q--%r
" To exercise the push/pop file functionality in quickfix, the test files " To exercise the push/pop file functionality in quickfix, the test files
" need to be created. " need to be created.
@ -1085,11 +1089,13 @@ func Test_efm2()
call delete('Xtestfile3') call delete('Xtestfile3')
" Tests for %E, %C and %Z format specifiers " Tests for %E, %C and %Z format specifiers
let lines = ["Error 275", let lines =<< trim [DATA]
\ "line 42", Error 275
\ "column 3", line 42
\ "' ' expected after '--'" column 3
\] ' ' expected after '--'
[DATA]
set efm=%EError\ %n,%Cline\ %l,%Ccolumn\ %c,%Z%m set efm=%EError\ %n,%Cline\ %l,%Ccolumn\ %c,%Z%m
cgetexpr lines cgetexpr lines
let l = getqflist() let l = getqflist()
@ -1100,9 +1106,11 @@ func Test_efm2()
call assert_equal("\n' ' expected after '--'", l[0].text) call assert_equal("\n' ' expected after '--'", l[0].text)
" Test for %> " Test for %>
let lines = ["Error in line 147 of foo.c:", let lines =<< trim [DATA]
\"unknown variable 'i'" Error in line 147 of foo.c:
\] unknown variable 'i'
[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
cgetexpr lines cgetexpr lines
let l = getqflist() let l = getqflist()
@ -1111,21 +1119,21 @@ func Test_efm2()
call assert_equal("\nunknown variable 'i'", l[0].text) call assert_equal("\nunknown variable 'i'", l[0].text)
" Test for %A, %C and other formats " Test for %A, %C and other formats
let lines = [ 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]
set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m
cgetexpr lines cgetexpr lines
let l = getqflist() let l = getqflist()

150
src/nvim/testdir/test_startup.vim
View File

@ -20,25 +20,27 @@ func Test_after_comes_later()
if !has('packages') if !has('packages')
return return
endif endif
let before = [ let before =<< trim [CODE]
\ 'set nocp viminfo+=nviminfo', set nocp viminfo+=nviminfo
\ 'set guioptions+=M', set guioptions+=M
\ 'let $HOME = "/does/not/exist"', let $HOME = "/does/not/exist"
\ 'set loadplugins', set loadplugins
\ 'set rtp=Xhere,Xafter,Xanother', set rtp=Xhere,Xafter,Xanother
\ 'set packpath=Xhere,Xafter', set packpath=Xhere,Xafter
\ 'set nomore', set nomore
\ 'let g:sequence = ""', let g:sequence = ""
\ ] [CODE]
let after = [
\ 'redir! > Xtestout', let after =<< trim [CODE]
\ 'scriptnames', redir! > Xtestout
\ 'redir END', scriptnames
\ 'redir! > Xsequence', redir END
\ 'echo g:sequence', redir! > Xsequence
\ 'redir END', echo g:sequence
\ 'quit', redir END
\ ] quit
[CODE]
call mkdir('Xhere/plugin', 'p') call mkdir('Xhere/plugin', 'p')
call writefile(['let g:sequence .= "here "'], 'Xhere/plugin/here.vim') call writefile(['let g:sequence .= "here "'], 'Xhere/plugin/here.vim')
call mkdir('Xanother/plugin', 'p') call mkdir('Xanother/plugin', 'p')
@ -77,15 +79,16 @@ func Test_pack_in_rtp_when_plugins_run()
if !has('packages') if !has('packages')
return return
endif endif
let before = [ let before =<< trim [CODE]
\ 'set nocp viminfo+=nviminfo', set nocp viminfo+=nviminfo
\ 'set guioptions+=M', set guioptions+=M
\ 'let $HOME = "/does/not/exist"', let $HOME = "/does/not/exist"
\ 'set loadplugins', set loadplugins
\ 'set rtp=Xhere', set rtp=Xhere
\ 'set packpath=Xhere', set packpath=Xhere
\ 'set nomore', set nomore
\ ] [CODE]
let after = [ let after = [
\ 'quit', \ 'quit',
\ ] \ ]
@ -133,11 +136,12 @@ endfunc
func Test_compatible_args() func Test_compatible_args()
throw "skipped: Nvim is always 'nocompatible'" throw "skipped: Nvim is always 'nocompatible'"
let after = [ let after =<< trim [CODE]
\ 'call writefile([string(&compatible)], "Xtestout")', call writefile([string(&compatible)], "Xtestout")
\ 'set viminfo+=nviminfo', set viminfo+=nviminfo
\ 'quit', quit
\ ] [CODE]
if RunVim([], after, '-C') if RunVim([], after, '-C')
let lines = readfile('Xtestout') let lines = readfile('Xtestout')
call assert_equal('1', lines[0]) call assert_equal('1', lines[0])
@ -154,14 +158,15 @@ endfunc
" Test the -o[N] and -O[N] arguments to open N windows split " Test the -o[N] and -O[N] arguments to open N windows split
" horizontally or vertically. " horizontally or vertically.
func Test_o_arg() func Test_o_arg()
let after = [ let after =<< trim [CODE]
\ 'call writefile([winnr("$"), call writefile([winnr("$"),
\ winheight(1), winheight(2), &lines, \ winheight(1), winheight(2), &lines,
\ winwidth(1), winwidth(2), &columns, \ winwidth(1), winwidth(2), &columns,
\ bufname(winbufnr(1)), bufname(winbufnr(2))], \ bufname(winbufnr(1)), bufname(winbufnr(2))],
\ "Xtestout")', \ "Xtestout")
\ 'qall', qall
\ ] [CODE]
if RunVim([], after, '-o2') if RunVim([], after, '-o2')
" Open 2 windows split horizontally. Expect: " Open 2 windows split horizontally. Expect:
" - 2 windows " - 2 windows
@ -230,10 +235,11 @@ endfunc
" Test the -p[N] argument to open N tabpages. " Test the -p[N] argument to open N tabpages.
func Test_p_arg() func Test_p_arg()
let after = [ let after =<< trim [CODE]
\ 'call writefile(split(execute("tabs"), "\n"), "Xtestout")', call writefile(split(execute("tabs"), "\n"), "Xtestout")
\ 'qall', qall
\ ] [CODE]
if RunVim([], after, '-p2') if RunVim([], after, '-p2')
let lines = readfile('Xtestout') let lines = readfile('Xtestout')
call assert_equal(4, len(lines)) call assert_equal(4, len(lines))
@ -290,10 +296,11 @@ endfunc
" -M resets 'modifiable' and 'write' " -M resets 'modifiable' and 'write'
" -R sets 'readonly' " -R sets 'readonly'
func Test_m_M_R() func Test_m_M_R()
let after = [ let after =<< trim [CODE]
\ 'call writefile([&write, &modifiable, &readonly, &updatecount], "Xtestout")', call writefile([&write, &modifiable, &readonly, &updatecount], "Xtestout")
\ 'qall', qall
\ ] [CODE]
if RunVim([], after, '') if RunVim([], after, '')
let lines = readfile('Xtestout') let lines = readfile('Xtestout')
call assert_equal(['1', '1', '0', '200'], lines) call assert_equal(['1', '1', '0', '200'], lines)
@ -316,10 +323,11 @@ endfunc
" Test the -A, -F and -H arguments (Arabic, Farsi and Hebrew modes). " Test the -A, -F and -H arguments (Arabic, Farsi and Hebrew modes).
func Test_A_F_H_arg() func Test_A_F_H_arg()
let after = [ let after =<< trim [CODE]
\ 'call writefile([&rightleft, &arabic, 0, &hkmap], "Xtestout")', call writefile([&rightleft, &arabic, 0, &hkmap], "Xtestout")
\ 'qall', qall
\ ] [CODE]
" Use silent Ex mode to avoid the hit-Enter prompt for the warning that " Use silent Ex mode to avoid the hit-Enter prompt for the warning that
" 'encoding' is not utf-8. " 'encoding' is not utf-8.
if has('arabic') && &encoding == 'utf-8' && RunVim([], after, '-e -s -A') if has('arabic') && &encoding == 'utf-8' && RunVim([], after, '-e -s -A')
@ -423,10 +431,11 @@ func Test_invalid_args()
endfunc endfunc
func Test_file_args() func Test_file_args()
let after = [ let after =<< trim [CODE]
\ 'call writefile(argv(), "Xtestout")', call writefile(argv(), "Xtestout")
\ 'qall', qall
\ ] [CODE]
if RunVim([], after, '') if RunVim([], after, '')
let lines = readfile('Xtestout') let lines = readfile('Xtestout')
call assert_equal(0, len(lines)) call assert_equal(0, len(lines))
@ -487,10 +496,11 @@ func Test_startuptime()
endfunc endfunc
func Test_read_stdin() func Test_read_stdin()
let after = [ let after =<< trim [CODE]
\ 'write Xtestout', write Xtestout
\ 'quit!', quit!
\ ] [CODE]
if RunVimPiped([], after, '-', 'echo something | ') if RunVimPiped([], after, '-', 'echo something | ')
let lines = readfile('Xtestout') let lines = readfile('Xtestout')
" MS-Windows adds a space after the word " MS-Windows adds a space after the word
@ -540,20 +550,22 @@ endfunc
func Test_zzz_startinsert() func Test_zzz_startinsert()
" Test :startinsert " Test :startinsert
call writefile(['123456'], 'Xtestout') call writefile(['123456'], 'Xtestout')
let after = [ let after =<< trim [CODE]
\ ':startinsert', :startinsert
\ 'call feedkeys("foobar\<c-o>:wq\<cr>","t")' call feedkeys("foobar\<c-o>:wq\<cr>","t")
\ ] [CODE]
if RunVim([], after, 'Xtestout') if RunVim([], after, 'Xtestout')
let lines = readfile('Xtestout') let lines = readfile('Xtestout')
call assert_equal(['foobar123456'], lines) call assert_equal(['foobar123456'], lines)
endif endif
" Test :startinsert! " Test :startinsert!
call writefile(['123456'], 'Xtestout') call writefile(['123456'], 'Xtestout')
let after = [ let after =<< trim [CODE]
\ ':startinsert!', :startinsert!
\ 'call feedkeys("foobar\<c-o>:wq\<cr>","t")' call feedkeys("foobar\<c-o>:wq\<cr>","t")
\ ] [CODE]
if RunVim([], after, 'Xtestout') if RunVim([], after, 'Xtestout')
let lines = readfile('Xtestout') let lines = readfile('Xtestout')
call assert_equal(['123456foobar'], lines) call assert_equal(['123456foobar'], lines)