refactor: move renaming related code to its own file

lua/yazi.lua

@@ -2,6 +2,7 @@ local window = require('yazi.window')
 local utils = require('yazi.utils')
 local vimfn = require('yazi.vimfn')
 local config = require('yazi.config')
+local renaming = require('yazi.renaming')
 
 local iterators = require('plenary.iterators')
 
@@ -81,7 +82,9 @@ function M.yazi(path)
           :tolist()
 
         local renames =
-          utils.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
+          renaming.get_buffers_that_need_renaming_after_yazi_exited(
+            rename_events
+          )
 
         for _, event in ipairs(renames) do
           vim.api.nvim_buf_set_name(event.bufnr, event.path.filename)

lua/yazi/renaming.lua

@@ -0,0 +1,36 @@
+local RenameableBuffer = require('yazi.renameable_buffer')
+
+local M = {}
+
+---@param rename_events YaziEventDataRename[]
+---@return RenameableBuffer[] "instructions for renaming the buffers (command pattern)"
+function M.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
+  ---@type RenameableBuffer[]
+  local open_buffers = {}
+  for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
+    local path = vim.api.nvim_buf_get_name(bufnr)
+    if path ~= '' and path ~= nil then
+      local renameable_buffer = RenameableBuffer.new(bufnr, path)
+      open_buffers[#open_buffers + 1] = renameable_buffer
+    end
+  end
+
+  ---@type table<integer, RenameableBuffer>
+  local renamed_buffers = {}
+
+  for _, event in ipairs(rename_events) do
+    for _, buffer in ipairs(open_buffers) do
+      if buffer:matches_exactly(event.from) then
+        buffer:rename(event.to)
+        renamed_buffers[buffer.bufnr] = buffer
+      elseif buffer:matches_parent(event.from) then
+        buffer:rename_parent(event.from, event.to)
+        renamed_buffers[buffer.bufnr] = buffer
+      end
+    end
+  end
+
+  return vim.tbl_values(renamed_buffers)
+end
+
+return M

lua/yazi/utils.lua

@@ -1,5 +1,4 @@
 local fn = vim.fn
-local RenameableBuffer = require('yazi.renameable_buffer')
 
 local M = {}
 
@@ -86,35 +85,4 @@ function M.read_events_file(path)
   return events
 end
 
----@param rename_events YaziEventDataRename[]
----@return RenameableBuffer[] "instructions for renaming the buffers (command pattern)"
-function M.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
-  ---@type RenameableBuffer[]
-  local open_buffers = {}
-  for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
-    local path = vim.api.nvim_buf_get_name(bufnr)
-    if path ~= '' and path ~= nil then
-      local renameable_buffer = RenameableBuffer.new(bufnr, path)
-      open_buffers[#open_buffers + 1] = renameable_buffer
-    end
-  end
-
-  ---@type table<integer, RenameableBuffer>
-  local renamed_buffers = {}
-
-  for _, event in ipairs(rename_events) do
-    for _, buffer in ipairs(open_buffers) do
-      if buffer:matches_exactly(event.from) then
-        buffer:rename(event.to)
-        renamed_buffers[buffer.bufnr] = buffer
-      elseif buffer:matches_parent(event.from) then
-        buffer:rename_parent(event.from, event.to)
-        renamed_buffers[buffer.bufnr] = buffer
-      end
-    end
-  end
-
-  return vim.tbl_values(renamed_buffers)
-end
-
 return M

tests/yazi/rename_spec.lua

@@ -1,5 +1,5 @@
 local assert = require('luassert')
-local utils = require('yazi.utils')
+local renaming = require('yazi.renaming')
 
 describe('get_buffers_that_need_renaming_after_yazi_exited', function()
   before_each(function()
@@ -27,7 +27,7 @@ describe('get_buffers_that_need_renaming_after_yazi_exited', function()
     vim.fn.bufadd('/my-tmp/file_A')
 
     local rename_instructions =
-      utils.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
+      renaming.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
 
     assert.is_equal(vim.tbl_count(rename_instructions), 2)
 
@@ -55,7 +55,7 @@ describe('get_buffers_that_need_renaming_after_yazi_exited', function()
       vim.fn.bufadd('/my-tmp/dir1/file')
 
       local rename_instructions =
-        utils.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
+        renaming.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
 
       assert.is_equal(vim.tbl_count(rename_instructions), 1)
       local result = rename_instructions[1]
@@ -76,7 +76,7 @@ describe('get_buffers_that_need_renaming_after_yazi_exited', function()
     vim.fn.bufadd('/my-tmp/dir1/file')
 
     local rename_instructions =
-      utils.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
+      renaming.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
 
     assert.is_equal(vim.tbl_count(rename_instructions), 0)
   end)
@@ -98,7 +98,7 @@ describe('get_buffers_that_need_renaming_after_yazi_exited', function()
     vim.fn.bufadd('/my-tmp/file1')
 
     local rename_instructions =
-      utils.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
+      renaming.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
 
     assert.is_equal(vim.tbl_count(rename_instructions), 1)
 
@@ -124,7 +124,7 @@ describe('get_buffers_that_need_renaming_after_yazi_exited', function()
     vim.fn.bufadd('/my-tmp/dir1/file')
 
     local rename_instructions =
-      utils.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
+      renaming.get_buffers_that_need_renaming_after_yazi_exited(rename_events)
 
     assert.is_equal(vim.tbl_count(rename_instructions), 1)
     local result = rename_instructions[1]