WIP

Author: cseickel

lua/neo-tree/command/parser.lua

@@ -8,7 +8,6 @@ local M = {
 }
 
 M.setup = function (all_source_names)
-  print("all_source_names", vim.inspect(all_source_names))
   local source_names = utils.table_copy(all_source_names)
   table.insert(source_names, "migrations")
 
@@ -156,6 +155,7 @@ local parse_arg = function(result, arg)
 end
 
 M.parse = function(args, strict_checking)
+  require("neo-tree").ensure_config()
   local result = {}
 
   if type(args) == "string" then

lua/neo-tree/defaults.lua

@@ -115,7 +115,7 @@ local config = {
       highlight = "NeoTreeFileIcon"
     },
     modified = {
-      symbol = "[+]",
+      symbol = "[+] ",
       highlight = "NeoTreeModified",
     },
     name = {
@@ -148,7 +148,7 @@ local config = {
       {
         "container",
         width = "100%",
-        right_padding = 1,
+        right_padding = 0,
         --max_width = 60,
         content = {
           { "name", zindex = 10 },
@@ -168,7 +168,7 @@ local config = {
       {
         "container",
         width = "100%",
-        right_padding = 1,
+        right_padding = 0,
         --max_width = 60,
         content = {
           {

lua/neo-tree/setup/init.lua

@@ -434,13 +434,14 @@ M.merge_config = function(user_config, is_auto_config)
   require("neo-tree.command.parser").setup(all_source_names)
 
   for source_name, mod_root in pairs(all_sources) do
+    local module = require(mod_root)
     default_config[source_name] = default_config[source_name] or {
       renderers = {},
       components = {},
     }
     local source_default_config = default_config[source_name]
-    source_default_config.components = require(mod_root .. ".components")
-    source_default_config.commands = require(mod_root .. ".commands")
+    source_default_config.components = module.components or require(mod_root .. ".components")
+    source_default_config.commands = module.commands or require(mod_root .. ".commands")
     source_default_config.name = source_name
 
     if user_config.use_default_mappings == false then

lua/neo-tree/sources/common/components.lua

@@ -270,9 +270,10 @@ end
 
 M.modified = function(config, node, state)
   local modified_buffers = state.modified_buffers or {}
+
   if modified_buffers[node.path] then
     return {
-      text = (config.symbol or "[+] "),
+      text = (make_two_char(config.symbol) or "[+] "),
       highlight = config.highlight or highlights.MODIFIED,
     }
   else

lua/neo-tree/sources/manager.lua

@@ -411,6 +411,7 @@ end
 ---@param callback function Callback to call after the items are loaded.
 ---@param async boolean Whether to load the items asynchronously, may not be respected by all sources.
 M.navigate = function(state_or_source_name, path, path_to_reveal, callback, async)
+  require("neo-tree").ensure_config()
   local state, source_name
   if type(state_or_source_name) == "string" then
     state = M.get_state(state_or_source_name)
@@ -422,7 +423,11 @@ M.navigate = function(state_or_source_name, path, path_to_reveal, callback, asyn
     log.error("navigate: state_or_source_name must be a string or a table")
   end
   log.trace("navigate", source_name, path, path_to_reveal)
-  get_source_data(source_name).module.navigate(state, path, path_to_reveal, callback, async)
+  local mod = get_source_data(source_name).module
+  if not mod then
+    mod = require("neo-tree.sources." .. source_name)
+  end
+  mod.navigate(state, path, path_to_reveal, callback, async)
 end
 
 ---Redraws the tree without scanning the filesystem again. Use this after