[RFC] vim-patch:8.1.1378: delete() can not handle a file name that looks li… (#16268)

Problem:    Delete() can not handle a file name that looks like a pattern.
Solution:   Use readdir() instead of appending "/*" and expanding wildcards.
            (Ken Takata, closes vim/vim#4424, closes vim/vim#696)
https://github.com/vim/vim/commit/701ff0a3e53d253d7300c385e582659bbff7860d

Cherry-pick a change to Test_delete_rf() from patch 8.1.1921.

Co-authored-by: zeertzjq <zeertzjq@outlook.com>

1 files changed, 21 insertions, 34 deletions

diff --git a/test/functional/legacy/delete_spec.lua b/test/functional/legacy/delete_spec.lua
index 623b6b14a5..4ba4c8d356 100644
--- a/test/functional/legacy/delete_spec.lua
+++ b/test/functional/legacy/delete_spec.lua
@@ -1,6 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear, source = helpers.clear, helpers.source
 local eq, eval, command = helpers.eq, helpers.eval, helpers.command
+local exc_exec = helpers.exc_exec
 
 describe('Test for delete()', function()
   before_each(clear)
@@ -8,6 +9,23 @@ describe('Test for delete()', function()
     os.remove('Xfile')
   end)
 
+  it('file delete', function()
+    command('split Xfile')
+    command("call setline(1, ['a', 'b'])")
+    command('wq')
+    eq(eval("['a', 'b']"), eval("readfile('Xfile')"))
+    eq(0, eval("delete('Xfile')"))
+    eq(-1, eval("delete('Xfile')"))
+  end)
+
+  it('directory delete', function()
+    command("call mkdir('Xdir1')")
+    eq(1, eval("isdirectory('Xdir1')"))
+    eq(0, eval("delete('Xdir1', 'd')"))
+    eq(0, eval("isdirectory('Xdir1')"))
+    eq(-1, eval("delete('Xdir1', 'd')"))
+  end)
+
   it('symlink delete', function()
     source([[
       split Xfile
@@ -43,39 +61,8 @@ describe('Test for delete()', function()
     eq(0, eval("delete('Xdir1', 'd')"))
   end)
 
-  it('symlink recursive delete', function()
-    source([[
-      call mkdir('Xdir3')
-      call mkdir('Xdir3/subdir')
-      call mkdir('Xdir4')
-      split Xdir3/Xfile
-      call setline(1, ['a', 'b'])
-      w
-      w Xdir3/subdir/Xfile
-      w Xdir4/Xfile
-      close
-      if has('win32')
-        silent !mklink /j Xdir3\Xlink Xdir4
-      else
-        silent !ln -s ../Xdir4 Xdir3/Xlink
-      endif
-    ]])
-
-    eq(1, eval("isdirectory('Xdir3')"))
-    eq(eval("['a', 'b']"), eval("readfile('Xdir3/Xfile')"))
-    eq(1, eval("isdirectory('Xdir3/subdir')"))
-    eq(eval("['a', 'b']"), eval("readfile('Xdir3/subdir/Xfile')"))
-    eq(1, eval("isdirectory('Xdir4')"))
-    eq(1, eval("isdirectory('Xdir3/Xlink')"))
-    eq(eval("['a', 'b']"), eval("readfile('Xdir4/Xfile')"))
-
-    eq(0, eval("delete('Xdir3', 'rf')"))
-    eq(0, eval("isdirectory('Xdir3')"))
-    eq(-1, eval("delete('Xdir3', 'd')"))
-    -- symlink is deleted, not the directory it points to
-    eq(1, eval("isdirectory('Xdir4')"))
-    eq(eval("['a', 'b']"), eval("readfile('Xdir4/Xfile')"))
-    eq(0, eval("delete('Xdir4/Xfile')"))
-    eq(0, eval("delete('Xdir4', 'd')"))
+  it('gives correct emsgs', function()
+    eq('Vim(call):E474: Invalid argument', exc_exec("call delete('')"))
+    eq('Vim(call):E15: Invalid expression: 0', exc_exec("call delete('foo', 0)"))
   end)
 end)