leigh/telescope.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(builtin.buffers): improve only_cwd handling with partial matches (#2845)

Browse Source 
closes #2843

Previously, bad partial matches between cwd and target buffer path would
result in non-cwd buffers showing up in the picker despite using
`only_cwd=true`.

eg.
cwd = `/foo/bar`
target buffer = `foo/bar1/baz.txt`
The target buffer starts with the cwd path.

This is fixed by appending a path separator before comparing/matching:
eg.
cwd = `/foo/bar/`
target buffer = `foo/bar1/baz.txt`
This commit is contained in:
James Trew
2024-01-03 19:49:03 -05:00
committed by GitHub
parent 983460fb8c
commit c621f71012
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lua/telescope/builtin/__internal.lua
View File

@@ -12,8 +12,6 @@ local utils = require "telescope.utils"
local conf = require("telescope.config").values local conf = require("telescope.config").values
local filter = vim.tbl_filter
-- Makes sure aliased options are set correctly -- Makes sure aliased options are set correctly
local function apply_cwd_only_aliases(opts) local function apply_cwd_only_aliases(opts)
local has_cwd_only = opts.cwd_only ~= nil local has_cwd_only = opts.cwd_only ~= nil
@@ -883,28 +881,39 @@ end
internal.buffers = function(opts) internal.buffers = function(opts)
opts = apply_cwd_only_aliases(opts) opts = apply_cwd_only_aliases(opts)
local bufnrs = filter(function(b)
if 1 ~= vim.fn.buflisted(b) then local function buf_not_in_cwd(bufnr, cwd)
if cwd:sub(-1) ~= Path.path.sep then
cwd = cwd .. Path.path.sep
end
return vim.api.nvim_buf_get_name(bufnr):find(cwd) == nil
end
local bufnrs = vim.tbl_filter(function(bufnr)
if 1 ~= vim.fn.buflisted(bufnr) then
return false return false
end end
-- only hide unloaded buffers if opts.show_all_buffers is false, keep them listed if true or nil -- only hide unloaded buffers if opts.show_all_buffers is false, keep them listed if true or nil
if opts.show_all_buffers == false and not vim.api.nvim_buf_is_loaded(b) then if opts.show_all_buffers == false and not vim.api.nvim_buf_is_loaded(bufnr) then
return false return false
end end
if opts.ignore_current_buffer and b == vim.api.nvim_get_current_buf() then if opts.ignore_current_buffer and bufnr == vim.api.nvim_get_current_buf() then
return false return false
end end
if opts.cwd_only and not string.find(vim.api.nvim_buf_get_name(b), vim.loop.cwd(), 1, true) then if opts.cwd_only and buf_not_in_cwd(bufnr, vim.loop.cwd()) then
return false return false
end end
if not opts.cwd_only and opts.cwd and not string.find(vim.api.nvim_buf_get_name(b), opts.cwd, 1, true) then if not opts.cwd_only and opts.cwd and buf_not_in_cwd(bufnr, opts.cwd) then
return false return false
end end
return true return true
end, vim.api.nvim_list_bufs()) end, vim.api.nvim_list_bufs())
if not next(bufnrs) then if not next(bufnrs) then
utils.notify("builtin.buffers", { msg = "No buffers found with the provided options", level = "INFO" })
return return
end end
if opts.sort_mru then if opts.sort_mru then
table.sort(bufnrs, function(a, b) table.sort(bufnrs, function(a, b)
return vim.fn.getbufinfo(a)[1].lastused > vim.fn.getbufinfo(b)[1].lastused return vim.fn.getbufinfo(a)[1].lastused > vim.fn.getbufinfo(b)[1].lastused