Skip to content

fix: bookmark filter should include parent directory #2704

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
merged 4 commits into from
Mar 15, 2024
Merged

fix: bookmark filter should include parent directory #2704

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
def7bf0
fix: bookmark filter should include parent directory
remvn Mar 12, 2024
49d85b4
fix: dont match mark's siblings
remvn Mar 12, 2024
8672b92
fix: match mark from the start
remvn Mar 14, 2024
1d5bd98
Merge branch 'master' into fix/bookmark-filter
alex-courtis Mar 15, 2024
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
15 changes: 14 additions & 1 deletion lua/nvim-tree/explorer/filters.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,20 @@ end
---@param path string
---@param bookmarks table<string, boolean> absolute paths bookmarked
local function bookmark(path, bookmarks)
return M.config.filter_no_bookmark and not bookmarks[path]
if not M.config.filter_no_bookmark then
return false
end

-- add trailing slash to make it match only mark's parent directory
-- not it's siblings
local parent = utils.path_add_trailing(path)
for mark, _ in pairs(bookmarks) do
if path == mark or vim.fn.stridx(mark, parent) == 0 then
return false
end
end

return true
end

---@param path string
Expand Down