From b5ac11139e5acff834df592c5a42e856e773221f Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Mon, 23 Sep 2019 19:46:45 +0200
Subject: vim-patch:8.1.1356: some text in heredoc assignment ends the text

Problem:    Some text in heredoc assignment ends the text. (Ozaki Kiichi)
Solution:   Recognize "let v =<<" and skip until the end.
https://github.com/vim/vim/commit/8471e57026714c5a0faf89288ceef5231fb88d4f
---
 src/nvim/eval.c | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

(limited to 'src/nvim/eval.c')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 9b12ca1e12..6d706939a1 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -21269,6 +21269,7 @@ void 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 */
@@ -21572,10 +21573,14 @@ void ex_function(exarg_T *eap)
       sourcing_lnum_off = 0;
 
     if (skip_until != NULL) {
-      /* between ":append" and "." and between ":python <<EOF" and "EOF"
-       * don't check for ":endfunc". */
-      if (STRCMP(theline, skip_until) == 0) {
-        XFREE_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) {
+          XFREE_CLEAR(skip_until);
+          XFREE_CLEAR(trimmed);
+        }
       }
     } else {
       /* skip ':' and blanks*/
@@ -21674,6 +21679,27 @@ void 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. */
-- 
cgit