From a17b423a0605ba02ad08e4adfd5cbf69abf8d343 Mon Sep 17 00:00:00 2001
From: Rene Descartes <rene.descartes2021@yandex.ru>
Date: Mon, 5 Dec 2022 14:23:28 -0700
Subject: [PATCH] Fix keycode merge bugs introduced with 9875baef

---
 autoload/which_key.vim | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/autoload/which_key.vim b/autoload/which_key.vim
index 1abc1e4..2125220 100644
--- a/autoload/which_key.vim
+++ b/autoload/which_key.vim
@@ -37,8 +37,10 @@ let g:which_key#TYPE = s:TYPE
 let s:should_note_winid = exists('*win_getid')
 
 function! which_key#register(prefix, dict, ...) abort
-  let key = has_key(s:MERGE_INTO, a:prefix) ?
-    \ s:MERGE_INTO[a:prefix] : a:prefix
+  let key = has_key(s:KEYCODES, a:prefix) ?
+    \ s:KEYCODES[a:prefix] : a:prefix
+  let key = has_key(s:MERGE_INTO, key) ?
+    \ s:MERGE_INTO[key] : key
   let val = a:dict
   if a:0 == 1
     call extend(s:desc[a:1], {key:val})
@@ -53,10 +55,13 @@ function! s:handle_char_on_start_is_ok(c) abort
   if which_key#char_handler#is_exit_code(a:c)
     return 1
   endif
-  let char = type(a:c) == s:TYPE.number ? nr2char(a:c) : a:c
+  let char = which_key#char_handler#parse_raw(a:c)
   if has_key(s:KEYCODES, char)
     let char = s:KEYCODES[char]
   endif
+  if has_key(s:MERGE_INTO, char)
+    let char = s:MERGE_INTO[char]
+  endif
   let s:which_key_trigger .= ' '.char
   let next_level = get(s:runtime, char)
   let ty = type(next_level)
@@ -146,7 +151,7 @@ function! s:create_runtime(mode, key)
     if type(s:desc[mode][key]) == s:TYPE.dict
       let runtime = deepcopy(s:desc[mode][key])
     else
-      let runtime = deepcopy({s:desc[mode][key]})
+      let runtime = deepcopy(eval(s:desc[mode][key]))
     endif
     let native = s:cache[mode][key]
     call s:merge(runtime, native)
@@ -160,12 +165,12 @@ function! s:merge(target, native) " {{{
   let target = a:target
   let native = a:native
   " e.g. <C-І> is merged into <Tab>, '<Space>' is merged into ' '
-  call map(target, {k,v ->
-  \ has_key(s:MERGE_INTO, k) ?
-  \   (has_key(target, s:MERGE_INTO[k]) ?
-  \     extend(target[s:MERGE_INTO[k]], target[k], 'keep') :
-  \     extend(target, {s:MERGE_INTO[k]: target[k]})) :
-  \   v})
+  let mergekeys = filter(copy(target), {k,_ -> has_key(s:MERGE_INTO, k)})
+  call map(mergekeys, {k,v ->
+  \ (has_key(target, s:MERGE_INTO[k]) ?
+  \   extend(target[s:MERGE_INTO[k]], target[k], 'keep') :
+  \   extend(target, {s:MERGE_INTO[k]: target[k]}))
+  \ })
   call filter(target, {k,_ -> !has_key(s:MERGE_INTO, k)})
   for [k, V] in items(target)
     " Support a `Dictionary-function` for on-the-fly mappings