Skip to content

Commit 25d4f14

Browse files
committed
Revert "fix(#2862): windows path replaces backslashes with forward slashes (#2903)"
This reverts commit 45a93d9.
1 parent 2a268f6 commit 25d4f14

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

lua/nvim-tree/actions/node/open-file.lua

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,9 @@ local function open_in_new_window(filename, mode)
331331

332332
local fname
333333
if M.relative_path then
334-
fname = vim.fn.fnameescape(utils.path_relative(filename, vim.fn.getcwd()))
334+
fname = utils.escape_special_chars(vim.fn.fnameescape(utils.path_relative(filename, vim.fn.getcwd())))
335335
else
336-
fname = vim.fn.fnameescape(filename)
336+
fname = utils.escape_special_chars(vim.fn.fnameescape(filename))
337337
end
338338

339339
local command
@@ -370,36 +370,35 @@ end
370370
---@param mode string
371371
---@param filename string
372372
function M.fn(mode, filename)
373-
local fname = utils.escape_special_chars(filename)
374373
if type(mode) ~= "string" then
375374
mode = ""
376375
end
377376

378377
if mode == "tabnew" then
379-
return open_file_in_tab(fname)
378+
return open_file_in_tab(filename)
380379
end
381380

382381
if mode == "drop" then
383-
return drop(fname)
382+
return drop(filename)
384383
end
385384

386385
if mode == "tab_drop" then
387-
return tab_drop(fname)
386+
return tab_drop(filename)
388387
end
389388

390389
if mode == "edit_in_place" then
391-
return edit_in_current_buf(fname)
390+
return edit_in_current_buf(filename)
392391
end
393392

394-
local buf_loaded = is_already_loaded(fname)
393+
local buf_loaded = is_already_loaded(filename)
395394

396395
local found_win = utils.get_win_buf_from_path(filename)
397396
if found_win and (mode == "preview" or mode == "preview_no_picker") then
398397
return
399398
end
400399

401400
if not found_win then
402-
open_in_new_window(fname, mode)
401+
open_in_new_window(filename, mode)
403402
else
404403
vim.api.nvim_set_current_win(found_win)
405404
vim.bo.bufhidden = ""

lua/nvim-tree/utils.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ function M.escape_special_chars(path)
279279
if path == nil then
280280
return path
281281
end
282-
return M.is_windows and path:gsub("\\", "/") or path
282+
return M.is_windows and path:gsub("%(", "\\("):gsub("%)", "\\)") or path
283283
end
284284

285285
--- Create empty sub-tables if not present

0 commit comments

Comments
 (0)