From 410db08f184085717c5f38d718b199dfe8f6a481 Mon Sep 17 00:00:00 2001
From: SparkUiX <thoe9008@outlook.com>
Date: Wed, 24 Jun 2026 00:55:21 +0800
Subject: [PATCH 1/2] Fix pinyin match for Chinese restart command

---
 .../PinyinAlphabet.cs                         | 31 +++++++++++++-
 Flow.Launcher.Test/PinyinAlphabetTest.cs      | 40 +++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 Flow.Launcher.Test/PinyinAlphabetTest.cs

diff --git a/Flow.Launcher.Infrastructure/PinyinAlphabet.cs b/Flow.Launcher.Infrastructure/PinyinAlphabet.cs
index 7f55d890992..30afa5a1981 100644
--- a/Flow.Launcher.Infrastructure/PinyinAlphabet.cs
+++ b/Flow.Launcher.Infrastructure/PinyinAlphabet.cs
@@ -14,13 +14,23 @@ namespace Flow.Launcher.Infrastructure
 {
     public class PinyinAlphabet : IAlphabet
     {
+        private static readonly IReadOnlyDictionary<string, string[]> PolyphonicPhraseOverrides = new Dictionary<string, string[]>
+        {
+            ["重启"] = ["Chong", "Qi"],
+        };
+
         private readonly ConcurrentDictionary<string, (string translation, TranslationMapping map)> _pinyinCache = new();
         private readonly Settings _settings;
         private ReadOnlyDictionary<string, string> currentDoublePinyinTable;
 
         public PinyinAlphabet()
+            : this(Ioc.Default.GetRequiredService<Settings>())
+        {
+        }
+
+        public PinyinAlphabet(Settings settings)
         {
-            _settings = Ioc.Default.GetRequiredService<Settings>();
+            _settings = settings;
             LoadDoublePinyinTable();
 
             _settings.PropertyChanged += (sender, e) =>
@@ -118,6 +128,8 @@ public bool ShouldTranslate(string stringToTranslate)
         private (string translation, TranslationMapping map) BuildCacheFromContent(string content)
         {
             var resultList = WordsHelper.GetPinyinList(content);
+            ApplyPolyphonicPhraseOverrides(content, resultList);
+
             var resultBuilder = new StringBuilder(_settings.UseDoublePinyin ? 3 : 4); // Pre-allocate with estimated capacity
             var map = new TranslationMapping();
 
@@ -163,6 +175,23 @@ public bool ShouldTranslate(string stringToTranslate)
             return _pinyinCache[content] = result;
         }
 
+        private static void ApplyPolyphonicPhraseOverrides(string content, string[] resultList)
+        {
+            foreach (var (phrase, pinyin) in PolyphonicPhraseOverrides)
+            {
+                var index = content.IndexOf(phrase, StringComparison.Ordinal);
+                while (index >= 0)
+                {
+                    for (var i = 0; i < pinyin.Length; i++)
+                    {
+                        resultList[index + i] = pinyin[i];
+                    }
+
+                    index = content.IndexOf(phrase, index + phrase.Length, StringComparison.Ordinal);
+                }
+            }
+        }
+
         /// <summary>
         /// Optimized Chinese character detection using the comprehensive CJK Unicode ranges
         /// </summary>
diff --git a/Flow.Launcher.Test/PinyinAlphabetTest.cs b/Flow.Launcher.Test/PinyinAlphabetTest.cs
new file mode 100644
index 00000000000..40a2392d77f
--- /dev/null
+++ b/Flow.Launcher.Test/PinyinAlphabetTest.cs
@@ -0,0 +1,40 @@
+using Flow.Launcher.Infrastructure;
+using Flow.Launcher.Infrastructure.UserSettings;
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+
+namespace Flow.Launcher.Test
+{
+    [TestFixture]
+    public class PinyinAlphabetTest
+    {
+        [TestCase("重启", "Chong Qi")]
+        [TestCase("重启 Flow Launcher", "Chong Qi Flow Launcher")]
+        [TestCase("重庆", "Chong Qing")]
+        public void Translate_ShouldUseExpectedPinyinForPolyphonicPhrases(string content, string expected)
+        {
+            var alphabet = new PinyinAlphabet(new Settings
+            {
+                ShouldUsePinyin = true
+            });
+
+            var result = alphabet.Translate(content);
+
+            ClassicAssert.AreEqual(expected, result.translation);
+        }
+
+        [Test]
+        public void FuzzyMatch_ShouldMatchRestartByCorrectPinyin()
+        {
+            var settings = new Settings
+            {
+                ShouldUsePinyin = true
+            };
+            var matcher = new StringMatcher(new PinyinAlphabet(settings), settings);
+
+            var result = matcher.FuzzyMatch("chongqi", "重启");
+
+            ClassicAssert.True(result.Success);
+        }
+    }
+}

From f9ac9b76e9301a7c4a2523712b12ee561588707b Mon Sep 17 00:00:00 2001
From: SparkUiX <thoe9008@outlook.com>
Date: Wed, 24 Jun 2026 01:03:59 +0800
Subject: [PATCH 2/2] Address pinyin override review feedback

---
 Flow.Launcher.Infrastructure/PinyinAlphabet.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Flow.Launcher.Infrastructure/PinyinAlphabet.cs b/Flow.Launcher.Infrastructure/PinyinAlphabet.cs
index 30afa5a1981..d5a4e4129a5 100644
--- a/Flow.Launcher.Infrastructure/PinyinAlphabet.cs
+++ b/Flow.Launcher.Infrastructure/PinyinAlphabet.cs
@@ -30,6 +30,8 @@ public PinyinAlphabet()
 
         public PinyinAlphabet(Settings settings)
         {
+            ArgumentNullException.ThrowIfNull(settings);
+
             _settings = settings;
             LoadDoublePinyinTable();
 
@@ -182,6 +184,12 @@ private static void ApplyPolyphonicPhraseOverrides(string content, string[] resu
                 var index = content.IndexOf(phrase, StringComparison.Ordinal);
                 while (index >= 0)
                 {
+                    if (pinyin.Length != phrase.Length || index + pinyin.Length > resultList.Length)
+                    {
+                        index = content.IndexOf(phrase, index + phrase.Length, StringComparison.Ordinal);
+                        continue;
+                    }
+
                     for (var i = 0; i < pinyin.Length; i++)
                     {
                         resultList[index + i] = pinyin[i];