chore(#3196): remove unused utils and refactor (#3199)

* chore(#3196): remove unused utils.read_file

* chore(#3196): move utils.move_missing_val to legacy

* chore(#3196): move utils.table_create_missing to legacy

lua/nvim-tree/legacy.lua

@@ -1,27 +1,74 @@
-local utils = require("nvim-tree.utils")
 local notify = require("nvim-tree.notify")
 
 local M = {}
 
+--- Create empty sub-tables if not present
+---@param tbl table to create empty inside of
+---@param path string dot separated string of sub-tables
+---@return table deepest sub-table
+local function create(tbl, path)
+  local t = tbl
+  for s in string.gmatch(path, "([^%.]+)%.*") do
+    if t[s] == nil then
+      t[s] = {}
+    end
+    t = t[s]
+  end
+
+  return t
+end
+
+--- Move a value from src to dst if value is nil on dst.
+--- Remove value from src
+---@param src table to copy from
+---@param src_path string dot separated string of sub-tables
+---@param src_pos string value pos
+---@param dst table to copy to
+---@param dst_path string dot separated string of sub-tables, created when missing
+---@param dst_pos string value pos
+---@param remove boolean
+local function move(src, src_path, src_pos, dst, dst_path, dst_pos, remove)
+  for pos in string.gmatch(src_path, "([^%.]+)%.*") do
+    if src[pos] and type(src[pos]) == "table" then
+      src = src[pos]
+    else
+      return
+    end
+  end
+  local src_val = src[src_pos]
+  if src_val == nil then
+    return
+  end
+
+  dst = create(dst, dst_path)
+  if dst[dst_pos] == nil then
+    dst[dst_pos] = src_val
+  end
+
+  if remove then
+    src[src_pos] = nil
+  end
+end
+
 -- silently move, please add to help nvim-tree-legacy-opts
 local function refactored(opts)
   -- 2022/06/20
-  utils.move_missing_val(opts, "update_focused_file", "update_cwd", opts, "update_focused_file", "update_root",        true)
+  move(opts, "update_focused_file", "update_cwd", opts, "update_focused_file", "update_root",        true)
-  utils.move_missing_val(opts, "",                    "update_cwd", opts, "",                    "sync_root_with_cwd", true)
+  move(opts, "",                    "update_cwd", opts, "",                    "sync_root_with_cwd", true)
 
   -- 2022/11/07
-  utils.move_missing_val(opts, "", "open_on_tab",              opts, "tab.sync", "open",   false)
+  move(opts, "", "open_on_tab",              opts, "tab.sync", "open",   false)
-  utils.move_missing_val(opts, "", "open_on_tab",              opts, "tab.sync", "close",  true)
+  move(opts, "", "open_on_tab",              opts, "tab.sync", "close",  true)
-  utils.move_missing_val(opts, "", "ignore_buf_on_tab_change", opts, "tab.sync", "ignore", true)
+  move(opts, "", "ignore_buf_on_tab_change", opts, "tab.sync", "ignore", true)
 
   -- 2022/11/22
-  utils.move_missing_val(opts, "renderer", "root_folder_modifier", opts, "renderer", "root_folder_label", true)
+  move(opts, "renderer", "root_folder_modifier", opts, "renderer", "root_folder_label", true)
 
   -- 2023/01/01
-  utils.move_missing_val(opts, "update_focused_file", "debounce_delay", opts, "view", "debounce_delay", true)
+  move(opts, "update_focused_file", "debounce_delay", opts, "view", "debounce_delay", true)
 
   -- 2023/01/08
-  utils.move_missing_val(opts, "trash", "require_confirm", opts, "ui.confirm", "trash", true)
+  move(opts, "trash", "require_confirm", opts, "ui.confirm", "trash", true)
 
   -- 2023/01/15
   if type(opts.view) == "table" and opts.view.adaptive_size ~= nil then
@@ -35,13 +82,13 @@ local function refactored(opts)
   end
 
   -- 2023/07/15
-  utils.move_missing_val(opts, "", "sort_by", opts, "sort", "sorter", true)
+  move(opts, "", "sort_by", opts, "sort", "sorter", true)
 
   -- 2023/07/16
-  utils.move_missing_val(opts, "git", "ignore", opts, "filters", "git_ignored", true)
+  move(opts, "git", "ignore", opts, "filters", "git_ignored", true)
 
   -- 2023/08/26
-  utils.move_missing_val(opts, "renderer.icons", "webdev_colors", opts, "renderer.icons.web_devicons.file", "color", true)
+  move(opts, "renderer.icons", "webdev_colors", opts, "renderer.icons.web_devicons.file", "color", true)
 
   -- 2023/10/08
   if type(opts.renderer) == "table" and type(opts.renderer.highlight_diagnostics) == "boolean" then
@@ -59,7 +106,7 @@ local function refactored(opts)
       opts.update_focused_file.update_root = { enable = opts.update_focused_file.update_root }
     end
   end
-  utils.move_missing_val(opts, "update_focused_file", "ignore_list", opts, "update_focused_file.update_root", "ignore_list", true)
+  move(opts, "update_focused_file", "ignore_list", opts, "update_focused_file.update_root", "ignore_list", true)
 
   -- 2025/04/30
   if opts.renderer and opts.renderer.icons and type(opts.renderer.icons.padding) == "string" then

lua/nvim-tree/utils.lua

@@ -17,22 +17,6 @@ function M.str_find(haystack, needle)
   return vim.fn.stridx(haystack, needle) ~= -1
 end
 
----@param path string
----@return string|uv.uv_fs_t
-function M.read_file(path)
-  local fd = vim.loop.fs_open(path, "r", 438)
-  if not fd then
-    return ""
-  end
-  local stat = vim.loop.fs_fstat(fd)
-  if not stat then
-    return ""
-  end
-  local data = vim.loop.fs_read(fd, stat.size, 0)
-  vim.loop.fs_close(fd)
-  return data or ""
-end
-
 local path_separator = package.config:sub(1, 1)
 ---@param paths string[]
 ---@return string
@@ -377,54 +361,6 @@ function M.escape_special_chars(path)
   return M.is_windows and escape_special_char_for_windows(path) or path
 end
 
---- Create empty sub-tables if not present
----@param tbl table to create empty inside of
----@param path string dot separated string of sub-tables
----@return table deepest sub-table
-function M.table_create_missing(tbl, path)
-  local t = tbl
-  for s in string.gmatch(path, "([^%.]+)%.*") do
-    if t[s] == nil then
-      t[s] = {}
-    end
-    t = t[s]
-  end
-
-  return t
-end
-
---- Move a value from src to dst if value is nil on dst.
---- Remove value from src
----@param src table to copy from
----@param src_path string dot separated string of sub-tables
----@param src_pos string value pos
----@param dst table to copy to
----@param dst_path string dot separated string of sub-tables, created when missing
----@param dst_pos string value pos
----@param remove boolean
-function M.move_missing_val(src, src_path, src_pos, dst, dst_path, dst_pos, remove)
-  for pos in string.gmatch(src_path, "([^%.]+)%.*") do
-    if src[pos] and type(src[pos]) == "table" then
-      src = src[pos]
-    else
-      return
-    end
-  end
-  local src_val = src[src_pos]
-  if src_val == nil then
-    return
-  end
-
-  dst = M.table_create_missing(dst, dst_path)
-  if dst[dst_pos] == nil then
-    dst[dst_pos] = src_val
-  end
-
-  if remove then
-    src[src_pos] = nil
-  end
-end
-
 local function round(value)
   -- Amount of digits to round to after floating point.
   local digits = 2