opt: 优化同步完成的匹配规则

Author: stratosblue

src/Intellisense/SyncCompletion/IdeographCompletionCommandHandler.cs

@@ -83,14 +83,18 @@ public int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pv
                 {
                     if (completionSession.SelectedCompletionSet.SelectionStatus.IsSelected)
                     {
-                        if (isTypedWhiteSpace) //暂时取消空格输入，避免类似：输入 int 后键入空格，会插入模糊匹配的完成项
-                        {
-                            completionSession.Dismiss();
-                        }
-                        else
-                        {
-                            completionSession.Commit();
-                        }
+                        // 暂时调整了匹配逻辑，至少int可以正常输入了，开启空格输入
+                        //if (isTypedWhiteSpace) //暂时取消空格输入，避免类似：输入 int 后键入空格，会插入模糊匹配的完成项
+                        //{
+                        //    completionSession.Dismiss();
+                        //}
+                        //else
+                        //{
+                        //    completionSession.Commit();
+                        //}
+
+                        completionSession.Commit();
+
                         if (isTypedWhiteSpace || isTypedPunctuation)
                         {
                             _nextCommandHandler.Exec(ref pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);

src/Util/InputTextMatchHelper.cs

@@ -26,7 +26,7 @@ public static int CalculateMatchScore(string inputText, string matchText, out in
 
         const int InvalidSocre = -1; //无效分数
         const int InitSocreRewards = 1; //初始分数奖励
-        const int UpperMatchSocre = 5;  //大写匹配分数
+        const int SpecialMatchSocre = 5;  //特殊匹配分数 - AaaBbb 中的 B; aaa_bbb 中 _ 后的 b
 
         var currentCompletionScore = InvalidSocre;
         charsMatchedCount = 0;
@@ -55,19 +55,21 @@ public static int CalculateMatchScore(string inputText, string matchText, out in
                 }
             }
             return i == matchText.Length - 1
-                   ? i * 1000 * UpperMatchSocre
-                   : i * 100 * UpperMatchSocre;
+                   ? i * 1000 * SpecialMatchSocre
+                   : i * 100 * SpecialMatchSocre;
         }
 
         //下方逻辑是从 CompletionSet 中 copy 后改的
 
         var inputIndex = 0;
         var matchIndex = 0;
         var scoreRewards = InitSocreRewards;  //分数奖励
+        var preOriginMatchChar = char.MinValue; //上一个原始匹配字符
 
         for (; inputIndex < inputLength; inputIndex++)
         {
             var inputChar = char.ToLowerInvariant(inputText[inputIndex]);
+            preOriginMatchChar = char.MinValue;
 
             for (; matchIndex < matchLength;)
             {
@@ -87,22 +89,27 @@ public static int CalculateMatchScore(string inputText, string matchText, out in
                     continue;
                 }
 
-                if (char.IsUpper(originMatchChar))  //大写字母匹配
+                if (char.IsUpper(originMatchChar))  //当前为大写字母匹配
                 {
-                    currentCompletionScore += UpperMatchSocre + scoreRewards;
+                    if (char.IsLower(preOriginMatchChar)
+                        || char.IsPunctuation(preOriginMatchChar)) //上一个为小写或符号
+                    {
+                        currentCompletionScore += SpecialMatchSocre;
+                    }
                 }
-                else
+                else if (char.IsLower(originMatchChar))  //当前为小写字母匹配
                 {
-                    currentCompletionScore += scoreRewards;   //普通匹配
+                    if (char.IsPunctuation(preOriginMatchChar)) //上一个为符号
+                    {
+                        currentCompletionScore += SpecialMatchSocre;
+                    }
                 }
 
-                if (matchIndex == 0)    //首字母匹配
-                {
-                    currentCompletionScore += UpperMatchSocre;
-                }
+                currentCompletionScore += scoreRewards;   //普通匹配
 
                 scoreRewards++; //增加匹配分
                 charsMatchedCount++;
+                preOriginMatchChar = originMatchChar;
                 break;
             }
         }
@@ -118,6 +125,11 @@ public static int CalculateMatchScore(string inputText, string matchText, out in
                 if (charsMatchedCount == matchLength)  //完整匹配目标项
                 {
                     currentCompletionScore *= 12 * inputLength;
+                    //大小写完全匹配翻倍
+                    if (string.Equals(inputText, matchText, StringComparison.Ordinal))
+                    {
+                        currentCompletionScore *= 2;
+                    }
                 }
                 else
                 {

src/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ChinesePinyinIntelliSenseExtender.4293B766-9575-4472-B6F0-98BD86737E0D" Version="1.4.3" Language="en-US" Publisher="Stratos" />
+        <Identity Id="ChinesePinyinIntelliSenseExtender.4293B766-9575-4472-B6F0-98BD86737E0D" Version="1.4.4" Language="en-US" Publisher="Stratos" />
         <DisplayName>IntelliSense汉语拼音拓展</DisplayName>
         <Description xml:space="preserve">表意文字补全拓展(内置汉语拼音、五笔，支持自定义字符映射；)</Description>
         <MoreInfo>https://github.com/stratosblue/chinesepinyinintellisenseextender</MoreInfo>