fix: support all whichkey methods (#82)

lua/hawtkeys/ts.lua

@@ -344,16 +344,19 @@ local function find_maps_in_file(filePath)
                 local strObj =
                     vim.treesitter.get_node_text(node.node, fileContent)
                 local ok, tableObj = pcall(function()
-                    return loadstring("return " .. strObj)()
+                    --Remove wrapping parens and wrap in table and unpack - issue #81
+                    strObj = strObj:gsub("^%s*%(%s*", ""):gsub("%s*%)%s*$", "")
+                    return loadstring("return {" .. strObj .. "}")()
                 end)
                 if not ok then
                     vim.notify_once(
                         "Error parsing which-key table",
                         vim.log.levels.ERROR
                     )
+                    vim.notify(strObj, vim.log.levels.ERROR)
                     break
                 end
-                local wkMapping = which_key.parse(tableObj)
+                local wkMapping = which_key.parse(unpack(tableObj))
 
                 for _, mapping in ipairs(wkMapping) do
                     local map = {

tests/hawtkeys/example_configs/which-key.register_keymap_method1.lua

@@ -0,0 +1,8 @@
+local wk = require("which-key")
+
+wk.register({
+    w = {
+        name = "file", -- optional group name
+        o = { ':lua print("hello")<CR>', "Find File" }, -- create a binding with label
+    },
+}, { prefix = "<leader>" })

tests/hawtkeys/example_configs/which-key.register_keymap_method2.lua

@@ -0,0 +1,10 @@
+local wk = require("which-key")
+
+wk.register({
+    ["<leader>"] = {
+        w = {
+            name = "test",
+            t = { ':lua print("hello")<CR>', "test" },
+        },
+    },
+})

tests/hawtkeys/example_configs/which-key.register_keymap.lua → tests/hawtkeys/example_configs/which-key.register_keymap_method3.lua

@@ -1,7 +1,7 @@
-local whichkey = require("which-key")
+local wk = require("which-key")
 
-whichkey.register({
-    ["<leader>"] = {
+wk.register({
+    ["<leader>w"] = {
         name = "test",
         ["3"] = { ':lua print("hello")<CR>', "hello" },
     },

tests/hawtkeys/example_configs/which-key.register_keymap_method4.lua

@@ -0,0 +1,5 @@
+local wk = require("which-key")
+
+wk.register({
+    ["<leader>wf"] = { ':lua print("hello")<CR>', "hello" },
+})

tests/hawtkeys/ts_spec.lua

@@ -33,7 +33,7 @@ describe("Uninstalled plugins", function()
                 ["lazy"] = {
                     method = "lazy",
                 },
-                ["whichkey.register"] = {
+                ["wk.register"] = {
                     method = "which_key",
                 },
             },
@@ -45,7 +45,7 @@ describe("Uninstalled plugins", function()
             return require("which-key")
         end)
         local keymapWhichKey = ts.find_maps_in_file(
-            "tests/hawtkeys/example_configs/which-key.register_keymap.lua"
+            "tests/hawtkeys/example_configs/which-key.register_keymap_method1.lua"
         )
         local messages = vim.api.nvim_exec2("messages", { output = true })
         eq(false, ok)
@@ -170,19 +170,46 @@ describe("Which Key Managed Maps", function()
         ts.reset_scanned_files()
         hawtkeys.setup({
             customMaps = {
-                ["whichkey.register"] = {
+                ["wk.register"] = {
                     method = "which_key",
                 },
             },
         })
     end)
 
-    it("extract whichkey.register() keymap", function()
+    it("extract whichkey method 1", function()
         local keymap = ts.find_maps_in_file(
-            "tests/hawtkeys/example_configs/which-key.register_keymap.lua"
+            "tests/hawtkeys/example_configs/which-key.register_keymap_method1.lua"
         )
         eq("n", keymap[1].mode)
-        eq("<leader>3", keymap[1].lhs)
+        eq("<leader>wo", keymap[1].lhs)
+        eq(':lua print("hello")<CR>', keymap[1].rhs)
+    end)
+
+    it("extract whichkey method 2", function()
+        local keymap = ts.find_maps_in_file(
+            "tests/hawtkeys/example_configs/which-key.register_keymap_method2.lua"
+        )
+        eq("n", keymap[1].mode)
+        eq("<leader>wt", keymap[1].lhs)
+        eq(':lua print("hello")<CR>', keymap[1].rhs)
+    end)
+
+    it("extract whichkey method 3", function()
+        local keymap = ts.find_maps_in_file(
+            "tests/hawtkeys/example_configs/which-key.register_keymap_method3.lua"
+        )
+        eq("n", keymap[1].mode)
+        eq("<leader>w3", keymap[1].lhs)
+        eq(':lua print("hello")<CR>', keymap[1].rhs)
+    end)
+
+    it("extract whichkey method 4", function()
+        local keymap = ts.find_maps_in_file(
+            "tests/hawtkeys/example_configs/which-key.register_keymap_method4.lua"
+        )
+        eq("n", keymap[1].mode)
+        eq("<leader>wf", keymap[1].lhs)
         eq(':lua print("hello")<CR>', keymap[1].rhs)
     end)
 end)