fix(duplicates): fix data shape (#37)

Co-authored-by: tris203 <[email protected]>
tris203 · Dec 21, 2023 · 683e163 · 683e163
1 parent f400cb0
commit 683e163
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/lua/hawtkeys/duplicates.lua b/lua/hawtkeys/duplicates.lua
@@ -7,13 +7,11 @@ function M.show_duplicates()
     local allKeys = tsSearch.get_all_keymaps()
     local duplicates = utils.find_duplicates(allKeys)
     local resultTable = {}
-    for index, data in ipairs(duplicates) do
+    for index, data in pairs(duplicates) do
         table.insert(resultTable, tostring(index) .. " duplicates found in ")
         table.insert(
             resultTable,
-            tostring(data[1][1].from_file)
-                .. ":"
-                .. tostring(data[2][1].from_file)
+            tostring(data[1].from_file) .. ":" .. tostring(data[2].from_file)
         )
     end
     return resultTable

diff --git a/lua/hawtkeys/utils.lua b/lua/hawtkeys/utils.lua
@@ -70,7 +70,7 @@ function M.find_duplicates(keymaps)
     for _, v in pairs(keymaps) do
         for _, v2 in pairs(keymaps) do
             if v.lhs == v2.lhs and v.mode == v2.mode and v.rhs ~= v2.rhs then
-                duplicates[v.lhs] = { { v }, { v2 } }
+                duplicates[v.lhs] = { v, v2 }
             end
         end
     end

diff --git a/tests/hawtkeys/utils_spec.lua b/tests/hawtkeys/utils_spec.lua
@@ -13,8 +13,8 @@ describe("utils functionality", function()
         }
         local duplicates = utils.find_duplicates(keymaps)
         eq(2, #duplicates.a)
-        eq("a", duplicates.a[1][1].lhs)
-        eq("a", duplicates.a[2][1].lhs)
+        eq("a", duplicates.a[1].lhs)
+        eq("a", duplicates.a[2].lhs)
     end)
 
     it("can find multiple duplicate lhs in table", function()
@@ -26,10 +26,10 @@ describe("utils functionality", function()
         }
         local duplicates = utils.find_duplicates(keymaps)
         eq(2, #duplicates.a)
-        eq("a", duplicates.a[1][1].lhs)
-        eq("a", duplicates.a[2][1].lhs)
+        eq("a", duplicates.a[1].lhs)
+        eq("a", duplicates.a[2].lhs)
         eq(2, #duplicates.b)
-        eq("b", duplicates.b[1][1].lhs)
-        eq("b", duplicates.b[2][1].lhs)
+        eq("b", duplicates.b[1].lhs)
+        eq("b", duplicates.b[2].lhs)
     end)
 end)