Merge #11929 from janlazo/vim-8.1.1510

vim-patch:8.0.1587,8.1.{253,881,883,885,896,939,1107,1108,1466,1489,1510,1552,1642,1793},8.2.{108,133,135}

1 files changed, 39 insertions, 0 deletions

diff --git a/test/functional/legacy/expand_spec.lua b/test/functional/legacy/expand_spec.lua
index 1b735080f4..f238128b31 100644
--- a/test/functional/legacy/expand_spec.lua
+++ b/test/functional/legacy/expand_spec.lua
@@ -70,6 +70,40 @@ describe('expand file name', function()
         call assert_match('\~', expand('%:p'))
         bwipe!
       endfunc
+
+      func Test_expandcmd()
+        let $FOO = 'Test'
+        call assert_equal('e x/Test/y', expandcmd('e x/$FOO/y'))
+        unlet $FOO
+
+        new
+        edit Xfile1
+        call assert_equal('e Xfile1', expandcmd('e %'))
+        edit Xfile2
+        edit Xfile1
+        call assert_equal('e Xfile2', expandcmd('e #'))
+        edit Xfile2
+        edit Xfile3
+        edit Xfile4
+        let bnum = bufnr('Xfile2')
+        call assert_equal('e Xfile2', expandcmd('e #' . bnum))
+        call setline('.', 'Vim!@#')
+        call assert_equal('e Vim', expandcmd('e <cword>'))
+        call assert_equal('e Vim!@#', expandcmd('e <cWORD>'))
+        enew!
+        edit Xfile.java
+        call assert_equal('e Xfile.py', expandcmd('e %:r.py'))
+        call assert_equal('make abc.java', expandcmd('make abc.%:e'))
+        call assert_equal('make Xabc.java', expandcmd('make %:s?file?abc?'))
+        edit a1a2a3.rb
+        call assert_equal('make b1b2b3.rb a1a2a3 Xfile.o', expandcmd('make %:gs?a?b? %< #<.o'))
+
+        call assert_fails('call expandcmd("make <afile>")', 'E495:')
+        call assert_fails('call expandcmd("make <afile>")', 'E495:')
+        enew
+        call assert_fails('call expandcmd("make %")', 'E499:')
+        close
+      endfunc
     ]])
   end)
 
@@ -87,4 +121,9 @@ describe('expand file name', function()
     call('Test_expand_tilde_filename')
     expected_empty()
   end)
+
+  it('works with expandcmd()', function()
+    call('Test_expandcmd')
+    expected_empty()
+  end)
 end)