fix: fs clear window, rename echo_warning -> warn

also fix renaming and add an event blocker to avoid running many events
at the same time

Author: kyazdani42

lua/nvim-tree.lua

@@ -114,7 +114,7 @@ local keypress_funcs = {
       elseif _config.is_unix then
         _config.system_open.cmd = 'xdg-open'
       else
-        require'nvim-tree.utils'.echo_warning("Cannot open file with system application. Unrecognized platform.")
+        require'nvim-tree.utils'.warn("Cannot open file with system application. Unrecognized platform.")
         return
       end
     end
@@ -454,7 +454,7 @@ function M.setup(conf)
   _config.open_on_setup = opts.open_on_setup
   _config.ignore_ft_on_setup = opts.ignore_ft_on_setup
   if type(opts.update_to_buf_dir) == "boolean" then
-    utils.echo_warning("update_to_buf_dir is now a table, see :help nvim-tree.update_to_buf_dir")
+    utils.warn("update_to_buf_dir is now a table, see :help nvim-tree.update_to_buf_dir")
     _config.update_to_buf_dir = {
       enable = opts.update_to_buf_dir,
       auto_open = opts.update_to_buf_dir,
@@ -464,7 +464,7 @@ function M.setup(conf)
   end
 
   if opts.lsp_diagnostics ~= nil then
-    utils.echo_warning("setup.lsp_diagnostics has been removed, see :help nvim-tree.diagnostics")
+    utils.warn("setup.lsp_diagnostics has been removed, see :help nvim-tree.diagnostics")
   end
 
   require'nvim-tree.colors'.setup()

lua/nvim-tree/fs.lua

@@ -113,6 +113,9 @@ local function clear_buffer(absolute_path)
         api.nvim_set_current_win(winnr)
       end
       vim.api.nvim_buf_delete(buf.bufnr, {})
+      if buf.windows[1] then
+        vim.api.nvim_win_close(buf.windows[1], true)
+      end
       return
     end
   end
@@ -289,7 +292,13 @@ function M.rename(with_sub)
     local abs_path = with_sub and node.absolute_path:sub(0, namelen * (-1) -1) or node.absolute_path
     local new_name = vim.fn.input("Rename " ..node.name.. " to ", abs_path)
     utils.clear_prompt()
-    if not new_name or #new_name == 0 then return end
+    if not new_name or #new_name == 0 then
+      return
+    end
+    if luv.fs_access(new_name, 'R') then
+      utils.warn("Cannot rename: file already exists")
+      return
+    end
 
     local success = luv.fs_rename(node.absolute_path, new_name)
     if not success then

lua/nvim-tree/lib.lua

@@ -150,17 +150,20 @@ local function refresh_nodes(node, projects)
   end
 end
 
+local event_running = false
 function M.refresh_tree()
-  if not M.Tree.cwd or vim.v.exiting ~= vim.NIL then
+  if event_running or not M.Tree.cwd or vim.v.exiting ~= vim.NIL then
     return
   end
+  event_running = true
 
   git.reload(function(projects)
     refresh_nodes(M.Tree, projects)
     if view.win_open() then
       M.redraw()
     end
     diagnostics.update()
+    event_running = false
   end)
 end
 
@@ -179,17 +182,16 @@ local function reload_node_status(parent_node, projects)
   end
 end
 
-local running_reload = false
 function M.reload_git()
-  if not git.config.enable or running_reload then
+  if not git.config.enable or event_running then
     return
   end
-  running_reload = true
+  event_running = true
 
   git.reload(function(projects)
-    running_reload = false
     reload_node_status(M.Tree, projects)
     M.redraw()
+    event_running = false
   end)
 end
 

lua/nvim-tree/populate.lua

@@ -97,6 +97,9 @@ local function should_group(cwd, dirs, files, links)
 end
 
 local function node_comparator(a, b)
+  if not (a and b) then
+    return true
+  end
   if a.entries and not b.entries then
     return true
   elseif not a.entries and b.entries then
@@ -122,12 +125,6 @@ local function should_ignore(path)
     return false
   end
 
-  -- if vim.g.nvim_tree_gitignore == 1 then
-  --   if git.should_gitignore(path) then
-  --     return true
-  --   end
-  -- end
-
   local relpath = utils.path_relative(path, vim.loop.cwd())
   if M.ignore_list[relpath] == true or M.ignore_list[basename] == true then
     return true

lua/nvim-tree/renderer/init.lua

@@ -163,7 +163,7 @@ if vim.g.nvim_tree_git_hl == 1 then
     local icons = git_hl[git_status]
 
     if icons == nil then
-      utils.echo_warning('Unrecognized git state "'..git_status..'". Please open up an issue on https://github.com/kyazdani42/nvim-tree.lua/issues with this message.')
+      utils.warn('Unrecognized git state "'..git_status..'". Please open up an issue on https://github.com/kyazdani42/nvim-tree.lua/issues with this message.')
       icons = git_hl.dirty
     end
 
@@ -239,7 +239,7 @@ if icon_state.show_git_icon then
     local icons = git_icon_state[git_status]
     if not icons then
       if vim.g.nvim_tree_git_hl ~= 1 then
-        utils.echo_warning('Unrecognized git state "'..git_status..'". Please open up an issue on https://github.com/kyazdani42/nvim-tree.lua/issues with this message.')
+        utils.warn('Unrecognized git state "'..git_status..'". Please open up an issue on https://github.com/kyazdani42/nvim-tree.lua/issues with this message.')
       end
       icons = git_icon_state.dirty
     end

lua/nvim-tree/utils.lua

@@ -6,7 +6,7 @@ function M.path_to_matching_str(path)
   return path:gsub('(%-)', '(%%-)'):gsub('(%.)', '(%%.)'):gsub('(%_)', '(%%_)')
 end
 
-function M.echo_warning(msg)
+function M.warn(msg)
   api.nvim_command('echohl WarningMsg')
   api.nvim_command("echom '[NvimTree] "..msg:gsub("'", "''").."'")
   api.nvim_command('echohl None')

plugin/nvim-tree-startup.lua

@@ -34,5 +34,5 @@ end, out_config)
 
 if #x > 0 then
   local msg = "Following options were moved to setup, see git.io/JPhyt: "
-  require'nvim-tree.utils'.echo_warning(msg..table.concat(x, ", "))
+  require'nvim-tree.utils'.warn(msg..table.concat(x, ", "))
 end