Skip to content

fix(#2004): remove unintentional captures in path_to_matching_str #2005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-courtis merged 2 commits into from
Feb 19, 2023
Merged

fix(#2004): remove unintentional captures in path_to_matching_str #2005

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
418878b
fix(#2004): Change path_relative to use string find and substring to …
kting28 Feb 17, 2023
7a05754
style nit
alex-courtis Feb 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions lua/nvim-tree/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ M.is_wsl = vim.fn.has "wsl" == 1
-- false for WSL
M.is_windows = vim.fn.has "win32" == 1 or vim.fn.has "win32unix" == 1

function M.path_to_matching_str(path)
return path:gsub("(%-)", "(%%-)"):gsub("(%.)", "(%%.)"):gsub("(%_)", "(%%_)")
end

function M.str_find(haystack, needle)
return vim.fn.stridx(haystack, needle) ~= -1
end
Expand Down Expand Up @@ -59,7 +55,14 @@ end
---@param relative_to string
---@return string
function M.path_relative(path, relative_to)
local p, _ = path:gsub("^" .. M.path_to_matching_str(M.path_add_trailing(relative_to)), "")
local _, r = path:find(M.path_add_trailing(relative_to), 1, true)
local p = path
if r then
-- take the relative path starting after '/'
-- if somehow given a completely matching path,
-- returns ""
p = path:sub(r + 1)
end
return p
end

Expand Down