patch 8.1.1585: :let-heredoc does not trim enough
Problem: :let-heredoc does not trim enough.
Solution: Trim indent from the contents based on the indent of the first
line. Use let-heredoc in more tests.
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index edb0399..b25108c 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -737,12 +737,13 @@
if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps'
endif
- call writefile([
- \ 'set previewheight=9',
- \ 'silent! pedit',
- \ 'call setline(1, map(repeat(["ab"], 10), "v:val. v:key"))',
- \ 'exec "norm! G\<C-E>\<C-E>"',
- \ ], 'Xscript')
+ let lines =<< trim END
+ set previewheight=9
+ silent! pedit
+ call setline(1, map(repeat(["ab"], 10), "v:val. v:key"))
+ exec "norm! G\<C-E>\<C-E>"
+ END
+ call writefile(lines, 'Xscript')
let buf = RunVimInTerminal('-S Xscript', {})
" Test that popup and previewwindow do not overlap.
@@ -799,11 +800,12 @@
if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps'
endif
- call writefile([
- \ '123456789_123456789_123456789_a',
- \ '123456789_123456789_123456789_b',
- \ ' 123',
- \ ], 'Xtest')
+ let lines =<< trim END
+ 123456789_123456789_123456789_a
+ 123456789_123456789_123456789_b
+ 123
+ END
+ call writefile(lines, 'Xtest')
let buf = RunVimInTerminal('Xtest', {})
call term_sendkeys(buf, ":vsplit\<CR>")
@@ -842,11 +844,12 @@
throw 'Skipped: cannot make screendumps and/or menu feature missing'
endif
- call writefile([
- \ 'one two three four five',
- \ 'and one two Xthree four five',
- \ 'one more two three four five',
- \ ], 'Xtest')
+ let lines =<< trim END
+ one two three four five
+ and one two Xthree four five
+ one more two three four five
+ END
+ call writefile(lines, 'Xtest')
let buf = RunVimInTerminal('Xtest', {})
call term_sendkeys(buf, ":source $VIMRUNTIME/menu.vim\<CR>")
call term_sendkeys(buf, "/X\<CR>:popup PopUp\<CR>")