fix: crash when current file contains "()" characters in its path/name

Fixes #75
mikavilpas · May 18, 2024 · ca914e0 · ca914e0
1 parent 163d9b0
commit ca914e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lua/yazi/utils/path.lua b/lua/yazi/utils/path.lua
@@ -20,7 +20,7 @@ local M = {}
 ---@param path string
 ---@return string
 M.escape_path_for_cmd = function(path)
-  local escaped_path = vim.fn.fnameescape(path)
+  local escaped_path = vim.fn.shellescape(path)
   if M.is_windows then
     -- Replace forward slash spaces with just spaces.
     escaped_path = escaped_path:gsub('\\ ', ' ')

diff --git a/tests/yazi/open_dir_spec.lua b/tests/yazi/open_dir_spec.lua
@@ -25,7 +25,7 @@ describe('when the user set open_for_directories = true', function()
     vim.api.nvim_command('edit /')
 
     assert.stub(api_mock.termopen).was_called_with(
-      'yazi / --local-events "rename,delete,trash,move" --chooser-file "/tmp/yazi_filechosen" > "/tmp/yazi.nvim.events.txt"',
+      'yazi \'/\' --local-events "rename,delete,trash,move" --chooser-file "/tmp/yazi_filechosen" > "/tmp/yazi.nvim.events.txt"',
       match.is_table()
     )
   end)

diff --git a/tests/yazi/yazi_spec.lua b/tests/yazi/yazi_spec.lua
@@ -42,7 +42,7 @@ describe('opening a file', function()
     })
 
     assert.stub(api_mock.termopen).was_called_with(
-      'yazi /abc/test\\ file-\\$1.txt --local-events "rename,delete,trash,move" --chooser-file "/tmp/yazi_filechosen" > "/tmp/yazi.nvim.events.txt"',
+      'yazi \'/abc/test file-$1.txt\' --local-events "rename,delete,trash,move" --chooser-file "/tmp/yazi_filechosen" > "/tmp/yazi.nvim.events.txt"',
       match.is_table()
     )
   end)
@@ -56,7 +56,7 @@ describe('opening a file', function()
     })
 
     assert.stub(api_mock.termopen).was_called_with(
-      'yazi /tmp/ --local-events "rename,delete,trash,move" --chooser-file "/tmp/yazi_filechosen" > "/tmp/yazi.nvim.events.txt"',
+      'yazi \'/tmp/\' --local-events "rename,delete,trash,move" --chooser-file "/tmp/yazi_filechosen" > "/tmp/yazi.nvim.events.txt"',
       match.is_table()
     )
   end)