Modified: escape path string.

lua/vfiler/libs/core.lua

@@ -333,18 +333,6 @@ end
 ---@param s string
 M.string.replace_keycode = vim.fn['vfiler#core#replace_keycode']
 
-if M.is_windows then
-  function M.string.shellescape(str)
-    -- convert path separator
-    str = str:gsub('/', '\\')
-    return ('"%s"'):format(vim.fn.trim(vim.fn.escape(str, '/'), '/\\'))
-  end
-else
-  function M.string.shellescape(str)
-    return vim.fn.shellescape(str)
-  end
-end
-
 function M.string.split(str, pattern)
   return vim.list.from(vim.fn.split(str, pattern))
 end

lua/vfiler/libs/filesystem.lua

@@ -153,19 +153,25 @@ else
   copy_directory_format = 'cp -fR %s %s'
 end
 
+local function escape(path)
+  if core.is_windows then
+    -- trim end
+    path = path:gsub('[/\\]+$', '')
+    -- convert path separator
+    path = path:gsub('/', '\\')
+    return ('"%s"'):format(vim.fn.escape(path, '/'))
+  else
+    return vim.fn.shellescape(path)
+  end
+end
+
 function M.copy_directory(src, dest)
-  local command = copy_directory_format:format(
-    core.string.shellescape(src),
-    core.string.shellescape(dest)
-  )
+  local command = copy_directory_format:format(escape(src), escape(dest))
   vim.fn.system(command)
 end
 
 function M.copy_file(src, dest)
-  local command = copy_file_format:format(
-    core.string.shellescape(src),
-    core.string.shellescape(dest)
-  )
+  local command = copy_file_format:format(escape(src), escape(dest))
   vim.fn.system(command)
 end
 

tests/vfiler/libs/core_spec.lua

@@ -90,22 +90,6 @@ describe('core.string', function()
       eq('あいうえおかきくけ..しすせそたちつてと', actual)
     end)
   end)
-
-  describe('shellescape', function()
-    if core.is_windows then
-      local paths = {
-        { input = 'C:/Users\\home/foo\\', excepted = '"C:\\Users\\home\\foo"', },
-        { input = 'C:/Users\\home/foo\\ba r', excepted = '"C:\\Users\\home\\foo\\ba r"', },
-      }
-      for _, path in ipairs(paths) do
-        it(path.input, function()
-          eq(path.excepted, core.string.shellescape(path.input))
-        end)
-      end
-    else
-      -- TODO:
-    end
-  end)
 end)
 
 describe('core.path', function()