fix the case when '()' and '[]' are both in file path

This commit is contained in:
ljie-PI
2024-10-19 17:18:18 +08:00
parent 25d4f14b90
commit cbcadc65b4
2 changed files with 31 additions and 4 deletions

View File

@@ -329,12 +329,14 @@ local function open_in_new_window(filename, mode)
set_current_win_no_autocmd(target_winid, { "BufEnter" }) set_current_win_no_autocmd(target_winid, { "BufEnter" })
end end
print("filename: " .. filename)
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 = utils.escape_special_chars(vim.fn.fnameescape(utils.path_relative(filename, vim.fn.getcwd())))
else else
fname = utils.escape_special_chars(vim.fn.fnameescape(filename)) fname = utils.escape_special_chars(vim.fn.fnameescape(filename))
end end
print("fname: " .. fname)
local command local command
if create_new_window then if create_new_window then

View File

@@ -59,6 +59,17 @@ function M.path_basename(path)
return path:sub(i + 1, #path) return path:sub(i + 1, #path)
end end
--- Check if there are parentheses before brackets, it causes problems for windows.
--- Refer to issue #2862 and #2961 for more details.
local function has_parentheses_and_brackets(path)
local _, i_parentheses = path:find("(", 1, true)
local _, i_brackets = path:find("[", 1, true)
if i_parentheses and i_brackets then
return true
end
return false
end
--- Get a path relative to another path. --- Get a path relative to another path.
---@param path string ---@param path string
---@param relative_to string|nil ---@param relative_to string|nil
@@ -68,13 +79,18 @@ function M.path_relative(path, relative_to)
return path return path
end end
local _, r = path:find(M.path_add_trailing(relative_to), 1, true) local norm_path = path
local p = path if has_parentheses_and_brackets(path) then
norm_path = path:gsub("/", "\\")
end
local _, r = norm_path:find(M.path_add_trailing(relative_to), 1, true)
local p = norm_path
if r then if r then
-- take the relative path starting after '/' -- take the relative path starting after '/'
-- if somehow given a completely matching path, -- if somehow given a completely matching path,
-- returns "" -- returns ""
p = path:sub(r + 1) p = norm_path:sub(r + 1)
end end
return p return p
end end
@@ -272,6 +288,14 @@ function M.canonical_path(path)
return path return path
end end
--- Escapes special characters in string for windows, refer to issue #2862 and #2961 for more details.
local function escape_special_char_for_windows(path)
if has_parentheses_and_brackets(path) then
return path:gsub("\\", "/"):gsub("/ ", "\\ ")
end
return path:gsub("%(", "\\("):gsub("%)", "\\)")
end
--- Escapes special characters in string if windows else returns unmodified string. --- Escapes special characters in string if windows else returns unmodified string.
---@param path string ---@param path string
---@return string|nil ---@return string|nil
@@ -279,7 +303,8 @@ 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("%(", "\\("):gsub("%)", "\\)") or path
return M.is_windows and escape_special_char_for_windows(path) or path
end end
--- Create empty sub-tables if not present --- Create empty sub-tables if not present