fix(builtin.oldfiles): cwd matching with special characters (#2860)
`vim.fn.matchstrpos({expr}, {pat})` doesn't handle all characters well
since the pattern (cwd path in this case) is used as a regex pattern.
This commit is contained in:
@@ -26,6 +26,15 @@ local function apply_cwd_only_aliases(opts)
|
||||
return opts
|
||||
end
|
||||
|
||||
---@return boolean
|
||||
local function buf_in_cwd(bufname, cwd)
|
||||
if cwd:sub(-1) ~= Path.path.sep then
|
||||
cwd = cwd .. Path.path.sep
|
||||
end
|
||||
local bufname_prefix = bufname:sub(1, #cwd)
|
||||
return bufname_prefix == cwd
|
||||
end
|
||||
|
||||
local internal = {}
|
||||
|
||||
internal.builtin = function(opts)
|
||||
@@ -544,7 +553,7 @@ internal.oldfiles = function(opts)
|
||||
cwd = cwd .. utils.get_separator()
|
||||
cwd = cwd:gsub([[\]], [[\\]])
|
||||
results = vim.tbl_filter(function(file)
|
||||
return vim.fn.matchstrpos(file, cwd)[2] ~= -1
|
||||
return buf_in_cwd(file, cwd)
|
||||
end, results)
|
||||
end
|
||||
|
||||
@@ -882,14 +891,6 @@ end
|
||||
internal.buffers = function(opts)
|
||||
opts = apply_cwd_only_aliases(opts)
|
||||
|
||||
local function buf_not_in_cwd(bufnr, cwd)
|
||||
if cwd:sub(-1) ~= Path.path.sep then
|
||||
cwd = cwd .. Path.path.sep
|
||||
end
|
||||
local bufname_prefix = vim.api.nvim_buf_get_name(bufnr):sub(1, #cwd)
|
||||
return bufname_prefix ~= cwd
|
||||
end
|
||||
|
||||
local bufnrs = vim.tbl_filter(function(bufnr)
|
||||
if 1 ~= vim.fn.buflisted(bufnr) then
|
||||
return false
|
||||
@@ -901,10 +902,13 @@ internal.buffers = function(opts)
|
||||
if opts.ignore_current_buffer and bufnr == vim.api.nvim_get_current_buf() then
|
||||
return false
|
||||
end
|
||||
if opts.cwd_only and buf_not_in_cwd(bufnr, vim.loop.cwd()) then
|
||||
|
||||
local bufname = vim.api.nvim_buf_get_name(bufnr)
|
||||
|
||||
if opts.cwd_only and not buf_in_cwd(bufname, vim.loop.cwd()) then
|
||||
return false
|
||||
end
|
||||
if not opts.cwd_only and opts.cwd and buf_not_in_cwd(bufnr, opts.cwd) then
|
||||
if not opts.cwd_only and opts.cwd and not buf_in_cwd(bufname, opts.cwd) then
|
||||
return false
|
||||
end
|
||||
return true
|
||||
|
||||
Reference in New Issue
Block a user