fix: do not pass sanitized directories into utils.dirs_match (#148)
parent
b0de69da63
commit
03990e44c3
|
|
@ -12,23 +12,18 @@ function M.fire(event)
|
||||||
vim.api.nvim_exec_autocmds("User", { pattern = "Persisted" .. event })
|
vim.api.nvim_exec_autocmds("User", { pattern = "Persisted" .. event })
|
||||||
end
|
end
|
||||||
|
|
||||||
---Get the current working directory
|
|
||||||
---@return string
|
|
||||||
function M.cwd()
|
|
||||||
return utils.sanitize_dir(vim.fn.getcwd())
|
|
||||||
end
|
|
||||||
|
|
||||||
---Get the current session for the current working directory and git branch
|
---Get the current session for the current working directory and git branch
|
||||||
---@param opts? {branch?: boolean}
|
---@param opts? {branch?: boolean}
|
||||||
---@return string
|
---@return string
|
||||||
function M.current(opts)
|
function M.current(opts)
|
||||||
opts = opts or {}
|
opts = opts or {}
|
||||||
local name = M.cwd()
|
local name = utils.make_fs_safe(vim.fn.getcwd())
|
||||||
|
|
||||||
if config.use_git_branch and opts.branch ~= false then
|
if config.use_git_branch and opts.branch ~= false then
|
||||||
local branch = M.branch()
|
local branch = M.branch()
|
||||||
if branch then
|
if branch then
|
||||||
name = name .. "@@" .. branch:gsub("[\\/:]+", "%%")
|
branch = utils.make_fs_safe(branch)
|
||||||
|
name = name .. "@@" .. branch
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -164,7 +159,7 @@ function M.allowed_dir(opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
opts = opts or {}
|
opts = opts or {}
|
||||||
local dir = opts.dir or M.cwd()
|
local dir = opts.dir or vim.fn.getcwd()
|
||||||
|
|
||||||
return utils.dirs_match(dir, config.allowed_dirs) and not utils.dirs_match(dir, config.ignored_dirs)
|
return utils.dirs_match(dir, config.allowed_dirs) and not utils.dirs_match(dir, config.ignored_dirs)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
--- Escape special pattern matching characters in a string
|
--- Escapes the given text to be safe for use in file-system paths/names,
|
||||||
---@param dir string
|
--- accounting for cross-platform use.
|
||||||
function M.sanitize_dir(dir)
|
---@param text string
|
||||||
return dir:gsub("[\\/:]+", "%%")
|
function M.make_fs_safe(text)
|
||||||
|
return text:gsub("[\\/:]+", "%%")
|
||||||
end
|
end
|
||||||
|
|
||||||
---Get the directory pattern based on OS
|
---Get the directory pattern based on OS
|
||||||
|
|
@ -29,17 +30,17 @@ end
|
||||||
---@param dirs table The table of directories to search in
|
---@param dirs table The table of directories to search in
|
||||||
---@return boolean
|
---@return boolean
|
||||||
function M.dirs_match(dir, dirs)
|
function M.dirs_match(dir, dirs)
|
||||||
dir = M.sanitize_dir(vim.fn.expand(dir))
|
dir = M.make_fs_safe(vim.fn.expand(dir))
|
||||||
|
|
||||||
for _, search in ipairs(dirs) do
|
for _, search in ipairs(dirs) do
|
||||||
if type(search) == "string" then
|
if type(search) == "string" then
|
||||||
search = M.sanitize_dir(vim.fn.expand(search))
|
search = M.make_fs_safe(vim.fn.expand(search))
|
||||||
if M.is_subdirectory(search, dir) then
|
if M.is_subdirectory(search, dir) then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
elseif type(search) == "table" then
|
elseif type(search) == "table" then
|
||||||
if search.exact then
|
if search.exact then
|
||||||
search = M.sanitize_dir(vim.fn.expand(search[1]))
|
search = M.make_fs_safe(vim.fn.expand(search[1]))
|
||||||
if dir == search then
|
if dir == search then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue