tomas.mirchev/nvim-tree.lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refacto: buffer management, setup fixes, autocmd fixes (#967)

Browse Source
This commit is contained in:
Kiyan
2022-02-14 19:16:45 +01:00
committed by GitHub
parent 3f4ed9b6c2
commit 6da7467944
11 changed files with 377 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lua/nvim-tree/actions/change-dir.lua
View File

@@ -1,5 +1,4 @@
local a = vim.api
local lib = function() return require'nvim-tree.lib' end
local utils = require'nvim-tree.utils'
local M = {
@@ -9,7 +8,7 @@ local M = {
}
}
function M.fn(name)
function M.fn(name, with_open)
if not TreeExplorer then return end
local foldername = name == '..' and vim.fn.fnamemodify(utils.path_remove_trailing(TreeExplorer.cwd), ':h') or name
@@ -20,13 +19,18 @@ function M.fn(name)
return
end
M.current_tab = new_tab
M.force_dirchange(foldername, with_open)
end
if M.options.global then
vim.cmd('cd '..vim.fn.fnameescape(foldername))
else
vim.cmd('lcd '..vim.fn.fnameescape(foldername))
function M.force_dirchange(foldername, with_open)
if vim.tbl_isempty(vim.v.event) then
if M.options.global then
vim.cmd('cd '..vim.fn.fnameescape(foldername))
else
vim.cmd('lcd '..vim.fn.fnameescape(foldername))
end
end
lib().init(false, foldername)
require'nvim-tree.lib'.init(with_open, foldername)
end
function M.setup(options)

2
lua/nvim-tree/actions/find-file.lua
View File

@@ -56,7 +56,7 @@ function M.fn(fname)
if tree_altered then
renderer.draw()
end
if index and view.win_open() then
if index and view.is_visible() then
view.set_cursor({index, 0})
end
end

1
lua/nvim-tree/actions/init.lua
View File

@@ -156,6 +156,7 @@ function M.setup(opts)
require'nvim-tree.actions.system-open'.setup(opts.system_open)
require'nvim-tree.actions.trash'.setup(opts.trash)
require'nvim-tree.actions.open-file'.setup(opts)
require'nvim-tree.actions.change-dir'.setup(opts)
local user_map_config = (opts.view or {}).mappings or {}
local options = vim.tbl_deep_extend('force', DEFAULT_MAPPING_CONFIG, user_map_config)

2
lua/nvim-tree/actions/reloaders.lua
View File

@@ -41,7 +41,7 @@ function M.reload_explorer(callback)
git.reload(function(projects)
refresh_nodes(TreeExplorer, projects)
if view.win_open() then
if view.is_visible() then
renderer.draw()
if callback and type(callback) == 'function' then
callback()

4
lua/nvim-tree/diagnostics.lua
View File

@@ -25,7 +25,7 @@ local sign_names = {
local signs = {}
local function add_sign(linenr, severity)
local buf = view.View.bufnr
local buf = view.get_bufnr()
if not a.nvim_buf_is_valid(buf) or not a.nvim_buf_is_loaded(buf) then return end
local sign_name = sign_names[severity][1]
table.insert(signs, vim.fn.sign_place(1, 'NvimTreeDiagnosticSigns', sign_name, buf, { lnum = linenr+1 }))
@@ -114,7 +114,7 @@ function M.update()
if #signs then
vim.fn.sign_unplacelist(vim.tbl_map(function(sign)
return {
buffer = view.View.bufnr,
buffer = view.get_bufnr(),
group = "NvimTreeDiagnosticSigns",
id = sign
}

36
lua/nvim-tree/lib.lua
View File

@@ -17,10 +17,10 @@ TreeExplorer = nil
function M.init(with_open, foldername)
TreeExplorer = explorer.Explorer.new(foldername)
TreeExplorer:init(function()
renderer.draw()
if with_open then
M.open()
view.open_in_current_win()
end
renderer.draw()
if not first_init_done then
events._dispatch_ready()
@@ -103,24 +103,30 @@ function M.set_target_win()
M.target_winid = id
end
function M.open()
M.set_target_win()
local cwd = vim.fn.getcwd()
if view.View.bufnr == nil then
vim.schedule(function ()
M.open()
end)
return
end
local should_redraw = view.open()
local function handle_buf_cwd(cwd)
local respect_buf_cwd = vim.g.nvim_tree_respect_buf_cwd or 0
if respect_buf_cwd == 1 and cwd ~= TreeExplorer.cwd then
require'nvim-tree.actions.change-dir'.fn(cwd)
end
if should_redraw then
end
local function open_view_and_draw()
local cwd = vim.fn.getcwd()
view.open()
handle_buf_cwd(cwd)
renderer.draw()
end
function M.open(cwd)
M.set_target_win()
if not TreeExplorer or cwd then
M.init(false, cwd or vim.loop.cwd())
end
if api.nvim_buf_get_name(api.nvim_get_current_buf()) == "" then
view.open_in_current_win()
renderer.draw()
else
open_view_and_draw()
end
end

13
lua/nvim-tree/renderer/init.lua
View File

@@ -371,11 +371,12 @@ end
local M = {}
function M.draw()
if not TreeExplorer or not view.View.bufnr or not api.nvim_buf_is_loaded(view.View.bufnr) then
local bufnr = view.get_bufnr()
if not TreeExplorer or not bufnr or not api.nvim_buf_is_loaded(bufnr) then
return
end
local cursor
if view.win_open() then
if view.is_visible() then
cursor = api.nvim_win_get_cursor(view.get_winnr())
end
index = 0
@@ -393,10 +394,10 @@ function M.draw()
if view.is_help_ui() then
lines, hl = _help.compute_lines()
end
api.nvim_buf_set_option(view.View.bufnr, 'modifiable', true)
api.nvim_buf_set_lines(view.View.bufnr, 0, -1, false, lines)
M.render_hl(view.View.bufnr)
api.nvim_buf_set_option(view.View.bufnr, 'modifiable', false)
api.nvim_buf_set_option(bufnr, 'modifiable', true)
api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
M.render_hl(bufnr)
api.nvim_buf_set_option(bufnr, 'modifiable', false)
if cursor and #lines >= cursor[1] then
api.nvim_win_set_cursor(view.get_winnr(), cursor)

468
lua/nvim-tree/view.lua
View File

@@ -3,17 +3,15 @@ local a = vim.api
local M = {}
M.View = {
last_focused_winnr = nil,
bufnr = nil,
tabpages = {},
hide_root_folder = false,
winopts = {
relativenumber = false,
number = false,
list = false,
foldenable = false,
winfixwidth = true,
winfixheight = true,
foldenable = false,
spell = false,
signcolumn = 'yes',
foldmethod = 'manual',
@@ -33,36 +31,281 @@ M.View = {
'NormalNC:NvimTreeNormalNC',
}, ',')
},
bufopts = {
{ name = 'swapfile', val = false },
{ name = 'buftype', val = 'nofile' },
{ name = 'modifiable', val = false },
{ name = 'filetype', val = 'NvimTree' },
{ name = 'bufhidden', val = 'hide' }
},
}
local BUFNR = nil
local LAST_FOCUSED_WIN = nil
local BUFFER_OPTIONS = {
swapfile = false,
buftype = 'nofile',
modifiable = false,
filetype = 'NvimTree',
bufhidden = 'wipe',
buflisted = false,
}
local function wipe_rogue_buffer()
for _, bn in ipairs(a.nvim_list_bufs()) do
if vim.fn.bufname(bn) == "NvimTree" then
return pcall(a.nvim_buf_delete, bn, { force = true })
for _, bufnr in ipairs(a.nvim_list_bufs()) do
if bufnr ~= BUFNR and a.nvim_buf_get_name(bufnr):match("NvimTree") ~= nil then
return pcall(a.nvim_buf_delete, bufnr, { force = true })
end
end
end
-- FIXME: setting options to buffer clears the startup screen
function M.create_buffer()
local function create_buffer(bufnr)
BUFNR = bufnr or a.nvim_create_buf(false, false)
wipe_rogue_buffer()
M.View.bufnr = a.nvim_create_buf(false, false)
a.nvim_buf_set_name(M.View.bufnr, 'NvimTree')
a.nvim_buf_set_name(BUFNR, 'NvimTree')
for _, opt in ipairs(M.View.bufopts) do
vim.bo[M.View.bufnr][opt.name] = opt.val
for option, value in pairs(BUFFER_OPTIONS) do
vim.bo[BUFNR][option] = value
end
require'nvim-tree.actions'.apply_mappings(M.View.bufnr)
require'nvim-tree.actions'.apply_mappings(BUFNR)
end
local function get_size()
local width_or_height = M.is_vertical() and 'width' or 'height'
local size = M.View[width_or_height]
if type(size) == "number" then
return size
elseif type(size) == "function" then
return size()
end
local size_as_number = tonumber(size:sub(0, -2))
local percent_as_decimal = size_as_number / 100
return math.floor(vim.o.columns * percent_as_decimal)
end
local move_tbl = {
left = 'H',
right = 'L',
bottom = 'J',
top = 'K',
}
-- TODO: remove this once they fix https://github.com/neovim/neovim/issues/14670
local function set_local(opt, value)
local cmd
if value == true then
cmd = string.format('setlocal %s', opt)
elseif value == false then
cmd = string.format('setlocal no%s', opt)
else
cmd = string.format('setlocal %s=%s', opt, value)
end
vim.cmd(cmd)
end
local function open_window()
a.nvim_command("vsp")
M.reposition_window()
local winnr = a.nvim_get_current_win()
local tabpage = a.nvim_get_current_tabpage()
M.View.tabpages[tabpage] = vim.tbl_extend("force", M.View.tabpages[tabpage] or {help = false}, {winnr = winnr})
end
local function set_window_options_and_buffer()
pcall(vim.cmd, "buffer "..BUFNR)
for k, v in pairs(M.View.winopts) do
set_local(k, v)
end
end
local function get_existing_buffers()
return vim.tbl_filter(
function(buf)
return a.nvim_buf_is_valid(buf) and vim.fn.buflisted(buf) == 1
end,
a.nvim_list_bufs()
)
end
local function switch_buf_if_last_buf()
if #a.nvim_list_wins() == 1 then
if #get_existing_buffers() > 0 then
vim.cmd "sbnext"
else
vim.cmd "new"
end
end
end
function M.close()
if not M.is_visible() then return end
switch_buf_if_last_buf()
local tree_win = M.get_winnr()
local current_win = a.nvim_get_current_win()
for _, win in pairs(a.nvim_list_wins()) do
if tree_win ~= win and a.nvim_win_get_config(win).relative == "" then
a.nvim_win_close(tree_win, true)
if tree_win == current_win and LAST_FOCUSED_WIN then
a.nvim_set_current_win(LAST_FOCUSED_WIN)
end
return
end
end
end
function M.open(options)
if M.is_visible() then
return
end
LAST_FOCUSED_WIN = a.nvim_get_current_win()
create_buffer()
open_window()
set_window_options_and_buffer()
M.resize()
local opts = options or { focus_tree = true }
if not opts.focus_tree then
vim.cmd("wincmd p")
end
end
function M.resize(size)
if size then
M.View.width = size
M.View.height = size
end
if not M.is_visible() then
return
end
if M.is_vertical() then
a.nvim_win_set_width(M.get_winnr(), get_size())
else
a.nvim_win_set_height(M.get_winnr(), get_size())
end
vim.cmd ":wincmd ="
end
function M.reposition_window()
local move_to = move_tbl[M.View.side]
a.nvim_command("wincmd "..move_to)
local resize_direction = M.is_vertical() and 'vertical ' or ''
a.nvim_command(resize_direction.."resize "..get_size())
end
local function set_current_win()
local current_tab = a.nvim_get_current_tabpage()
M.View.tabpages[current_tab] = { winnr = a.nvim_get_current_win() }
end
function M.open_in_current_win()
create_buffer(a.nvim_get_current_buf())
set_current_win()
set_window_options_and_buffer()
M.reposition_window()
M.resize()
end
function M.is_visible(opts)
if opts and opts.any_tabpage then
for _, v in pairs(M.View.tabpages) do
if a.nvim_win_is_valid(v.winnr) then
return true
end
end
return false
end
return M.get_winnr() ~= nil and a.nvim_win_is_valid(M.get_winnr())
end
function M.set_cursor(opts)
if M.is_visible() then
pcall(a.nvim_win_set_cursor, M.get_winnr(), opts)
end
end
function M.focus(winnr, open_if_closed)
local wnr = winnr or M.get_winnr()
if a.nvim_win_get_tabpage(wnr) ~= a.nvim_win_get_tabpage(0) then
M.close()
M.open()
wnr = M.get_winnr()
elseif open_if_closed and not M.is_visible() then
M.open()
end
a.nvim_set_current_win(wnr)
end
function M.is_vertical()
return M.View.side == 'left' or M.View.side == 'right'
end
--- Returns the window number for nvim-tree within the tabpage specified
---@param tabpage number: (optional) the number of the chosen tabpage. Defaults to current tabpage.
---@return number
function M.get_winnr(tabpage)
tabpage = tabpage or a.nvim_get_current_tabpage()
local tabinfo = M.View.tabpages[tabpage]
if tabinfo ~= nil then
return tabinfo.winnr
end
end
--- Returns the current nvim tree bufnr
---@return number
function M.get_bufnr()
return BUFNR
end
--- Checks if nvim-tree is displaying the help ui within the tabpage specified
---@param tabpage number: (optional) the number of the chosen tabpage. Defaults to current tabpage.
---@return number
function M.is_help_ui(tabpage)
tabpage = tabpage or a.nvim_get_current_tabpage()
local tabinfo = M.View.tabpages[tabpage]
if tabinfo ~= nil then
return tabinfo.help
end
end
function M.toggle_help(tabpage)
tabpage = tabpage or a.nvim_get_current_tabpage()
M.View.tabpages[tabpage].help = not M.View.tabpages[tabpage].help
end
function M.is_buf_valid(bufnr)
return bufnr and a.nvim_buf_is_valid(bufnr) and a.nvim_buf_is_loaded(bufnr)
end
function M._prevent_buffer_override()
local view_winnr = M.get_winnr()
local view_bufnr = M.get_bufnr()
-- need to schedule to let the new buffer populate the window
-- because this event needs to be run on bufWipeout.
-- Otherwise the curwin/curbuf would match the view buffer and the view window.
vim.schedule(function()
local curwin = a.nvim_get_current_win()
local curbuf = a.nvim_win_get_buf(curwin)
local bufname = a.nvim_buf_get_name(curbuf)
if not bufname:match("NvimTree") then
M.View.tabpages = {}
end
if curwin ~= view_winnr or bufname == "" or curbuf == view_bufnr then
return
end
-- patch to avoid the overriding window to be fixed in size
-- might need a better patch
vim.cmd "setlocal nowinfixwidth"
vim.cmd "setlocal nowinfixheight"
M.open({ focus_tree = false })
require"nvim-tree.renderer".draw()
require"nvim-tree".find_file(false)
end)
end
local DEFAULT_CONFIG = {
width = 30,
height = 30,
@@ -85,189 +328,4 @@ function M.setup(opts)
M.View.winopts.signcolumn = options.signcolumn
end
function M.win_open(opts)
if opts and opts.any_tabpage then
for _, v in pairs(M.View.tabpages) do
if a.nvim_win_is_valid(v.winnr) then
return true
end
end
return false
else
return M.get_winnr() ~= nil and a.nvim_win_is_valid(M.get_winnr())
end
end
function M.set_cursor(opts)
if M.win_open() then
pcall(a.nvim_win_set_cursor, M.get_winnr(), opts)
end
end
function M.focus(winnr, open_if_closed)
local wnr = winnr or M.get_winnr()
if a.nvim_win_get_tabpage(wnr) ~= a.nvim_win_get_tabpage(0) then
M.close()
M.open()
wnr = M.get_winnr()
elseif open_if_closed and not M.win_open() then
M.open()
end
a.nvim_set_current_win(wnr)
end
function M.is_vertical()
return M.View.side == 'left' or M.View.side == 'right'
end
local function get_size()
local width_or_height = M.is_vertical() and 'width' or 'height'
local size = M.View[width_or_height]
if type(size) == "number" then
return size
elseif type(size) == "function" then
return size()
end
local size_as_number = tonumber(size:sub(0, -2))
local percent_as_decimal = size_as_number / 100
return math.floor(vim.o.columns * percent_as_decimal)
end
function M.resize()
if not M.View.auto_resize or not a.nvim_win_is_valid(M.get_winnr()) then
return
end
if M.is_vertical() then
a.nvim_win_set_width(M.get_winnr(), get_size())
else
a.nvim_win_set_height(M.get_winnr(), get_size())
end
end
local move_tbl = {
left = 'H',
right = 'L',
bottom = 'J',
top = 'K',
}
-- TODO: remove this once they fix https://github.com/neovim/neovim/issues/14670
local function set_local(opt, value)
local cmd
if value == true then
cmd = string.format('setlocal %s', opt)
elseif value == false then
cmd = string.format('setlocal no%s', opt)
else
cmd = string.format('setlocal %s=%s', opt, value)
end
vim.cmd(cmd)
end
function M.replace_window()
local move_to = move_tbl[M.View.side]
a.nvim_command("wincmd "..move_to)
local resize_direction = M.is_vertical() and 'vertical ' or ''
a.nvim_command(resize_direction.."resize "..get_size())
end
local function open_window()
a.nvim_command("vsp")
M.replace_window()
local winnr = a.nvim_get_current_win()
local tabpage = a.nvim_get_current_tabpage()
M.View.tabpages[tabpage] = vim.tbl_extend("force", M.View.tabpages[tabpage] or {help = false}, {winnr = winnr})
end
function M.is_buf_valid(bufnr)
return bufnr and a.nvim_buf_is_valid(bufnr) and a.nvim_buf_is_loaded(bufnr)
end
function M.open(options)
M.View.last_focused_winnr = a.nvim_get_current_win()
local should_redraw = false
if not M.is_buf_valid(M.View.bufnr) then
should_redraw = true
M.create_buffer()
end
if not M.win_open() then
open_window()
end
pcall(vim.cmd, "buffer "..M.View.bufnr)
for k, v in pairs(M.View.winopts) do
set_local(k, v)
end
vim.cmd ":wincmd ="
local opts = options or { focus_tree = true }
if not opts.focus_tree then
vim.cmd("wincmd p")
end
return should_redraw
end
local function get_existing_buffers()
return vim.tbl_filter(
function(buf)
return a.nvim_buf_is_valid(buf) and vim.fn.buflisted(buf) == 1
end,
a.nvim_list_bufs()
)
end
function M.close()
if not M.win_open() then return end
if #a.nvim_list_wins() == 1 then
local existing_bufs = get_existing_buffers()
if #existing_bufs > 0 then
vim.cmd "sbnext"
else
vim.cmd "new"
end
end
local tree_win = M.get_winnr()
local current_win = a.nvim_get_current_win()
for _, win in pairs(a.nvim_list_wins()) do
if tree_win ~= win and a.nvim_win_get_config(win).relative == "" then
a.nvim_win_hide(tree_win)
if tree_win == current_win and M.View.last_focused_winnr then
a.nvim_set_current_win(M.View.last_focused_winnr)
end
return
end
end
end
--- Returns the window number for nvim-tree within the tabpage specified
---@param tabpage number: (optional) the number of the chosen tabpage. Defaults to current tabpage.
---@return number
function M.get_winnr(tabpage)
tabpage = tabpage or a.nvim_get_current_tabpage()
local tabinfo = M.View.tabpages[tabpage]
if tabinfo ~= nil then
return tabinfo.winnr
end
end
--- Checks if nvim-tree is displaying the help ui within the tabpage specified
---@param tabpage number: (optional) the number of the chosen tabpage. Defaults to current tabpage.
---@return number
function M.is_help_ui(tabpage)
tabpage = tabpage or a.nvim_get_current_tabpage()
local tabinfo = M.View.tabpages[tabpage]
if tabinfo ~= nil then
return tabinfo.help
end
end
function M.toggle_help(tabpage)
tabpage = tabpage or a.nvim_get_current_tabpage()
M.View.tabpages[tabpage].help = not M.View.tabpages[tabpage].help
end
return M