tomas.mirchev/nvim-tree.lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(#2862): windows path replaces backslashes with forward slashes (#2903)

Browse Source 
* Fix Winodws path issue by replacing backslashes with forward slashes

* Fix #2862 (handle all filename-related tasks)

* fix type mismatch

---------

Co-authored-by: Alexander Courtis <alex@courtis.org>
This commit is contained in:
Zifan Zhu 2024-09-14 22:23:37 -04:00 committed by GitHub
parent bd4881660b
commit 45a93d9979
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lua/nvim-tree/actions/node/open-file.lua
View File

@ -333,9 +333,9 @@ local function open_in_new_window(filename, mode)
local fname local fname
if M.relative_path then if M.relative_path then
fname = utils.escape_special_chars(vim.fn.fnameescape(utils.path_relative(filename, vim.fn.getcwd()))) fname = vim.fn.fnameescape(utils.path_relative(filename, vim.fn.getcwd()))
else else
fname = utils.escape_special_chars(vim.fn.fnameescape(filename)) fname = vim.fn.fnameescape(filename)
end end
local command local command
@ -372,27 +372,28 @@ end
---@param mode string ---@param mode string
---@param filename string ---@param filename string
function M.fn(mode, filename) function M.fn(mode, filename)
local fname = utils.escape_special_chars(filename)
if type(mode) ~= "string" then if type(mode) ~= "string" then
mode = "" mode = ""
end end
if mode == "tabnew" then if mode == "tabnew" then
return open_file_in_tab(filename) return open_file_in_tab(fname)
end end
if mode == "drop" then if mode == "drop" then
return drop(filename) return drop(fname)
end end
if mode == "tab_drop" then if mode == "tab_drop" then
return tab_drop(filename) return tab_drop(fname)
end end
if mode == "edit_in_place" then if mode == "edit_in_place" then
return edit_in_current_buf(filename) return edit_in_current_buf(fname)
end end
local buf_loaded = is_already_loaded(filename) local buf_loaded = is_already_loaded(fname)
local found_win = utils.get_win_buf_from_path(filename) local found_win = utils.get_win_buf_from_path(filename)
if found_win and (mode == "preview" or mode == "preview_no_picker") then if found_win and (mode == "preview" or mode == "preview_no_picker") then
@ -400,7 +401,7 @@ function M.fn(mode, filename)
end end
if not found_win then if not found_win then
open_in_new_window(filename, mode) open_in_new_window(fname, mode)
else else
vim.api.nvim_set_current_win(found_win) vim.api.nvim_set_current_win(found_win)
vim.bo.bufhidden = "" vim.bo.bufhidden = ""

2
lua/nvim-tree/utils.lua
View File

@ -290,7 +290,7 @@ function M.escape_special_chars(path)
if path == nil then if path == nil then
return path return path
end end
return M.is_windows and path:gsub("%(", "\\("):gsub("%)", "\\)") or path return M.is_windows and path:gsub("\\", "/") or path
end end
--- Create empty sub-tables if not present --- Create empty sub-tables if not present