Merge pull request #11 from mdgrs-mei/support-non-ascii-character-query

Support non ascii character query
mdgrs-mei · Mar 2, 2024 · f3e2cdd · f3e2cdd
2 parents 0c5b3f4 + 6c0f8b8
commit f3e2cdd
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 37 deletions.
diff --git a/src/PowerShellRun/Application/SearchBar.cs b/src/PowerShellRun/Application/SearchBar.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Diagnostics;
 using System.Text;
+using PowerShellRun.Dependency;
 
 internal class SearchBar
 {
@@ -20,21 +21,6 @@ internal class SearchBar
     public bool IsCursorUpdated { get; set; } = false;
     public string DebugPerfString = "";
 
-    public int CursorXInCanvas
-    {
-        get
-        {
-            return _cursorX + _textBox.X;
-        }
-    }
-    public int CursorYInCanvas
-    {
-        get
-        {
-            return _textBox.Y;
-        }
-    }
-
     public SearchBar(string promptString)
     {
         var theme = SelectorOptionHolder.GetInstance().Option.Theme;
@@ -71,6 +57,25 @@ public void SetQuery(string query)
         _isQuerySetFromOutside = true;
     }
 
+    public (int X, int Y) GetCursorPositionInCanvas()
+    {
+        int x = _textBox.X;
+        int y = _textBox.Y;
+        for (int i = 0; i < _cursorX; ++i)
+        {
+            if (i >= _readKeysBuffer.Length)
+                break;
+
+            int displayWidth = Unicode.GetDisplayWidth(_readKeysBuffer[i]);
+            if (displayWidth <= 0)
+                continue;
+
+            x += displayWidth;
+        }
+
+        return (x, y);
+    }
+
     public void Update()
     {
         ReadKeys();
@@ -102,14 +107,6 @@ public void Update()
         }
     }
 
-    private static Key[] _skipKeys =
-    {
-        Key.Enter,
-        Key.Escape,
-        Key.UpArrow,
-        Key.DownArrow,
-        Key.Tab,
-    };
     private void ReadKeys()
     {
         IsQueryUpdated = false;
@@ -123,18 +120,6 @@ private void ReadKeys()
             if (key.KeyCombination.Modifier.HasFlag(KeyModifier.Alt))
                 continue;
 
-            bool skip = false;
-            foreach (var skipKey in _skipKeys)
-            {
-                if (skipKey == key.KeyCombination.Key)
-                {
-                    skip = true;
-                    break;
-                }
-            }
-            if (skip)
-                continue;
-
             if (key.KeyCombination.Key == Key.LeftArrow)
             {
                 SetCursorX(_cursorX - 1);
@@ -183,7 +168,7 @@ private void ReadKeys()
                 continue;
             }
 
-            if (!Char.IsAscii(key.ConsoleKeyInfo.KeyChar))
+            if (Unicode.GetDisplayWidth(key.ConsoleKeyInfo.KeyChar) <= 0)
                 continue;
 
             if (_readKeysBuffer.Length >= Constants.QueryCharacterMaxCount)

diff --git a/src/PowerShellRun/Application/Selector.cs b/src/PowerShellRun/Application/Selector.cs
@@ -86,7 +86,8 @@ public static SelectorResult Open(
                 break;
             }
 
-            canvas.SetCursorOffset(searchBar.CursorXInCanvas, searchBar.CursorYInCanvas);
+            var cursorPosInCanvas = searchBar.GetCursorPositionInCanvas();
+            canvas.SetCursorOffset(cursorPosInCanvas.X, cursorPosInCanvas.Y);
             if (searchBar.IsQueryUpdated || resultWindow.IsUpdated)
             {
                 canvas.ClearCells();

diff --git a/tests/Public/Invoke-PSRunSelector.Tests.ps1 b/tests/Public/Invoke-PSRunSelector.Tests.ps1
@@ -53,6 +53,12 @@
         $match | Should -Be 'abc'
     }
 
+    It 'should support non-ascii character query' {
+        $context.Query = 'あ'
+        $match = 'abc', 'aあ' | Invoke-PSRunSelector -Option $option -Context $context
+        $match | Should -Be 'aあ'
+    }
+
     It 'should not throw an exception with multi selection' {
         $match = 'a' | Invoke-PSRunSelector -Option $option -MultiSelection
         $match | Should -Be 'a'