From 319b1ab3af2c1784376ea4f7a031fb8450a1fd31 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] Remove redundant loop in s:getchar()

---
 autoload/which_key.vim | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/autoload/which_key.vim b/autoload/which_key.vim
index 1abc1e4..8df0d40 100644
--- a/autoload/which_key.vim
+++ b/autoload/which_key.vim
@@ -30,7 +30,6 @@ let s:MERGE_INTO = {
       \ '<Bslash>': '\',
       \ '<Bar>': '|'
       \ }
-let s:REQUIRES_REGEX_ESCAPE = ['$', '*', '~', '.']
 
 let g:which_key#TYPE = s:TYPE
 
@@ -213,15 +212,6 @@ function! s:echo_prompt() abort
   echohl None
 endfunction
 
-function! s:has_children(input) abort
-  if index(s:REQUIRES_REGEX_ESCAPE, a:input) != -1
-    let group = map(keys(s:runtime), {_,v -> v =~# '^\'.a:input})
-  else
-    let group = map(keys(s:runtime), {_,v -> v =~# '^'.a:input})
-  endif
-  return len(filter(group, 'v:val == 1')) > 1
-endfunction
-
 function! s:show_upper_level_mappings() abort
   " Top level
   if empty(s:last_runtime_stack)
@@ -242,7 +232,6 @@ function! s:show_upper_level_mappings() abort
 endfunction
 
 function! s:getchar() abort
-  let input = ''
   try
     let c = getchar()
   " Handle <C-C>
@@ -270,18 +259,14 @@ function! s:getchar() abort
     return '<CR>'
   endif
 
-  let input .= which_key#char_handler#parse_raw(c)
-  if s:has_children(input)
-    while 1
-      if !which_key#char_handler#timeout_for_next_char()
-        let input .= which_key#char_handler#parse_raw(getchar())
-      else
-        break
-      endif
-    endwhile
+  let c = which_key#char_handler#parse_raw(c)
+  if has_key(s:KEYCODES, c)
+    let c = s:KEYCODES[c]
   endif
-
-  return input
+  if has_key(s:MERGE_INTO, c)
+    let c = s:MERGE_INTO[c]
+  endif
+  return c
 endfunction
 
 function! which_key#wait_for_input() " {{{