diff options
Diffstat (limited to 'src/nvim/eval')
| -rw-r--r-- | src/nvim/eval/userfunc.c | 9 | ||||
| -rw-r--r-- | src/nvim/eval/vars.c | 19 |
2 files changed, 23 insertions, 5 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c index 0e22cf54cf..1f5a6eaec4 100644 --- a/src/nvim/eval/userfunc.c +++ b/src/nvim/eval/userfunc.c @@ -2571,11 +2571,18 @@ void ex_function(exarg_T *eap) && (!ASCII_ISALPHA(p[2]) || p[2] == 's')))) { // ":python <<" continues until a dot, like ":append" p = skipwhite(arg + 2); + if (strncmp(p, "trim", 4) == 0) { + // Ignore leading white space. + p = skipwhite(p + 4); + heredoc_trimmed = xstrnsave(theline, (size_t)(skipwhite(theline) - theline)); + } if (*p == NUL) { skip_until = xstrdup("."); } else { - skip_until = xstrdup(p); + skip_until = xstrnsave(p, (size_t)(skiptowhite(p) - p)); } + do_concat = false; + is_heredoc = true; } // Check for ":let v =<< [trim] EOF" diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c index 593ba9f6c3..dee3867a5a 100644 --- a/src/nvim/eval/vars.c +++ b/src/nvim/eval/vars.c @@ -155,14 +155,19 @@ char *eval_all_expr_in_str(char *str) /// marker, then the leading indentation before the lines (matching the /// indentation in the 'cmd' line) is stripped. /// +/// When getting lines for an embedded script (e.g. python, lua, perl, ruby, +/// tcl, mzscheme), "script_get" is set to true. In this case, if the marker is +/// missing, then '.' is accepted as a marker. +/// /// @return a List with {lines} or NULL on failure. -static list_T *heredoc_get(exarg_T *eap, char *cmd) +list_T *heredoc_get(exarg_T *eap, char *cmd, bool script_get) { char *marker; char *p; int marker_indent_len = 0; int text_indent_len = 0; char *text_indent = NULL; + char dot[] = "."; if (eap->getline == NULL) { emsg(_("E991: cannot use =<< here")); @@ -214,8 +219,14 @@ static list_T *heredoc_get(exarg_T *eap, char *cmd) return NULL; } } else { - emsg(_("E172: Missing marker")); - return NULL; + // When getting lines for an embedded script, if the marker is missing, + // accept '.' as the marker. + if (script_get) { + marker = dot; + } else { + emsg(_("E172: Missing marker")); + return NULL; + } } char *theline = NULL; @@ -353,7 +364,7 @@ void ex_let(exarg_T *eap) if (expr[0] == '=' && expr[1] == '<' && expr[2] == '<') { // HERE document - list_T *l = heredoc_get(eap, expr + 3); + list_T *l = heredoc_get(eap, expr + 3, false); if (l != NULL) { tv_list_set_ret(&rettv, l); if (!eap->skip) { |