Merge branch 'master' into sync-close-through-tabs

Author: rwblokzijl

doc/nvim-tree-lua.txt

@@ -308,6 +308,7 @@ Subsequent calls to setup will replace the previous configuration.
       filesystem_watchers = {
         enable = true,
         debounce_delay = 50,
+        ignore_dirs = {},
       },
       git = {
         enable = true,
@@ -373,6 +374,9 @@ Subsequent calls to setup will replace the previous configuration.
           watcher = false,
         },
       },
+      notify = {
+        threshold = vim.log.levels.INFO,
+      },
     } -- END_DEFAULT_OPTS
 <
 
@@ -601,6 +605,12 @@ performance.
     Idle milliseconds between filesystem change and action.
       Type: `number`, Default: `50` (ms)
 
+    *nvim-tree.filesystem_watchers.ignore_dirs*
+    List of vim regex for absolute directory paths that will not be watched.
+    Backslashes must be escaped e.g. `"my-project/\\.build$"`. See |string-match|.
+    Useful when path is not in `.gitignore` or git integration is disabled.
+      Type: {string}, Default: `{}`
+
 *nvim-tree.on_attach*
 Function ran when creating the nvim-tree buffer.
 This can be used to attach keybindings to the tree buffer.
@@ -992,6 +1002,18 @@ The filter can be cleared with the `F` key by default.
     Whether to filter folders or not.
       Type: `boolean`, Default: `true`
 
+*nvim-tree.notify*
+Configuration for notification.
+
+    *nvim-tree.notify.threshold*
+    Specify minimum notification level, uses the values from |vim.log.levels|
+      Type: `enum`, Default: `vim.log.levels.INFO`
+
+    `ERROR`:   hard errors e.g. failure to read from the file system.
+    `WARNING`: non-fatal errors e.g. unable to system open a file.
+    `INFO:`    information only e.g. file copy path confirmation.
+    `DEBUG:`   not used.
+
 *nvim-tree.log*
 Configuration for diagnostic logging.
 
@@ -1126,6 +1148,7 @@ exists.
     - rename_sub
     - cut
     - paste
+    - clear_clipboard
     - print_clipboard
     - copy.node
     - copy.absolute_path
@@ -1169,6 +1192,7 @@ exists.
     - get
     - list
     - toggle
+    - clear
     - bulk.move
     - navigate.next
     - navigate.prev
@@ -1427,9 +1451,10 @@ Handlers are registered by calling the `events.subscribe` function available in
 For example, registering a handler for when a node is renamed is done like this:
 >
     local api = require('nvim-tree.api')
+    local Event = api.events.Event
 
     api.events.subscribe(Event.NodeRenamed, function(data)
-        print("Node renamed from " .. data.old_name .. " to " ..  data.new_name)
+      print("Node renamed from " .. data.old_name .. " to " ..  data.new_name)
     end)
 <
 

lua/nvim-tree.lua

@@ -591,6 +591,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
   filesystem_watchers = {
     enable = true,
     debounce_delay = 50,
+    ignore_dirs = {},
   },
   git = {
     enable = true,
@@ -642,6 +643,9 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
     prefix = "[FILTER]: ",
     always_show_folders = true,
   },
+  notify = {
+    threshold = vim.log.levels.INFO,
+  },
   log = {
     enable = false,
     truncate = false,
@@ -688,10 +692,11 @@ local function validate_options(conf)
         local override_typecheck = FIELD_OVERRIDE_TYPECHECK[k] or {}
         if def[k] == nil then
           -- option does not exist
-          invalid = string.format("unknown option: %s%s", prefix, k)
+          invalid = string.format("[NvimTree] unknown option: %s%s", prefix, k)
         elseif type(v) ~= type(def[k]) and not override_typecheck[type(v)] then
           -- option is of the wrong type and is not a function
-          invalid = string.format("invalid option: %s%s expected: %s actual: %s", prefix, k, type(def[k]), type(v))
+          invalid =
+            string.format("[NvimTree] invalid option: %s%s expected: %s actual: %s", prefix, k, type(def[k]), type(v))
         end
 
         if invalid then
@@ -711,13 +716,13 @@ local function validate_options(conf)
   validate(conf, DEFAULT_OPTS, "")
 
   if msg then
-    utils.notify.warn(msg .. " | see :help nvim-tree-setup for available configuration options")
+    vim.notify_once(msg .. " | see :help nvim-tree-setup for available configuration options", vim.log.levels.WARN)
   end
 end
 
 function M.setup(conf)
   if vim.fn.has "nvim-0.7" == 0 then
-    utils.notify.warn "nvim-tree.lua requires Neovim 0.7 or higher"
+    vim.notify_once("nvim-tree.lua requires Neovim 0.7 or higher", vim.log.levels.WARN)
     return
   end
 
@@ -744,6 +749,7 @@ function M.setup(conf)
   manage_netrw(opts.disable_netrw, opts.hijack_netrw)
 
   M.config = opts
+  require("nvim-tree.notify").setup(opts)
   require("nvim-tree.log").setup(opts)
 
   log.line("config", "default config + user")

lua/nvim-tree/actions/finders/find-file.lua

@@ -15,20 +15,23 @@ function M.fn(fname)
   if running[fname] or not core.get_explorer() then
     return
   end
-  running[fname] = true
 
-  local ps = log.profile_start("find file %s", fname)
   -- always match against the real path
   local fname_real = vim.loop.fs_realpath(fname)
   if not fname_real then
     return
   end
 
-  local line = core.get_nodes_starting_line()
+  running[fname] = true
+
+  local ps = log.profile_start("find file %s", fname)
+
+  -- first line is the root node
+  local line = core.get_nodes_starting_line() - 1
 
   local absolute_paths_searched = {}
 
-  local found = Iterator.builder(core.get_explorer().nodes)
+  local found = Iterator.builder({ core.get_explorer() })
     :matcher(function(node)
       return node.absolute_path == fname_real or node.link_to == fname_real
     end)
@@ -45,9 +48,7 @@ function M.fn(fname)
 
       if abs_match or link_match then
         node.open = true
-        if #node.nodes == 0 then
-          core.get_explorer():expand(node)
-        end
+        core.get_explorer():expand(node)
       end
     end)
     :recursor(function(node)

lua/nvim-tree/actions/fs/copy-paste.lua

@@ -2,6 +2,7 @@ local lib = require "nvim-tree.lib"
 local log = require "nvim-tree.log"
 local utils = require "nvim-tree.utils"
 local core = require "nvim-tree.core"
+local notify = require "nvim-tree.notify"
 
 local M = {}
 
@@ -79,14 +80,14 @@ local function do_single_paste(source, dest, action_type, action_fn)
 
   dest_stats, errmsg, errcode = vim.loop.fs_stat(dest)
   if not dest_stats and errcode ~= "ENOENT" then
-    utils.notify.error("Could not " .. action_type .. " " .. source .. " - " .. (errmsg or "???"))
+    notify.error("Could not " .. action_type .. " " .. source .. " - " .. (errmsg or "???"))
     return false, errmsg
   end
 
   local function on_process()
     success, errmsg = action_fn(source, dest)
     if not success then
-      utils.notify.error("Could not " .. action_type .. " " .. source .. " - " .. (errmsg or "???"))
+      notify.error("Could not " .. action_type .. " " .. source .. " - " .. (errmsg or "???"))
       return false, errmsg
     end
   end
@@ -120,11 +121,17 @@ local function add_to_clipboard(node, clip)
   for idx, _node in ipairs(clip) do
     if _node.absolute_path == node.absolute_path then
       table.remove(clip, idx)
-      return utils.notify.info(node.absolute_path .. " removed to clipboard.")
+      return notify.info(node.absolute_path .. " removed to clipboard.")
     end
   end
   table.insert(clip, node)
-  utils.notify.info(node.absolute_path .. " added to clipboard.")
+  notify.info(node.absolute_path .. " added to clipboard.")
+end
+
+function M.clear_clipboard()
+  clipboard.move = {}
+  clipboard.copy = {}
+  utils.notify.info "Clipboard has been emptied."
 end
 
 function M.copy(node)
@@ -149,7 +156,7 @@ local function do_paste(node, action_type, action_fn)
   local stats, errmsg, errcode = vim.loop.fs_stat(destination)
   if not stats and errcode ~= "ENOENT" then
     log.line("copy_paste", "do_paste fs_stat '%s' failed '%s'", destination, errmsg)
-    utils.notify.error("Could not " .. action_type .. " " .. destination .. " - " .. (errmsg or "???"))
+    notify.error("Could not " .. action_type .. " " .. destination .. " - " .. (errmsg or "???"))
     return
   end
   local is_dir = stats and stats.type == "directory"
@@ -211,18 +218,18 @@ function M.print_clipboard()
     end
   end
 
-  return utils.notify.info(table.concat(content, "\n") .. "\n")
+  return notify.info(table.concat(content, "\n") .. "\n")
 end
 
 local function copy_to_clipboard(content)
   if M.use_system_clipboard == true then
     vim.fn.setreg("+", content)
     vim.fn.setreg('"', content)
-    return utils.notify.info(string.format("Copied %s to system clipboard!", content))
+    return notify.info(string.format("Copied %s to system clipboard!", content))
   else
     vim.fn.setreg('"', content)
     vim.fn.setreg("1", content)
-    return utils.notify.info(string.format("Copied %s to neovim clipboard!", content))
+    return notify.info(string.format("Copied %s to neovim clipboard!", content))
   end
 end
 

lua/nvim-tree/actions/fs/create-file.lua

@@ -3,13 +3,14 @@ local events = require "nvim-tree.events"
 local lib = require "nvim-tree.lib"
 local core = require "nvim-tree.core"
 local watch = require "nvim-tree.explorer.watch"
+local notify = require "nvim-tree.notify"
 
 local M = {}
 
 local function create_and_notify(file)
   local ok, fd = pcall(vim.loop.fs_open, file, "w", 420)
   if not ok then
-    utils.notify.error("Couldn't create file " .. file)
+    notify.error("Couldn't create file " .. file)
     return
   end
   vim.loop.fs_close(fd)
@@ -69,7 +70,7 @@ function M.fn(node)
     end
 
     if utils.file_exists(new_file_path) then
-      utils.notify.warn "Cannot create: file already exists"
+      notify.warn "Cannot create: file already exists"
       return
     end
 
@@ -94,14 +95,14 @@ function M.fn(node)
       elseif not utils.file_exists(path_to_create) then
         local success = vim.loop.fs_mkdir(path_to_create, 493)
         if not success then
-          utils.notify.error("Could not create folder " .. path_to_create)
+          notify.error("Could not create folder " .. path_to_create)
           is_error = true
           break
         end
       end
     end
     if not is_error then
-      utils.notify.info(new_file_path .. " was properly created")
+      notify.info(new_file_path .. " was properly created")
     end
     events._dispatch_folder_created(new_file_path)
     if M.enable_reload then

lua/nvim-tree/actions/fs/remove-file.lua

@@ -2,6 +2,7 @@ local utils = require "nvim-tree.utils"
 local events = require "nvim-tree.events"
 local view = require "nvim-tree.view"
 local lib = require "nvim-tree.lib"
+local notify = require "nvim-tree.notify"
 
 local M = {}
 
@@ -41,7 +42,7 @@ end
 local function remove_dir(cwd)
   local handle = vim.loop.fs_scandir(cwd)
   if type(handle) == "string" then
-    return utils.notify.error(handle)
+    return notify.error(handle)
   end
 
   while true do
@@ -80,18 +81,18 @@ function M.fn(node)
       if node.nodes ~= nil and not node.link_to then
         local success = remove_dir(node.absolute_path)
         if not success then
-          return utils.notify.error("Could not remove " .. node.name)
+          return notify.error("Could not remove " .. node.name)
         end
         events._dispatch_folder_removed(node.absolute_path)
       else
         local success = vim.loop.fs_unlink(node.absolute_path)
         if not success then
-          return utils.notify.error("Could not remove " .. node.name)
+          return notify.error("Could not remove " .. node.name)
         end
         events._dispatch_file_removed(node.absolute_path)
         clear_buffer(node.absolute_path)
       end
-      utils.notify.info(node.absolute_path .. " was properly removed.")
+      notify.info(node.absolute_path .. " was properly removed.")
       if M.enable_reload then
         require("nvim-tree.actions.reloaders.reloaders").reload_explorer()
       end

lua/nvim-tree/actions/fs/rename-file.lua

@@ -1,6 +1,7 @@
 local lib = require "nvim-tree.lib"
 local utils = require "nvim-tree.utils"
 local events = require "nvim-tree.events"
+local notify = require "nvim-tree.notify"
 
 local M = {}
 
@@ -10,15 +11,15 @@ end
 
 function M.rename(node, to)
   if utils.file_exists(to) then
-    utils.notify.warn(err_fmt(node.absolute_path, to, "file already exists"))
+    notify.warn(err_fmt(node.absolute_path, to, "file already exists"))
     return
   end
 
   local success, err = vim.loop.fs_rename(node.absolute_path, to)
   if not success then
-    return utils.notify.warn(err_fmt(node.absolute_path, to, err))
+    return notify.warn(err_fmt(node.absolute_path, to, err))
   end
-  utils.notify.info(node.absolute_path .. " ➜ " .. to)
+  notify.info(node.absolute_path .. " ➜ " .. to)
   utils.rename_loaded_buffers(node.absolute_path, to)
   events._dispatch_node_renamed(node.absolute_path, to)
 end

lua/nvim-tree/actions/fs/trash.lua

@@ -1,4 +1,5 @@
 local lib = require "nvim-tree.lib"
+local notify = require "nvim-tree.notify"
 
 local M = {
   config = {
@@ -41,13 +42,13 @@ function M.fn(node)
       M.config.trash.require_confirm = true
     end
   else
-    utils.notify.warn "Trash is currently a UNIX only feature!"
+    notify.warn "Trash is currently a UNIX only feature!"
     return
   end
 
   local binary = M.config.trash.cmd:gsub(" .*$", "")
   if vim.fn.executable(binary) == 0 then
-    utils.notify.warn(binary .. " is not executable.")
+    notify.warn(binary .. " is not executable.")
     return
   end
 
@@ -69,7 +70,7 @@ function M.fn(node)
     if node.nodes ~= nil and not node.link_to then
       trash_path(function(_, rc)
         if rc ~= 0 then
-          utils.notify.warn("trash failed: " .. err_msg .. "; please see :help nvim-tree.trash")
+          notify.warn("trash failed: " .. err_msg .. "; please see :help nvim-tree.trash")
           return
         end
         events._dispatch_folder_removed(node.absolute_path)
@@ -80,7 +81,7 @@ function M.fn(node)
     else
       trash_path(function(_, rc)
         if rc ~= 0 then
-          utils.notify.warn("trash failed: " .. err_msg .. "; please see :help nvim-tree.trash")
+          notify.warn("trash failed: " .. err_msg .. "; please see :help nvim-tree.trash")
           return
         end
         events._dispatch_file_removed(node.absolute_path)