aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 8.1.1729: heredoc with trim not properly handled in function

Browse Source 
Problem:    Heredoc with trim not properly handled in function.
Solution:   Allow for missing indent. (FUJIWARA Takuya, closes #4713)
This commit is contained in:
Bram Moolenaar 2019-07-21 23:04:21 +02:00
parent 5f32ece459
commit ecaa75b4ce
3 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/testdir/test_let.vim
View File

@ -188,6 +188,15 @@ func Test_let_heredoc_fails()
call delete('XheredocBadMarker') call delete('XheredocBadMarker')
endfunc endfunc
func Test_let_heredoc_trim_no_indent_marker()
let text =<< trim END
Text
with
indent
END
call assert_equal(['Text', 'with', 'indent'], text)
endfunc
" Test for the setting a variable using the heredoc syntax " Test for the setting a variable using the heredoc syntax
func Test_let_heredoc() func Test_let_heredoc()
let var1 =<< END let var1 =<< END

37
src/userfunc.c
View File

@ -2000,8 +2000,6 @@ ex_function(exarg_T *eap)
int overwrite = FALSE; int overwrite = FALSE;
int indent; int indent;
int nesting; int nesting;
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 */
@ -2012,6 +2010,9 @@ ex_function(exarg_T *eap)
int do_concat = TRUE; int do_concat = TRUE;
linenr_T sourcing_lnum_off; linenr_T sourcing_lnum_off;
linenr_T sourcing_lnum_top; linenr_T sourcing_lnum_top;
int is_heredoc = FALSE;
char_u *skip_until = NULL;
char_u *heredoc_trimmed = NULL;
/* /*
* ":function" without argument: list functions. * ":function" without argument: list functions.
@ -2331,17 +2332,28 @@ ex_function(exarg_T *eap)
if (skip_until != NULL) if (skip_until != NULL)
{ {
// Between ":append" and "." and between ":python <<EOF" and "EOF" // Don't check for ":endfunc" between
// don't check for ":endfunc". // * ":append" and "."
if (trimmed == NULL // * ":python <<EOF" and "EOF"
|| STRNCMP(theline, trimmed, STRLEN(trimmed)) == 0) // * ":let {var-name} =<< [trim] {marker}" and "{marker}"
if (heredoc_trimmed == NULL
|| (is_heredoc && skipwhite(theline) == theline)
|| STRNCMP(theline, heredoc_trimmed,
STRLEN(heredoc_trimmed)) == 0)
{ {
p = trimmed == NULL ? theline : theline + STRLEN(trimmed); if (heredoc_trimmed == NULL)
p = theline;
else if (is_heredoc)
p = skipwhite(theline) == theline
? theline : theline + STRLEN(heredoc_trimmed);
else
p = theline + STRLEN(heredoc_trimmed);
if (STRCMP(p, skip_until) == 0) if (STRCMP(p, skip_until) == 0)
{ {
VIM_CLEAR(skip_until); VIM_CLEAR(skip_until);
VIM_CLEAR(trimmed); VIM_CLEAR(heredoc_trimmed);
do_concat = TRUE; do_concat = TRUE;
is_heredoc = FALSE;
} }
} }
} }
@ -2453,20 +2465,17 @@ ex_function(exarg_T *eap)
&& (!ASCII_ISALNUM(p[2]) && (!ASCII_ISALNUM(p[2])
|| (p[2] == 't' && !ASCII_ISALNUM(p[3])))))) || (p[2] == 't' && !ASCII_ISALNUM(p[3]))))))
{ {
// ":let v =<<" continues until a dot
p = skipwhite(arg + 3); p = skipwhite(arg + 3);
if (STRNCMP(p, "trim", 4) == 0) if (STRNCMP(p, "trim", 4) == 0)
{ {
// Ignore leading white space. // Ignore leading white space.
p = skipwhite(p + 4); p = skipwhite(p + 4);
trimmed = vim_strnsave(theline, heredoc_trimmed = vim_strnsave(theline,
(int)(skipwhite(theline) - theline)); (int)(skipwhite(theline) - theline));
} }
if (*p == NUL) skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
skip_until = vim_strsave((char_u *)".");
else
skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
do_concat = FALSE; do_concat = FALSE;
is_heredoc = TRUE;
} }
} }

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 */
/**/
1729,
/**/ /**/
1728, 1728,
/**/ /**/