IdeographAsyncCompletionItemManagerProvider现在未启用时不再自行查找IAsyncCompletionItemManager，以避免其它体验受影响

Author: stratosblue

src/Intellisense/AsyncCompletion/IdeographAsyncCompletionItemManagerProvider.cs

@@ -1,7 +1,6 @@
 #nullable enable
 
 using System.ComponentModel.Composition;
-using System.Threading;
 using ChinesePinyinIntelliSenseExtender.Options;
 using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
 using Microsoft.VisualStudio.Text.Editor;
@@ -21,53 +20,23 @@ internal class IdeographAsyncCompletionItemManagerProvider(IPatternMatcherFactor
 {
     #region Private 字段
 
-    /// <summary>
-    /// 递归标记
-    /// </summary>
-    private static readonly AsyncLocal<bool> s_completionItemManagerProviderRecursionTag = new();
-
     private static IdeographAsyncCompletionItemManager? s_instance;
 
-    [ImportMany]
-    private readonly Lazy<IAsyncCompletionItemManagerProvider>[] _lazyIAsyncCompletionItemManagerProviders = null!;
-
     private readonly IPatternMatcherFactory _patternMatcherFactory = patternMatcherFactory ?? throw new ArgumentNullException(nameof(patternMatcherFactory));
 
     #endregion Private 字段
 
     #region Public 方法
 
-    public IAsyncCompletionItemManager GetOrCreate(ITextView textView)
+    public IAsyncCompletionItemManager? GetOrCreate(ITextView textView)
     {
-        if (s_completionItemManagerProviderRecursionTag.Value)
-        {
-            return null!;
-        }
-
         var options = GeneralOptions.Instance;
 
         //非实验模式不使用 IdeographAsyncCompletionItemManager
         if (!options.Enable
             || options.AsyncCompletionMode != AsyncCompletionMode.Experimental)
         {
-            try
-            {
-                s_completionItemManagerProviderRecursionTag.Value = true;
-
-                foreach (var provider in _lazyIAsyncCompletionItemManagerProviders)
-                {
-                    if (provider.Value.GetOrCreate(textView) is IAsyncCompletionItemManager asyncCompletionItemManager)
-                    {
-                        return asyncCompletionItemManager;
-                    }
-                }
-                //返回null应该是没问题的
-                return null!;
-            }
-            finally
-            {
-                s_completionItemManagerProviderRecursionTag.Value = false;
-            }
+            return null;
         }
 
         return s_instance ??= new IdeographAsyncCompletionItemManager(options, _patternMatcherFactory);

src/Intellisense/AsyncCompletion/IdeographAsyncCompletionSourceProvider.cs

@@ -2,10 +2,8 @@
 
 using System.ComponentModel.Composition;
 using System.Diagnostics;
-using System.Threading;
 using ChinesePinyinIntelliSenseExtender.Options;
 using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
-using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion.Data;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;
@@ -41,7 +39,7 @@ protected override IAsyncCompletionSource CreateCompletionSource(ITextView depen
         if (!Options.Enable
             || Options.AsyncCompletionMode == AsyncCompletionMode.Experimental)
         {
-            return EmptyAsyncCompletionSource.Instance;
+            return null!;
         }
 
         var currentContentType = dependence.TextBuffer.ContentType;
@@ -63,7 +61,7 @@ protected override IAsyncCompletionSource CreateCompletionSource(ITextView depen
         Debug.WriteLine($"Total {otherAsyncCompletionSources?.Count ?? 0} IAsyncCompletionSource found.");
 
         IAsyncCompletionSource completionSource = otherAsyncCompletionSources is null || otherAsyncCompletionSources.Count == 0
-                                                  ? EmptyAsyncCompletionSource.Instance
+                                                  ? null!
                                                   : new IdeographAsyncCompletionSource(otherAsyncCompletionSources!, Options);
 
         return completionSource;
@@ -80,31 +78,8 @@ protected override IAsyncCompletionSource CreateCompletionSource(ITextView depen
 
     protected override IAsyncCompletionSource GetDefaultCompletionSource(ITextView dependence)
     {
-        return EmptyAsyncCompletionSource.Instance;
+        return null!;
     }
 
     #endregion Protected 方法
-
-    #region Private 类
-
-    private sealed class EmptyAsyncCompletionSource : IAsyncCompletionSource
-    {
-        #region Public 属性
-
-        public static EmptyAsyncCompletionSource Instance { get; } = new();
-
-        #endregion Public 属性
-
-        #region Public 方法
-
-        public Task<CompletionContext> GetCompletionContextAsync(IAsyncCompletionSession session, CompletionTrigger trigger, SnapshotPoint triggerLocation, SnapshotSpan applicableToSpan, CancellationToken token) => Task.FromResult<CompletionContext>(null!);
-
-        public Task<object> GetDescriptionAsync(IAsyncCompletionSession session, CompletionItem item, CancellationToken token) => Task.FromResult<object>(null!);
-
-        public CompletionStartData InitializeCompletion(CompletionTrigger trigger, SnapshotPoint triggerLocation, CancellationToken token) => CompletionStartData.DoesNotParticipateInCompletion;
-
-        #endregion Public 方法
-    }
-
-    #endregion Private 类
 }

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.0" Language="en-US" Publisher="Stratos" />
+        <Identity Id="ChinesePinyinIntelliSenseExtender.4293B766-9575-4472-B6F0-98BD86737E0D" Version="1.4.1" Language="en-US" Publisher="Stratos" />
         <DisplayName>IntelliSense汉语拼音拓展</DisplayName>
         <Description xml:space="preserve">表意文字补全拓展(内置汉语拼音、五笔，支持自定义字符映射；)</Description>
         <MoreInfo>https://github.com/stratosblue/chinesepinyinintellisenseextender</MoreInfo>