feat: Mixin Sorter (#1565) Self Solved

doc/nvim-tree-lua.txt

@@ -169,6 +169,7 @@ Subsequent calls to setup will replace the previous configuration.
       open_on_tab = false,
       ignore_buf_on_tab_change = {},
       sort_by = "name",
+      after_sort = false,
       root_dirs = {},
       prefer_startup_root = false,
       sync_root_with_cwd = false,
@@ -414,10 +415,54 @@ Opens the tree automatically when switching tabpage or opening a new tabpage
 if the tree was previously open.
   Type: `boolean`, Default: `false`
 
+
 *nvim-tree.sort_by*
 Changes how files within the same directory are sorted.
-Can be one of 'name', 'case_sensitive', 'modification_time' or 'extension'.
-  Type: `string`, Default: `"name"`
+Can be one of 'name', 'case_sensitive', 'modification_time' or 'extension',
+'function'.
+>
+  sort_by = function(a, b)
+    if not (a and b) then
+      return true
+    end
+    if a.nodes and not b.nodes then
+      return true
+    elseif not a.nodes and b.nodes then
+      return false
+    end
+
+    return a.name:lower() <= b.name:lower()
+  end
+
+
+  end
+  Type: `string | function(a, b)`, Default: `"name"`
+
+*nvim-tree.after_sort*
+Related to nvim-tree.sort_by, this function runs without mergesort.
+Can be defined by your own after-sort works.
+  Type: `function(table)`, Default: `disable`
+
+>
+  after_sort = function(t)
+    local i = 1
+
+    while i <= #t do
+      if t[i] and t[i].nodes then
+        local j = i + 1
+        while j <= #t do
+          if t[j] and not t[j].nodes and t[i].name:lower() == t[j].name:lower():match "(.+)%..+$" then
+            local change_target = t[j]
+            table.remove(t, j)
+            table.insert(t, i, change_target)
+            break
+          end
+          j = j + 1
+        end
+      end
+      i = i + 1
+    end
+  end
 
 *nvim-tree.hijack_unnamed_buffer_when_opening*
 Opens in place of the unnamed buffer if it's empty.

lua/nvim-tree.lua

@@ -433,6 +433,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
   open_on_tab = false,
   ignore_buf_on_tab_change = {},
   sort_by = "name",
+  after_sort = false,
   root_dirs = {},
   prefer_startup_root = false,
   sync_root_with_cwd = false,
@@ -640,6 +641,8 @@ local FIELD_OVERRIDE_TYPECHECK = {
   height = { string = true, ["function"] = true, number = true },
   remove_keymaps = { boolean = true, table = true },
   on_attach = { ["function"] = true, string = true },
+  sort_by = { ["function"] = true, string = true },
+  after_sort = { ["function"] = true, boolean = true },
 }
 
 local function validate_options(conf)

lua/nvim-tree/explorer/sorters.lua

@@ -73,6 +73,9 @@ function M.merge_sort(t, comparator)
   end
 
   split_merge(t, 1, #t, comparator)
+  if M.after_sort then
+    M.after_sort(t)
+  end
 end
 
 local function node_comparator_name_ignorecase_or_not(a, b, ignorecase)
@@ -150,7 +153,11 @@ end
 
 function M.setup(opts)
   M.sort_by = opts.sort_by
-  if M.sort_by == "modification_time" then
+  M.after_sort = opts.after_sort
+
+  if M.sort_by and type(M.sort_by) == "function" then
+    M.node_comparator = M.sort_by
+  elseif M.sort_by == "modification_time" then
     M.node_comparator = M.node_comparator_modification_time
   elseif M.sort_by == "case_sensitive" then
     M.node_comparator = M.node_comparator_name_case_sensisive