barrett/canola.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

fix(windows): file operation preview uses only backslash path separator (#336)

Browse source
This commit is contained in:
Steven Arcangeli 2024-04-23 20:20:58 -07:00
parent be0a1ecbf0
commit 96f0983e75
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/oil/adapters/files.lua
View file

@ -40,7 +40,7 @@ end
M.to_short_os_path = function(path, entry_type) M.to_short_os_path = function(path, entry_type)
local shortpath = fs.shorten_path(fs.posix_to_os_path(path)) local shortpath = fs.shorten_path(fs.posix_to_os_path(path))
if entry_type == "directory" then if entry_type == "directory" then
shortpath = util.addslash(shortpath) shortpath = util.addslash(shortpath, true)
end end
return shortpath return shortpath
end end

12
lua/oil/util.lua
View file

@ -337,10 +337,16 @@ M.set_highlights = function(bufnr, highlights)
end end
---@param path string ---@param path string
---@param os_slash? boolean use os filesystem slash instead of posix slash
---@return string ---@return string
M.addslash = function(path) M.addslash = function(path, os_slash)
if not vim.endswith(path, "/") then local slash = "/"
return path .. "/" if os_slash and require("oil.fs").is_windows then
slash = "\\"
end
if not vim.endswith(path, slash) then
return path .. slash
else else
return path return path
end end