尝试修正模糊匹配检索失败的问题; 尝试修正特殊输入(新建事件等)被破坏的问题;

Author: stratosblue

src/Intellisense/IIdeographCompletion.cs

@@ -12,7 +12,7 @@ internal interface IIdeographCompletion
     /// <summary>
     /// 匹配文本
     /// </summary>
-    string? MatchText { get; }
+    string MatchText { get; }
 
     #endregion Public 属性
 }

src/Intellisense/SyncCompletion/IdeographCompletionSource.cs

@@ -51,7 +51,7 @@ public void AugmentCompletionSession(ICompletionSession session, IList<Completio
                 {
                     foreach (var completion in allCompletions)
                     {
-                        itemBuffer[bufferIndex++] = CloneCompletion(completion);
+                        itemBuffer[bufferIndex++] = completion;
                     }
 
                     var processedCompletionSet = CreateNewCompletionSet(completionSet, new ArrayBaseEnumerator<Completion>(itemBuffer, 0, bufferIndex));
@@ -86,19 +86,6 @@ private static CompletionSet CreateNewCompletionSet(CompletionSet completionSet,
         }
     }
 
-    private Completion CloneCompletion(Completion originCompletion)
-    {
-        return originCompletion switch
-        {
-            Completion4 completion4 => completion4.Suffix?.Length > 0
-                                       ? new IdeographCompletion4(displayText: completion4.DisplayText, suffix: completion4.Suffix, matchText: null, origin: completion4)
-                                       : new IdeographCompletion4(displayText: completion4.DisplayText, matchText: null, origin: completion4),
-            Completion3 completion3 => new IdeographCompletion3(displayText: completion3.DisplayText, matchText: null, origin: completion3),
-            Completion2 completion2 => new IdeographCompletion2(displayText: completion2.DisplayText, matchText: null, origin: completion2),
-            _ => new IdeographCompletion(displayText: originCompletion.DisplayText, matchText: null, origin: originCompletion),
-        };
-    }
-
     private Completion CreateCompletion(Completion originCompletion, string originInsertText, string spelling)
     {
         var displayText = FormatString(Options.SyncCompletionDisplayTextFormat, spelling, originInsertText);

src/Intellisense/SyncCompletion/IdeographCompletions.cs

@@ -27,15 +27,15 @@ internal class IdeographCompletion : Completion, IIdeographCompletion
 
     public override string InsertionText { get => _origin.InsertionText; set => _origin.InsertionText = value; }
 
-    public string? MatchText { get; }
+    public string MatchText { get; }
 
     public override PropertyCollection Properties => _origin.Properties;
 
     #endregion Public 属性
 
     #region Public 构造函数
 
-    public IdeographCompletion(string displayText, string? matchText, Completion origin)
+    public IdeographCompletion(string displayText, string matchText, Completion origin)
     {
         DisplayText = displayText;
         MatchText = matchText;
@@ -66,15 +66,15 @@ internal class IdeographCompletion2 : Completion2, IIdeographCompletion
 
     public override string InsertionText { get => _origin.InsertionText; set => _origin.InsertionText = value; }
 
-    public string? MatchText { get; }
+    public string MatchText { get; }
 
     public override PropertyCollection Properties => _origin.Properties;
 
     #endregion Public 属性
 
     #region Public 构造函数
 
-    public IdeographCompletion2(string displayText, string? matchText, Completion2 origin)
+    public IdeographCompletion2(string displayText, string matchText, Completion2 origin)
     {
         DisplayText = displayText;
         MatchText = matchText;
@@ -107,15 +107,15 @@ internal class IdeographCompletion3 : Completion3, IIdeographCompletion
 
     public override string InsertionText { get => _origin.InsertionText; set => _origin.InsertionText = value; }
 
-    public string? MatchText { get; }
+    public string MatchText { get; }
 
     public override PropertyCollection Properties => _origin.Properties;
 
     #endregion Public 属性
 
     #region Public 构造函数
 
-    public IdeographCompletion3(string displayText, string? matchText, Completion3 origin)
+    public IdeographCompletion3(string displayText, string matchText, Completion3 origin)
     {
         DisplayText = displayText;
         MatchText = matchText;
@@ -148,23 +148,23 @@ internal class IdeographCompletion4 : Completion4, IIdeographCompletion
 
     public override string InsertionText { get => _origin.InsertionText; set => _origin.InsertionText = value; }
 
-    public string? MatchText { get; }
+    public string MatchText { get; }
 
     public override PropertyCollection Properties => _origin.Properties;
 
     #endregion Public 属性
 
     #region Public 构造函数
 
-    public IdeographCompletion4(string displayText, string suffix, string? matchText, Completion4 origin)
+    public IdeographCompletion4(string displayText, string suffix, string matchText, Completion4 origin)
         : base(displayText: null, insertionText: null, description: null, iconMoniker: default, suffix: suffix)
     {
         DisplayText = displayText;
         MatchText = matchText;
         _origin = origin;
     }
 
-    public IdeographCompletion4(string displayText, string? matchText, Completion4 origin)
+    public IdeographCompletion4(string displayText, string matchText, Completion4 origin)
     {
         DisplayText = displayText;
         MatchText = matchText;

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.3.1" Language="en-US" Publisher="Stratos" />
+        <Identity Id="ChinesePinyinIntelliSenseExtender.4293B766-9575-4472-B6F0-98BD86737E0D" Version="1.3.2" Language="en-US" Publisher="Stratos" />
         <DisplayName>IntelliSense汉语拼音拓展</DisplayName>
         <Description xml:space="preserve">汉语拼音的IntelliSense拓展。(支持基于 IAsyncCompletionSource 的完成，如: C#、JS等；支持自定义字符映射；)</Description>
         <MoreInfo>https://github.com/stratosblue/chinesepinyinintellisenseextender</MoreInfo>