fix(#2004): remove unintentional captures in path_to_matching_str #2005
Conversation
There was a problem hiding this comment.
This fixes the case for underscores and dashes, however there is still potential for other magic regex characters to cause an issue.
A more complete solution might be for path_relative to use string.find (plain) and string.sub to extract the relative path without needing to resort to regexes.
Are you keen to make that change?
lua/nvim-tree/utils.lua
Outdated
| @@ -12,7 +12,7 @@ M.is_wsl = vim.fn.has "wsl" == 1 | |||
| 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("(%_)", "(%%_)") | |||
| return path:gsub("(%-)", "%%-"):gsub("(%.)", "%%."):gsub("(%_)", "%%_") | |||
There was a problem hiding this comment.
That definitely fixes it. Those captures weren't necessary.
Hmm.. looks like string.find expects a pattern so there's no avoiding of striping the escape characters. From the manual:
Is there a version that's straigthforward string match? I tried |
You can use the third argument |
kting28
force-pushed
the
kting28-patch-1
branch
2 times, most recently
from
463f0e6 to
9222462
Compare
|
Updated PR. I kept the original path_to_matching_str (with captures removed) for reference |
No need; please remove. |
lua/nvim-tree/utils.lua
Outdated
| 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 and r < p:len() then |
There was a problem hiding this comment.
Looking good... except when there is a trailing slash.
See test case attached.
2005-test.lua.gz
There was a problem hiding this comment.
Thanks for the test cases. Just pushed the fix. previously version if relative == path, I kept the path but to match the original gsub version, the code now just returns ""
There was a problem hiding this comment.
no problem, thanks for the excellent plugin!
…tring to avoid using regex. - This removed the original gsub with unintentional captures in path_to_matching_str - The original regex based code captures create a limit where input path cannot have more than 32 special charactors ( `.` , `_` or `-`)
kting28
force-pushed
the
kting28-patch-1
branch
from
9222462 to
418878b
Compare
fixes #2004
The captures creates a limit where input path cannot have more than 32 special charactors (
.,_or-)