patch 9.0.1505: error when heredoc content looks like heredoc
Problem: Error when heredoc content looks like heredoc.
Solution: Handle curly expressions. (closes #12325)
diff --git a/src/testdir/test_let.vim b/src/testdir/test_let.vim
index 4e4a386..680572f 100644
--- a/src/testdir/test_let.vim
+++ b/src/testdir/test_let.vim
@@ -337,7 +337,43 @@
call assert_report('No exception thrown')
catch /E488:/
catch
- call assert_report("Caught exception: " .. v:exception)
+ call assert_report('Caught exception: ' .. v:exception)
+ endtry
+
+ try
+ let &commentstring =<< trim TEXT
+ change
+ insert
+ append
+ TEXT
+ call assert_report('No exception thrown')
+ catch /E730:/
+ catch
+ call assert_report('Caught exception: ' .. v:exception)
+ endtry
+
+ try
+ let $SOME_ENV_VAR =<< trim TEXT
+ change
+ insert
+ append
+ TEXT
+ call assert_report('No exception thrown')
+ catch /E730:/
+ catch
+ call assert_report('Caught exception: ' .. v:exception)
+ endtry
+
+ try
+ let @r =<< trim TEXT
+ change
+ insert
+ append
+ TEXT
+ call assert_report('No exception thrown')
+ catch /E730:/
+ catch
+ call assert_report('Caught exception: ' .. v:exception)
endtry
let text =<< trim END
@@ -506,6 +542,32 @@
z
END
call assert_equal([' x', ' \y', ' z'], [a, b, c])
+
+ " unpack assignment without whitespace
+ let[a,b,c]=<<END
+change
+insert
+append
+END
+ call assert_equal(['change', 'insert', 'append'], [a, b, c])
+
+ " curly braces name and list slice assignment
+ let foo_3_bar = ['', '', '']
+ let foo_{1 + 2}_bar[ : ] =<< END
+change
+insert
+append
+END
+ call assert_equal(['change', 'insert', 'append'], foo_3_bar)
+
+ " dictionary key containing brackets and spaces
+ let d = {'abc] 123': 'baz'}
+ let d[d['abc] 123'] .. '{'] =<< END
+change
+insert
+append
+END
+ call assert_equal(['change', 'insert', 'append'], d['baz{'])
endfunc
" Test for evaluating Vim expressions in a heredoc using {expr}
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 4f4e58e..6db2718 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -1848,30 +1848,81 @@
def Test_heredoc()
# simple heredoc
var lines =<< trim END
- var text =<< trim TEXT # comment
- abc
- TEXT
- assert_equal(['abc'], text)
+ var text =<< trim TEXT # comment
+ abc
+ TEXT
+ assert_equal(['abc'], text)
END
v9.CheckDefAndScriptSuccess(lines)
# empty heredoc
lines =<< trim END
- var text =<< trim TEXT
- TEXT
- assert_equal([], text)
+ var text =<< trim TEXT
+ TEXT
+ assert_equal([], text)
END
v9.CheckDefAndScriptSuccess(lines)
# heredoc with a single empty line
lines =<< trim END
- var text =<< trim TEXT
+ var text =<< trim TEXT
- TEXT
- assert_equal([''], text)
+ TEXT
+ assert_equal([''], text)
END
v9.CheckDefAndScriptSuccess(lines)
+ # assign heredoc to variable with type
+ lines =<< trim END
+ var text: list<string> =<< trim TEXT
+ var foo =<< trim FOO
+ TEXT
+ assert_equal(['var foo =<< trim FOO'], text)
+ END
+ v9.CheckDefAndScriptSuccess(lines)
+
+ # extra whitespace before type is allowed
+ lines =<< trim END
+ var text: list<string> =<< trim TEXT
+ var foo =<< trim FOO
+ TEXT
+ assert_equal(['var foo =<< trim FOO'], text)
+ END
+ v9.CheckDefAndScriptSuccess(lines)
+
+ # missing whitespace before type is an error
+ lines =<< trim END
+ var text:list<string> =<< trim TEXT
+ var foo =<< trim FOO
+ TEXT
+ assert_equal(['var foo =<< trim FOO'], text)
+ END
+ v9.CheckDefAndScriptFailure(lines, 'E1069:')
+
+ # assign heredoc to list slice
+ lines =<< trim END
+ var text = ['']
+ text[ : ] =<< trim TEXT
+ var foo =<< trim FOO
+ TEXT
+ assert_equal(['var foo =<< trim FOO'], text)
+ END
+ v9.CheckDefAndScriptSuccess(lines)
+
+ # assign heredoc to curly braces name in legacy function in Vim9 script
+ lines =<< trim END
+ vim9script
+ func Func()
+ let foo_3_bar = ['']
+ let foo_{1 + 2}_bar[ : ] =<< trim TEXT
+ var foo =<< trim FOO
+ TEXT
+ call assert_equal(['var foo =<< trim FOO'], foo_3_bar)
+ endfunc
+ Func()
+ END
+ v9.CheckScriptSuccess(lines)
+
v9.CheckDefFailure(['var lines =<< trim END X', 'END'], 'E488:')
v9.CheckDefFailure(['var lines =<< trim END " comment', 'END'], 'E488:')