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

move window/buf stuff from file.lua to winutils.lua

Browse Source
This commit is contained in:
kyazdani42 2020-02-19 14:16:09 +01:00
parent 14f83b3891
commit c77a560a63
3 changed files with 100 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
lua/lib/file.lua
View File

@ -1,128 +1,47 @@
local api = vim.api
local buf, win
local system = function(v) api.nvim_call_function('system', { v }) end
local update_tree_view = require 'lib/winutils'.update_view
local scratch_wrapper = require 'lib/winutils'.scratch_wrapper
local update_tree_state = require 'lib/state'.refresh_tree
local EDIT_FILE = nil
local function scratch_buffer()
buf = api.nvim_create_buf(false, true)
api.nvim_buf_set_option(buf, 'bufhidden', 'wipe')
local width = api.nvim_get_option("columns")
local height = api.nvim_get_option("lines")
local win_height = 2
local win_width = 90
local row = math.ceil((height - win_height) / 2 - 1)
local col = math.ceil((width - win_width) / 2)
local opts = {
style = "minimal",
relative = "editor",
width = win_width,
height = win_height,
row = row,
col = col
}
local border_buf = api.nvim_create_buf(false, true)
local border_opts = {
style = "minimal",
relative = "editor",
width = win_width + 2,
height = win_height + 2,
row = row - 1,
col = col - 1
}
local border_lines = { '┌' .. string.rep('─', win_width) .. '┐' }
local middle_line = '│' .. string.rep(' ', win_width) .. '│'
for _ = 1, win_height do
table.insert(border_lines, middle_line)
end
table.insert(border_lines, '└' .. string.rep('─', win_width) .. '┘')
api.nvim_buf_set_lines(border_buf, 0, -1, false, border_lines)
api.nvim_open_win(border_buf, true, border_opts)
api.nvim_command('setlocal nocursorline winhighlight=Normal:LuaNoEndOfBufferPopup')
win = api.nvim_open_win(buf, true, opts)
api.nvim_command('setlocal nocursorline winhighlight=Normal:LuaTreePopup')
api.nvim_command('au BufWipeout <buffer> exe "silent bwipeout! "'..border_buf)
end
local function set_mappings(edit_type)
local chars = {
'a', 'b', 'd', 'e', 'f', 'h', 'l', 'j', 'q', 'k', 'g', 'i', 'n', 'o', 'p', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
}
for _,v in ipairs(chars) do
api.nvim_buf_set_keymap(buf, 'n', v, '', { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(buf, 'n', v:upper(), '', { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(buf, 'n', '<c-'..v..'>', '', { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(buf, 'i', '<c-'..v..'>', '', { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(buf, 'i', '<c-' ..v:upper()..'>', '', { nowait = true, noremap = true, silent = true })
end
if edit_type == 'add' then
api.nvim_buf_set_keymap(buf, 'i', '<CR>', "<esc>:lua require'lib/file'.add_file(vim.api.nvim_get_current_line())<CR>", { nowait = true, noremap = true, silent = true })
elseif edit_type == 'rename' then
api.nvim_buf_set_keymap(buf, 'i', '<CR>', "<esc>:lua require'lib/file'.rename_file(vim.api.nvim_get_current_line())<CR>", { nowait = true, noremap = true, silent = true })
elseif edit_type == 'delete' then
api.nvim_buf_set_keymap(buf, 'i', '<CR>', "<esc>:lua require'lib/file'.remove_file(vim.api.nvim_get_current_line())<CR>", { nowait = true, noremap = true, silent = true })
end
api.nvim_buf_set_keymap(buf, 'i', '<esc>', "<esc>:q!<CR>", { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(buf, 'i', '<C-c>', "<esc>:q!<CR>", { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(buf, 'i', '<C-[>', "<esc>:q!<CR>", { nowait = true, noremap = true, silent = true })
end
local function update_view(...)
api.nvim_buf_set_lines(buf, 0, -1, false, ...)
api.nvim_command('normal G')
api.nvim_command('startinsert!')
end
local function wrapper(edit_type, ...)
scratch_buffer()
update_view(...)
set_mappings(edit_type)
end
local function edit_add(path)
wrapper("add", { "Create File", path })
scratch_wrapper("add", { "Create File", path })
end
local function edit_remove(filename, path)
EDIT_FILE = path .. filename
wrapper("delete", { "Remove " .. filename .. " ?", "y/n: " })
scratch_wrapper("delete", { "Remove " .. filename .. " ?", "y/n: " })
end
local function edit_rename(filename, path)
EDIT_FILE = path .. filename
wrapper("rename", { "Rename " .. path, path .. filename })
scratch_wrapper("rename", { "Rename " .. path, path .. filename })
end
-- TODO: for both 3 functions below, update git status before update_tree_state
local function add_file(path)
if string.match(path, '.*/$') then
system('mkdir -p ' .. path)
update_tree_state()
update_tree_view(true)
else
system('touch ' .. path)
update_tree_state()
update_tree_view(true)
end
api.nvim_command("q!")
update_tree_state()
update_tree_view(true)
end
local function remove_file(confirmation)
if string.match(confirmation, '^y/n: y.*$') ~= nil then
system('rm -rf ' .. EDIT_FILE)
update_tree_state()
update_tree_view(true)
end
EDIT_FILE = nil
api.nvim_command("q!")
update_tree_state()
update_tree_view(true)
end
local function rename_file(path)

88
lua/lib/winutils.lua
View File

@ -11,6 +11,8 @@ local confutils = require 'lib/conf'
local get_buf_name = confutils.get_buf_name
local get_root_path = confutils.get_root_path
local scratch_buf = nil
local function get_buf()
local BUF_NAME = get_buf_name()
local regex = '.*'..BUF_NAME..'$';
@ -42,6 +44,90 @@ local function buf_setup()
api.nvim_command('setlocal winhighlight=EndOfBuffer:LuaTreeEndOfBuffer')
end
local function scratch_buffer()
scratch_buf = api.nvim_create_buf(false, true)
api.nvim_buf_set_option(scratch_buf, 'bufhidden', 'wipe')
local width = api.nvim_get_option("columns")
local height = api.nvim_get_option("lines")
local win_height = 2
local win_width = 90
local row = math.ceil((height - win_height) / 2 - 1)
local col = math.ceil((width - win_width) / 2)
local opts = {
style = "minimal",
relative = "editor",
width = win_width,
height = win_height,
row = row,
col = col
}
local border_buf = api.nvim_create_buf(false, true)
local border_opts = {
style = "minimal",
relative = "editor",
width = win_width + 2,
height = win_height + 2,
row = row - 1,
col = col - 1
}
local border_lines = { '┌' .. string.rep('─', win_width) .. '┐' }
local middle_line = '│' .. string.rep(' ', win_width) .. '│'
for _ = 1, win_height do
table.insert(border_lines, middle_line)
end
table.insert(border_lines, '└' .. string.rep('─', win_width) .. '┘')
api.nvim_buf_set_lines(border_buf, 0, -1, false, border_lines)
api.nvim_open_win(border_buf, true, border_opts)
api.nvim_command('setlocal nocursorline winhighlight=Normal:LuaNoEndOfBufferPopup')
api.nvim_open_win(scratch_buf, true, opts)
api.nvim_command('setlocal nocursorline winhighlight=Normal:LuaTreePopup')
api.nvim_command('au BufWipeout <buffer> exe "silent bwipeout! "'..border_buf)
end
local function set_scratch_mappings(edit_type)
local chars = {
'a', 'b', 'd', 'e', 'f', 'h', 'l', 'j', 'q', 'k', 'g', 'i', 'n', 'o', 'p', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
}
for _,v in ipairs(chars) do
api.nvim_buf_set_keymap(scratch_buf, 'n', v, '', { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(scratch_buf, 'n', v:upper(), '', { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(scratch_buf, 'n', '<c-'..v..'>', '', { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(scratch_buf, 'i', '<c-'..v..'>', '', { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(scratch_buf, 'i', '<c-' ..v:upper()..'>', '', { nowait = true, noremap = true, silent = true })
end
if edit_type == 'add' then
api.nvim_buf_set_keymap(scratch_buf, 'i', '<CR>', "<esc>:lua require'lib/file'.add_file(vim.api.nvim_get_current_line())<CR>", { nowait = true, noremap = true, silent = true })
elseif edit_type == 'rename' then
api.nvim_buf_set_keymap(scratch_buf, 'i', '<CR>', "<esc>:lua require'lib/file'.rename_file(vim.api.nvim_get_current_line())<CR>", { nowait = true, noremap = true, silent = true })
elseif edit_type == 'delete' then
api.nvim_buf_set_keymap(scratch_buf, 'i', '<CR>', "<esc>:lua require'lib/file'.remove_file(vim.api.nvim_get_current_line())<CR>", { nowait = true, noremap = true, silent = true })
end
api.nvim_buf_set_keymap(scratch_buf, 'i', '<esc>', "<esc>:q!<CR>", { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(scratch_buf, 'i', '<C-c>', "<esc>:q!<CR>", { nowait = true, noremap = true, silent = true })
api.nvim_buf_set_keymap(scratch_buf, 'i', '<C-[>', "<esc>:q!<CR>", { nowait = true, noremap = true, silent = true })
end
local function update_scratch_view(...)
api.nvim_buf_set_lines(scratch_buf, 0, -1, false, ...)
api.nvim_command('normal G')
api.nvim_command('startinsert!')
end
local function scratch_wrapper(edit_type, ...)
scratch_buffer()
update_scratch_view(...)
set_scratch_mappings(edit_type)
end
local function open()
local BUF_NAME = get_buf_name()
local ROOT_PATH = get_root_path()
@ -107,7 +193,6 @@ local function set_mappings()
a = 'edit_file("add")';
d = 'edit_file("delete")';
r = 'edit_file("rename")';
f = 'find_file()';
}
for k,v in pairs(mappings) do
@ -125,4 +210,5 @@ return {
get_buf = get_buf;
get_win = get_win;
set_mappings = set_mappings;
scratch_wrapper = scratch_wrapper;
}

2
lua/tree.lua
View File

@ -40,6 +40,7 @@ local function open_file(open_type)
local node = tree[tree_index]
if node.name == '..' then
-- TODO: git update
api.nvim_command('cd ..')
local new_path
@ -53,6 +54,7 @@ local function open_file(open_type)
init_tree(new_path)
update_view()
elseif open_type == 'chdir' then
-- TODO: git update
if node.dir == false or check_dir_access(node.path .. node.name) == false then return end
api.nvim_command('cd ' .. node.path .. node.name)