feat(compile): add support for grouped keys

musjj · musjj · commit d06ab96a036e · 2022-09-11T00:19:20.000+07:00
diff --git a/README.md b/README.md
@@ -523,7 +523,11 @@ with `bax` filetype.
 
 #### Keybindings
 
-Plugins may be lazy-loaded on the use of keybindings/maps. Individual keybindings are specified either as a string (in which case they are treated as normal mode maps) or a table in the format `{mode, map}`.
+Plugins may be lazy-loaded on the use of keybindings/maps. Individual keybindings are specified either as a string (in which case they are treated as normal mode maps) or a table in one of the following formats:
+```lua
+  { key, { mode, key }, ... } -- treated as normal mode if mode is not provided
+  { mode = key, mode = { key, ... }, ... }
+```
 
 ### Performing plugin management operations
 `packer` exposes the following functions for common plugin management operations. In all of the
diff --git a/doc/packer.txt b/doc/packer.txt
@@ -388,9 +388,10 @@ only loaded for files with `bax` filetype.
 
 KEYBINDINGS                                    *packer-plugin-keybindings*
 Plugins may be lazy-loaded on the use of keybindings/maps. Individual
-keybindings are specified under the `keys` key in a plugin specification
-either as a string (in which case they are treated as normal mode maps) or a
-table in the format `{mode, map}`.
+keybindings are specified either as a string (in which case they are treated
+as normal mode maps) or a table in one of the following formats: >
+  { key, { mode, key }, ... } -- treated as normal mode if mode is not provided
+  { mode = key, mode = { key, ... }, ... }
 
 LAZY-LOADING                                   *packer-lazy-load*
 To optimize startup time, `packer.nvim` compiles code to perform the
diff --git a/lua/packer/compile.lua b/lua/packer/compile.lua
@@ -422,7 +422,24 @@ local function make_loaders(_, plugins, output_lua, should_profile)
           plugin.keys = { plugin.keys }
         end
         loaders[name].keys = {}
-        for _, keymap in ipairs(plugin.keys) do
+
+        local keys
+        if vim.tbl_islist(plugin.keys) then
+          keys = plugin.keys
+        else
+          keys = {}
+          for mode, keymap in pairs(plugin.keys) do
+            if type(keymap) == 'string' then
+              table.insert(keys, { mode, keymap })
+            else
+              for _, k in ipairs(keymap) do
+                table.insert(keys, { mode, k })
+              end
+            end
+          end
+        end
+
+        for _, keymap in ipairs(keys) do
           if type(keymap) == 'string' then
             keymap = { '', keymap }
           end
