fix: data loss bug when move + delete (#162)

stevearc · Aug 26, 2023 · f86d494 · f86d494
1 parent 2fde9d8
commit f86d494
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/lua/oil/mutator/init.lua b/lua/oil/mutator/init.lua
@@ -191,7 +191,7 @@ M.enforce_action_order = function(actions)
   local function get_deps(action)
     local ret = {}
     if action.type == "delete" then
-      return ret
+      src_trie:accum_children_of(action.url, ret)
     elseif action.type == "create" then
       -- Finish operating on parents first
       -- e.g. NEW /a BEFORE NEW /a/b
@@ -289,7 +289,7 @@ M.enforce_action_order = function(actions)
         -- We've detected a move cycle (e.g. MOVE /a -> /b + MOVE /b -> /a)
         -- Split one of the moves and retry
         local intermediate_url =
-          string.format("%s__oil_tmp_%05d", loop_action.src_url, math.random(999999))
+            string.format("%s__oil_tmp_%05d", loop_action.src_url, math.random(999999))
         local move_1 = {
           type = "move",
           entry_type = loop_action.entry_type,

diff --git a/tests/mutator_spec.lua b/tests/mutator_spec.lua
@@ -195,7 +195,7 @@ a.describe("mutator", function()
       })
       local diffs = parser.parse(bufnr)
       assert.are.same({
-        { type = "new", id = file[FIELD_ID], name = "b.txt", entry_type = "file" },
+        { type = "new",    id = file[FIELD_ID], name = "b.txt", entry_type = "file" },
         { type = "delete", id = file[FIELD_ID], name = "a.txt" },
       }, diffs)
     end)
@@ -314,7 +314,7 @@ a.describe("mutator", function()
       local bufnr = vim.api.nvim_get_current_buf()
       local diffs = {
         { type = "delete", name = "a.txt", id = file[FIELD_ID] },
-        { type = "new", name = "b.txt", entry_type = "file", id = file[FIELD_ID] },
+        { type = "new",    name = "b.txt", entry_type = "file", id = file[FIELD_ID] },
       }
       local actions = mutator.create_actions_from_diffs({
         [bufnr] = diffs,
@@ -335,8 +335,8 @@ a.describe("mutator", function()
       local bufnr = vim.api.nvim_get_current_buf()
       local diffs = {
         { type = "delete", name = "a.txt", id = file[FIELD_ID] },
-        { type = "new", name = "b.txt", entry_type = "file", id = file[FIELD_ID] },
-        { type = "new", name = "a.txt", entry_type = "file" },
+        { type = "new",    name = "b.txt", entry_type = "file", id = file[FIELD_ID] },
+        { type = "new",    name = "a.txt", entry_type = "file" },
       }
       local actions = mutator.create_actions_from_diffs({
         [bufnr] = diffs,
@@ -363,9 +363,9 @@ a.describe("mutator", function()
       local bufnr = vim.api.nvim_get_current_buf()
       local diffs = {
         { type = "delete", name = "a.txt", id = afile[FIELD_ID] },
-        { type = "new", name = "b.txt", entry_type = "file", id = afile[FIELD_ID] },
+        { type = "new",    name = "b.txt", entry_type = "file", id = afile[FIELD_ID] },
         { type = "delete", name = "b.txt", id = bfile[FIELD_ID] },
-        { type = "new", name = "a.txt", entry_type = "file", id = bfile[FIELD_ID] },
+        { type = "new",    name = "a.txt", entry_type = "file", id = bfile[FIELD_ID] },
       }
       math.randomseed(2983982)
       local actions = mutator.create_actions_from_diffs({
@@ -409,6 +409,19 @@ a.describe("mutator", function()
       assert.are.same({ create, move }, ordered_actions)
     end)
 
+    it("Moves file out of parent before deleting parent", function()
+      local move = {
+        type = "move",
+        src_url = "oil-test:///a/b.txt",
+        dest_url = "oil-test:///b.txt",
+        entry_type = "file",
+      }
+      local delete = { type = "delete", url = "oil-test:///a", entry_type = "directory" }
+      local actions = { delete, move }
+      local ordered_actions = mutator.enforce_action_order(actions)
+      assert.are.same({ move, delete }, ordered_actions)
+    end)
+
     it("Handles parent child move ordering", function()
       -- move parent into a child and child OUT of parent
       --     MOVE /a/b -> /b