fix: never overwrite actual keymaps with group names

folke · Jul 14, 2023 · f61da3a · f61da3a
1 parent d871f2b
commit f61da3a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lua/which-key/tree.lua b/lua/which-key/tree.lua
@@ -91,7 +91,15 @@ function Tree:add(mapping, opts)
       self.nodes[node_key] = node
     end
   end
-  node.mapping = vim.tbl_deep_extend("force", node.mapping or {}, mapping)
+  if node.mapping and node.mapping.group and not mapping.group then
+    node.mapping = mapping
+    node.children = {}
+  elseif node.mapping and not node.mapping.group and mapping.group then
+    return node
+  else
+    node.mapping = vim.tbl_deep_extend("force", node.mapping or {}, mapping)
+  end
+
   return node
 end
 

diff --git a/lua/which-key/view.lua b/lua/which-key/view.lua
@@ -282,7 +282,7 @@ function M.on_keys(opts)
     local results = Keys.get_mappings(M.mode, M.keys, buf)
 
     --- Check for an exact match. Feedkeys with remap
-    if results.mapping and not results.mapping.group and #results.mappings == 0 then
+    if results.mapping and not results.mapping.group then
       M.hide()
       if results.mapping.fn then
         results.mapping.fn()