From 85afda8832e9a31fa3c55b16c6ccab95847210b2 Mon Sep 17 00:00:00 2001
From: purxiz <functionofn@gmail.com>
Date: Wed, 6 Jan 2021 11:48:08 -0600
Subject: [PATCH] fixes incorrect hint base

The bases for the hint were being decoded as base 16, despite being displayed as base 36 (0-9, a-z). This fix makes it so typing 'search string .index' returns the unicode char at the expected index, based on what is displayed by the program.

It also slightly changes the behavior. Before, only the selected result would appear. For example, musical note `musical note .18` would only show a single result, since there was only a single result at index 18. Now, searching by index doesn't remove codepoints/results, it simply highlights the result at the correct index for you.
---
 kittens/unicode_input/main.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/kittens/unicode_input/main.py b/kittens/unicode_input/main.py
index 6cf6ea116..e3395bff4 100644
--- a/kittens/unicode_input/main.py
+++ b/kittens/unicode_input/main.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
-
 import os
 import string
 import subprocess
@@ -172,11 +171,11 @@ def current_codepoint(self) -> Optional[int]:
         if self.codepoints:
             return self.codepoints[self.current_idx]
 
-    def set_codepoints(self, codepoints: List[int], mode: str = HEX) -> None:
+    def set_codepoints(self, codepoints: List[int], mode: str = HEX, current_idx: int = 0) -> None:
         self.codepoints = codepoints
         self.mode = mode
         self.layout_dirty = True
-        self.current_idx = 0
+        self.current_idx = current_idx
 
     def codepoint_at_hint(self, hint: str) -> int:
         return self.codepoints[decode_hint(hint)]
@@ -270,8 +269,10 @@ def move_current(self, rows: int = 0, cols: int = 0) -> None:
 
 
 def is_index(w: str) -> bool:
+    if w[0] != INDEX_CHAR:
+        return False
     try:
-        int(w.lstrip(INDEX_CHAR), 16)
+        int(w.lstrip(INDEX_CHAR), 36)
         return True
     except Exception:
         return False
@@ -306,6 +307,7 @@ def resolved_current_char(self) -> Optional[str]:
 
     def update_codepoints(self) -> None:
         codepoints = None
+        iindex_word = 0
         if self.mode is HEX:
             q: Tuple[str, Optional[Union[str, Sequence[int]]]] = (self.mode, None)
             codepoints = self.recent
@@ -324,14 +326,11 @@ def update_codepoints(self) -> None:
                 if index_words:
                     index_word = words[index_words[0]]
                     words = words[:index_words[0]]
+                    iindex_word = int(index_word.lstrip(INDEX_CHAR), 36)
                 codepoints = codepoints_matching_search(tuple(words))
-                if index_words:
-                    iindex_word = int(index_word.lstrip(INDEX_CHAR), 16)
-                    if codepoints and iindex_word < len(codepoints):
-                        codepoints = [codepoints[iindex_word]]
         if q != self.last_updated_code_point_at:
             self.last_updated_code_point_at = q
-            self.table.set_codepoints(codepoints or [], self.mode)
+            self.table.set_codepoints(codepoints or [], self.mode, iindex_word if iindex_word < len(codepoints) else 0)
 
     def update_current_char(self) -> None:
         self.update_codepoints()