parent 4601444

author Kiyan <yazdani.kiyan@protonmail.com> 1652514867 +0200
committer Moshe Avni <mavni@netapp.com> 1653224067 +0300

feat(renderer): add ability to set git icons in signcolumn (nvim-tree#1242)

feat: extension sorter (nvim-tree#1181) (nvim-tree#1264)

Revert "nvim-tree#1253 only pad git icons when they are present (nvim-tree#1259)"

This reverts commit 90d7b8e.
fixes nvim-tree#1267

fix(renderer): padding when git icons are after the name

fixes nvim-tree#1253

fix(renderer): empty space at end of line

fixes nvim-tree#1253

add fish performance tip to README.md

feat(live-filter): add ability to live filter out nodes in the tree (nvim-tree#1056)

feat: reload explorer on buf enter (nvim-tree#1265)

chore(config): auto resize the tree by default when opening a file.

config.open_file.auto_resize is now true by default.
Breaking change for default configurations.
See nvim-tree#1275 (comment)

chore: remove custom set local implementation

Seems vim.opt_local has been fixed.
see neovim/neovim#14670

refactor: simplify opening file in new tab

fixes nvim-tree#1271. Also fixes opening a file in new tab when close_on_open was
true.

This introduces breaking change since we don't do any extra behavior
and let the buffer be opened by the tree.
The previous behavior was a bit old and i believe this should've been
fixed by now.
Reference this commit if unexpected behavior appears while opening files
in new tabs from nvim-tree.

feat: optional path argument for NvimTreeToggle and NvimTreeFindFileToggle (nvim-tree#1276)

Ignore case when removing default mappings

issue#362: File Management popup menu UI. First Iteration.

Workin on menu refactoring

Author: Moshe Avni

lua/nvim-tree/actions/init.lua

@@ -8,7 +8,7 @@ local nvim_tree_callback = require("nvim-tree.config").nvim_tree_callback
 
 local M = {
   mappings = {
-    { key = {"m"}, action = "open_popup_menu"},
+    { key = {"M"}, action = "open_popup_menu"},
     { key = { "<CR>", "o", "<2-LeftMouse>" }, action = "edit" },
     { key = "<C-e>", action = "edit_in_place" },
     { key = "O", action = "edit_no_picker" },
@@ -54,8 +54,8 @@ local M = {
   custom_keypress_funcs = {},
 }
 
-local keypress_funcs = {
-  open_popup_menu = require("nvim-tree.popup-menu").open_menu,
+M.keypress_funcs = {
+  open_popup_menu = require("nvim-tree.popup-menu").open_window,
   close = view.close,
   close_node = require("nvim-tree.actions.movements").parent_node(true),
   collapse_all = require("nvim-tree.actions.collapse-all").fn,
@@ -109,7 +109,7 @@ function M.on_keypress(action)
   end
 
   local custom_function = M.custom_keypress_funcs[action]
-  local default_function = keypress_funcs[action]
+  local default_function = M.keypress_funcs[action]
 
   if type(custom_function) == "function" then
     return custom_function(node)

lua/nvim-tree/popup-menu/default_actions.lua

@@ -0,0 +1,9 @@
+local M = {}
+
+M.actions = {
+  ['Copy File Name'] = 'copy_name',
+  ['Copy File Path'] = 'copy_path',
+  ['Open File'] = 'edit_no_picker',
+}
+
+return M

lua/nvim-tree/popup-menu/init.lua

@@ -1,112 +1,79 @@
 local a = vim.api
 
-local get_node = require('nvim-tree.lib').get_node_at_cursor
-local get_explorer = require('nvim-tree.core').get_explorer
-
 local M = {}
 
-M.is_open = false
-M.win = 0
-M.bufnr = 0
-
-local actions = {
- ['copy'] = require('nvim-tree.actions.copy-paste').copy 
-}
+local function get_node()
+  local get_node_at_cursor = require'nvim-tree.lib'.get_node_at_cursor
+  
+  local current_node = get_node_at_cursor() 
+  return current_node
+end
 
-M.mappings = {
-  ['<Esc>'] = 'close_menu',
-  ['<CR>'] = 'on_selection',
-}
+local current_popup = nil
 
-local ns_PopupMenu = a.nvim_create_namespace('ns_NvimTreePopupMenu')
+local winnr
+local bufnr
 
-local function create_buf()
-  if vim.fn.bufexists("NvimTreePopupMenuBuf") == 1 then
-    a.nvim_buf_delete(vim.fn.bufnr('NvimTreePopupMenuBuf'), {} )
-  end    
-  local buf = a.nvim_create_buf(false, true)
-  a.nvim_buf_set_name(buf, 'NvimTreePopupMenuBuf')
-  M.bufnr = buf
+function get_current_action(_winnr, _bufnr)
+  local node = current_popup.current_node 
+  local cur_pos = a.nvim_win_get_cursor(_winnr)[1]
+  local current_action = a.nvim_buf_get_lines(_bufnr, cur_pos -1, cur_pos, false)[1]
 
-  return buf
+  for _,v in pairs(require'nvim-tree.actions'.mappings) do
+    if v.action == current_action then
+      require'nvim-tree.actions'.keypress_funcs[current_action](current_popup.current_node)
+    end
+   end
 end
 
-function M.open_menu()
-  if M.is_open == true then
-    close_menu()
-  end
+local function setup_mappings()
+  -- TODO: pass mappings as arguments from setup or default
+  a.nvim_buf_set_keymap(bufnr, 'n', '<CR>', string.format([[:lua get_current_action(%s, %s)<CR>]], winnr, bufnr), { noremap = true })
+  a.nvim_buf_set_keymap(bufnr, 'n', '<Esc>', [[:lua require("nvim-tree.popup-menu").close_window()<CR>]], { noremap = true } )
+end
 
-  create_buf()
-  local win_opts = {
-    width = 10, -- we should set this as NvimExplorer width
-    height = 1, -- TODO: Set this as length of actions, as for now I'm not able to do it.
+local function setup_window(actions)
+  local max_width = vim.fn.max(vim.tbl_map(function(n) return #n end, vim.tbl_keys(actions)))
+  winnr =  a.nvim_open_win(0, true, {
+    col = 0, 
     row = 1,
-    col = 0,
-    style = 'minimal',
-    relative = 'cursor'
-  }
+    relative = 'cursor',
 
-  local win_ui = a.nvim_open_win(M.bufnr, true, win_opts)
-  M.is_open = true
-  M.win = win_ui
-  set_actions(actions)
+    width = max_width + 1,
+    height = vim.tbl_count(actions),
+    style = 'minimal'
+  })
 
-  -- TODO: Convert this to nvim lua api.
-  --       at this time on my machine with nvim 0.7.0-dev+1328-gfb5587d2b
-  --       keep yelling that "event" must be an array or string
-  local au_group = a.nvim_create_augroup('NvimSelectionAuGroup', { clear = true })
-  vim.cmd(string.format([[
-      augroup NvimSelectionAuGroup
-      au! CursorMoved <buffer=%s> :lua require('nvim-tree.popup-menu').add_hl_to_selection()
-      augroup END
-    ]], M.bufnr))
-
-  -- mappings on open window
-  -- should we pass this on separate file?
-  for k, v in pairs(M.mappings) do
-      if v ~= nil then
-        a.nvim_buf_set_keymap(
-          M.bufnr, 
-          'n', k,
-          string.format([[:lua %s()<CR>]], v), { noremap = true, silent = true })
-        end
-      end
-  end
+  current_popup = {
+    winnr = winnr,
+    bufnr = bufnr,
+    current_node = get_node()
+  }
 
-function close_menu()
-  a.nvim_win_close(M.win, true)
-  M.is_open = false
+  bufnr = a.nvim_create_buf(false, true)
+  a.nvim_buf_set_lines(bufnr, 0, -1, false, vim.tbl_keys(actions))
+  a.nvim_win_set_buf(winnr, bufnr)
 end
 
-function set_actions(tbl)
-  a.nvim_buf_set_lines(M.bufnr, 0, 1, true, vim.tbl_keys(tbl))
+function M.open_window()
+  setup_window(M.actions)
+  setup_mappings()
 end
 
-function M.add_hl_to_selection()
-  if M.is_open == true then
-    local row = a.nvim_win_get_cursor(M.win)[1]
-    local sel_item = a.nvim_buf_get_lines(M.bufnr, row -1, row, {})[1] -- should we pass this as module params to let user customize action on current selected item?
+function M.close_window()
+  if current_popup ~= nil then
+    a.nvim_win_close(current_popup.winnr, { force = true })
+    a.nvim_buf_delete(bufnr, { force = true })
 
-    -- clear prev highlights
-    a.nvim_buf_clear_namespace(M.bufnr, ns_PopupMenu, 0, -1)
-    
-    a.nvim_buf_add_highlight(
-      M.bufnr,
-      ns_PopupMenu,
-      'Error',
-      row -1,
-      0,
-      -1
-    )
+    current_popup = nil
   end
 end
 
-function on_selection()
-  local row = a.nvim_win_get_cursor(M.win)[1]
-  local sel_item = a.nvim_buf_get_lines(M.bufnr, row -1, row, {})[1] -- should we pass this as module params to let user customize action on current selected item?
-  
-  actions[sel_item](get_node())
-  close_menu()
+function M.setup(opts)
+  M.actions = opts.menu.actions
+  if M.actions == nil then 
+    M.actions = require("default_actions").actions
+  end
 end
 
 return M