allow leading spaces for heredoc end marker

Author: lehmacdj

autoload/vimlparser.vim

@@ -1509,7 +1509,7 @@ function! s:VimLParser.parse_cmd_call() abort
   call self.add_node(node)
 endfunction
 
-function! s:VimLParser.parse_heredoc() abort
+function! s:VimLParser.parse_heredoc(prefix) abort
   let node = s:Node(s:NODE_HEREDOC)
   let node.pos = self.ea.cmdpos
   let node.op = ''
@@ -1543,7 +1543,7 @@ function! s:VimLParser.parse_heredoc() abort
     endif
     let pos = self.reader.getpos()
     let line = self.reader.getn(-1)
-    if line ==# node.op
+    if line ==# node.op || index(node.rlist, 'trim') != -1 && line ==# a:prefix . node.op
       return node
     endif
     let linenode = s:Node(s:NODE_STRING)
@@ -1600,7 +1600,31 @@ function! s:VimLParser.parse_cmd_let() abort
     call self.reader.getn(len(s2))
     call self.reader.skip_white()
     let node.op = s2
-    let node.right = self.parse_heredoc()
+
+    " compute allowed prefix for heredoc end marker (e.g. EOF)
+    let pos = self.reader.tell()
+    while self.reader.tell() > 0
+      if self.reader.peek() ==# '<EOL>'
+        call self.reader.seek_cur(1)
+        break
+      endif
+      call self.reader.seek_cur(-1)
+    endwhile
+    let prefix = ''
+    while s:TRUE
+      let c = self.reader.getn(1)
+      if c ==# ':'
+        " any presence of leading ':' disables prefix for heredoc end marker
+        let prefix = ''
+        break
+      elseif !s:iswhite(c)
+        break
+      endif
+      let prefix .= c
+    endwhile
+    call self.reader.seek_set(pos)
+
+    let node.right = self.parse_heredoc(prefix)
     call self.add_node(node)
     return
   elseif s1 ==# '='

js/vimlfunc.js

@@ -93,6 +93,10 @@ function viml_add(lst, item) {
     lst.push(item);
 }
 
+function viml_index(lst, item) {
+    return lst.indexOf(item);
+}
+
 function viml_call(func, args) {
     return func.apply(null, args);
 }
@@ -223,4 +227,3 @@ function viml_has_key(obj, key) {
 function viml_stridx(a, b) {
     return a.indexOf(b);
 }
-

js/vimlparser.js

@@ -98,6 +98,13 @@ def viml_add(lst, item):
     lst.append(item)
 
 
+def viml_index(lst, item):
+    try:
+        return lst.index(item)
+    except ValueError:
+        return -1
+
+
 def viml_call(func, *args):
     func(*args)