fix(config): process modes in correct order. Fixes #50 again

folke · Jun 24, 2023 · 919cbe4 · 919cbe4
1 parent 7b58c5b
commit 919cbe4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/lua/flash/config.lua b/lua/flash/config.lua
@@ -176,13 +176,13 @@ function M.get(...)
     ---@type Flash.Config?
     local opts = select(i, ...)
     if opts then
-      local mopts = opts
-      while mopts.mode and not modes[mopts.mode] do
-        modes[mopts.mode] = true
-        mopts = options.modes[mopts.mode] or {}
-        all[#all + 1] = mopts
+      table.insert(all, opts)
+      local idx = #all
+      while opts.mode and not modes[opts.mode] do
+        modes[opts.mode] = true
+        opts = options.modes[opts.mode] or {}
+        table.insert(all, idx, opts)
       end
-      all[#all + 1] = opts
     end
   end
 

diff --git a/tests/config_spec.lua b/tests/config_spec.lua
@@ -22,4 +22,17 @@ describe("config", function()
     assert.is_true(Config.get({ mode = "foo" }).field)
     assert.is_true(Config.get({ mode = "bar" }).field)
   end)
+
+  it("processes modes recursively in correct order", function()
+    Config.setup({
+      modes = {
+        a = { mode = "b", v = "a" },
+        b = { mode = "c", v = "b" },
+        c = { v = "c" },
+      },
+    })
+    assert.same("d", Config.get({ mode = "a", v = "d" }).v)
+    assert.same("a", Config.get({ mode = "a" }).v)
+    assert.same("b", Config.get({ mode = "b" }).v)
+  end)
 end)