From 81269a6eba1a9108ee46cdb500e0724bb8734723 Mon Sep 17 00:00:00 2001
From: Kiyan <yazdani.kiyan@protonmail.com>
Date: Thu, 8 Apr 2021 22:36:17 +0200
Subject: [PATCH] chore: remove async to avoid unecessary complexity (#277)

---
 lua/nvim-tree.lua     | 40 ++++++++++++++++------------------------
 lua/nvim-tree/lib.lua | 25 +++++++++++--------------
 2 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/lua/nvim-tree.lua b/lua/nvim-tree.lua
index 542ef8f4..fd535502 100644
--- a/lua/nvim-tree.lua
+++ b/lua/nvim-tree.lua
@@ -14,9 +14,9 @@ function M.toggle()
     lib.close()
   else
     if vim.g.nvim_tree_follow == 1 then
-      vim.schedule(function() M.find_file(true) end)
+      M.find_file(true)
     else
-      vim.schedule(lib.open)
+      lib.open()
     end
   end
 end
@@ -28,17 +28,12 @@ function M.close()
   end
 end
 
-function M.open(cb)
-  vim.schedule(
-    function()
-      if not lib.win_open() then
-        lib.open()
-      else
-        lib.set_target_win()
-      end
-      pcall(cb)
-    end
-  )
+function M.open()
+  if not lib.win_open() then
+    lib.open()
+  else
+    lib.set_target_win()
+  end
 end
 
 local winopts = config.window_options()
@@ -46,9 +41,8 @@ function M.tab_change()
   -- we need defer_fn to make sure we close/open after we enter the tab
   vim.defer_fn(function()
     if M.close() then
-      M.open(function()
-        api.nvim_command('wincmd '..winopts.open_command)
-      end)
+      M.open()
+      api.nvim_command('wincmd '..winopts.open_command)
     end
   end, 1)
 end
@@ -82,7 +76,7 @@ local keypress_funcs = {
   prev_git_item = gen_go_to('prev_git_item'),
   next_git_item = gen_go_to('next_git_item'),
   dir_up = lib.dir_up,
-  close = function(node) M.close() end,
+  close = function() M.close() end,
   preview = function(node)
     if node.entries ~= nil or node.name == '..' then return end
     return lib.open_file('preview', node.absolute_path)
@@ -153,13 +147,11 @@ function M.find_file(with_open)
   local filepath = vim.fn.fnamemodify(bufname, ':p')
 
   if with_open then
-    return M.open(
-      function()
-        lib.win_focus()
-        if not is_file_readable(filepath) then return end
-        lib.set_index_and_redraw(filepath)
-      end
-    )
+    M.open()
+    lib.win_focus()
+    if not is_file_readable(filepath) then return end
+    lib.set_index_and_redraw(filepath)
+    return
   end
 
   if not is_file_readable(filepath) then return end
diff --git a/lua/nvim-tree/lib.lua b/lua/nvim-tree/lib.lua
index 919d8e36..3d5deea2 100644
--- a/lua/nvim-tree/lib.lua
+++ b/lua/nvim-tree/lib.lua
@@ -155,22 +155,19 @@ local function refresh_nodes(node)
 end
 
 function M.refresh_tree()
-  vim.schedule(
-    function ()
-      if vim.v.exiting ~= nil then return end
+  if vim.v.exiting ~= nil then return end
 
-      refresh_nodes(M.Tree)
+  refresh_nodes(M.Tree)
 
-      if config.get_icon_state().show_git_icon or vim.g.nvim_tree_git_hl == 1 then
-        git.reload_roots()
-        refresh_git(M.Tree)
-      end
-      if M.win_open() then
-        renderer.draw(M.Tree, true)
-      else
-        M.Tree.loaded = false
-      end
-    end)
+  if config.get_icon_state().show_git_icon or vim.g.nvim_tree_git_hl == 1 then
+    git.reload_roots()
+    refresh_git(M.Tree)
+  end
+  if M.win_open() then
+    renderer.draw(M.Tree, true)
+  else
+    M.Tree.loaded = false
+  end
 end
 
 function M.set_index_and_redraw(fname)