aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.1.1356: some text in heredoc assignment ends the text

Browse Source 
Problem:    Some text in heredoc assignment ends the text. (Ozaki Kiichi)
Solution:   Recognize "let v =<<" and skip until the end.
This commit is contained in:
Bram Moolenaar
2019-05-19 21:37:18 +02:00
parent 16e9b85113
commit 8471e57026
3 changed files with 99 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/userfunc.c
View File

@@ -1979,6 +1979,7 @@ ex_function(exarg_T *eap)
int indent;
int nesting;
char_u *skip_until = NULL;
char_u *trimmed = NULL;
dictitem_T *v;
funcdict_T fudi;
static int func_nr = 0; /* number for nameless function */
@@ -2303,10 +2304,18 @@ ex_function(exarg_T *eap)
if (skip_until != NULL)
{
/* between ":append" and "." and between ":python <<EOF" and "EOF"
* don't check for ":endfunc". */
if (STRCMP(theline, skip_until) == 0)
VIM_CLEAR(skip_until);
// Between ":append" and "." and between ":python <<EOF" and "EOF"
// don't check for ":endfunc".
if (trimmed == NULL
|| STRNCMP(theline, trimmed, STRLEN(trimmed)) == 0)
{
p = trimmed == NULL ? theline : theline + STRLEN(trimmed);
if (STRCMP(p, skip_until) == 0)
{
VIM_CLEAR(skip_until);
VIM_CLEAR(trimmed);
}
}
}
else
{
@@ -2406,6 +2415,30 @@ ex_function(exarg_T *eap)
else
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));
}
}
/* Add the line to the function. */