Merge branch 'master' into live-filter-multiinstace

This commit is contained in:
Mateusz Russak
2024-07-27 13:26:26 +02:00
10 changed files with 225 additions and 183 deletions

View File

@@ -2,8 +2,10 @@ local git = require "nvim-tree.git"
local notify = require "nvim-tree.notify"
local watch = require "nvim-tree.explorer.watch"
local explorer_node = require "nvim-tree.explorer.node"
local Filters = require "nvim-tree.explorer.filters"
local Marks = require "nvim-tree.marks"
local LiveFilter = require "nvim-tree.live-filter"
local Sorters = require "nvim-tree.explorer.sorters"
local M = {}
@@ -39,10 +41,12 @@ function Explorer.new(path)
absolute_path = path,
nodes = {},
open = true,
live_filter = LiveFilter:new(M.config),
marks = Marks:new(),
sorters = Sorters:new(M.config),
}, Explorer)
explorer.watcher = watch.create_watcher(explorer)
explorer.filters = Filters:new(M.config, explorer)
explorer.live_filter = LiveFilter:new(M.config, explorer)
explorer:_load(explorer)
return explorer
end
@@ -52,7 +56,7 @@ end
function Explorer:_load(node)
local cwd = node.link_to or node.absolute_path
local git_status = git.load_project_status(cwd)
M.explore(node, git_status)
M.explore(node, git_status, self)
end
---@param node Node
@@ -73,10 +77,9 @@ function Explorer:destroy()
end
function M.setup(opts)
M.config = opts
require("nvim-tree.explorer.node").setup(opts)
require("nvim-tree.explorer.explore").setup(opts)
require("nvim-tree.explorer.filters").setup(opts)
require("nvim-tree.explorer.sorters").setup(opts)
require("nvim-tree.explorer.reload").setup(opts)
require("nvim-tree.explorer.watch").setup(opts)
end