refactor(#2875): deal with some cyclic require

Author: alex-courtis

lua/nvim-tree/core.lua

@@ -1,5 +1,4 @@
 local events = require "nvim-tree.events"
-local explorer = require "nvim-tree.explorer"
 local view = require "nvim-tree.view"
 local log = require "nvim-tree.log"
 
@@ -16,7 +15,7 @@ function M.init(foldername)
   if TreeExplorer then
     TreeExplorer:destroy()
   end
-  TreeExplorer = explorer:new(foldername)
+  TreeExplorer = require("nvim-tree.explorer"):new(foldername)
   if not first_init_done then
     events._dispatch_ready()
     first_init_done = true

lua/nvim-tree/explorer/init.lua

@@ -10,14 +10,11 @@ local NodeIterator = require "nvim-tree.iterators.node-iterator"
 local Watcher = require "nvim-tree.watcher"
 
 local Filters = require "nvim-tree.explorer.filters"
----@type Marks
-local Marks -- circular dependencies
+local Marks = require "nvim-tree.marks"
 local LiveFilter = require "nvim-tree.explorer.live-filter"
 local Sorters = require "nvim-tree.explorer.sorters"
----@type Clipboard
-local Clipboard -- circular dependencies
----@type Renderer
-local Renderer -- circular dependencies
+local Clipboard = require "nvim-tree.actions.fs.clipboard"
+local Renderer = require "nvim-tree.renderer"
 
 local FILTER_REASON = require("nvim-tree.enum").FILTER_REASON
 
@@ -280,10 +277,6 @@ function Explorer.setup(opts)
   require("nvim-tree.explorer.node").setup(opts)
   require("nvim-tree.explorer.explore").setup(opts)
   require("nvim-tree.explorer.watch").setup(opts)
-
-  Marks = require "nvim-tree.marks"
-  Clipboard = require "nvim-tree.actions.fs.clipboard"
-  Renderer = require "nvim-tree.renderer"
 end
 
 ---@private

lua/nvim-tree/renderer/init.lua

@@ -2,9 +2,8 @@ local log = require "nvim-tree.log"
 local view = require "nvim-tree.view"
 local events = require "nvim-tree.events"
 
-local _padding = require "nvim-tree.renderer.components.padding"
 local icon_component = require "nvim-tree.renderer.components.icons"
-local full_name = require "nvim-tree.renderer.components.full-name"
+
 local Builder = require "nvim-tree.renderer.builder"
 
 local SIGN_GROUP = "NvimTreeRendererSigns"
@@ -122,9 +121,10 @@ function Renderer:draw()
 end
 
 function Renderer.setup(opts)
-  _padding.setup(opts)
-  full_name.setup(opts)
   icon_component.setup(opts)
+
+  require "nvim-tree.renderer.components.padding".setup(opts)
+  require "nvim-tree.renderer.components.full-name".setup(opts)
 end
 
 return Renderer