feedback

src/EditorFeatures/Core/DocumentationComments/CopilotGenerateDocumentationCommentProvider.cs

@@ -27,11 +27,8 @@ namespace Microsoft.CodeAnalysis.DocumentationComments
     internal class CopilotGenerateDocumentationCommentProvider : SuggestionProviderBase
     {
         private SuggestionManagerBase? _suggestionManager;
-        private VisualStudio.Threading.IAsyncDisposable? _intellicodeLineCompletionsDisposable;
         private readonly ICopilotCodeAnalysisService _copilotService;
 
-        internal SuggestionSessionBase? _suggestionSession;
-
         public readonly IThreadingContext ThreadingContext;
 
         public bool Enabled => _enabled && (_suggestionManager != null);
@@ -67,7 +64,7 @@ public async Task GenerateDocumentationProposalAsync(DocumentationCommentSnippet
 
             // Do not do IntelliCode line completions if we're about to generate a documentation comment
             // so that won't have interfering grey text.
-            _intellicodeLineCompletionsDisposable = await _suggestionManager!.DisableProviderAsync(SuggestionServiceNames.IntelliCodeLineCompletions, cancellationToken).ConfigureAwait(false);
+            var intellicodeLineCompletionsDisposable = await _suggestionManager!.DisableProviderAsync(SuggestionServiceNames.IntelliCodeLineCompletions, cancellationToken).ConfigureAwait(false);
 
             var proposalEdits = await GetProposedEditsAsync(snippetProposal, _copilotService, oldSnapshot, snippet.IndentText, cancellationToken).ConfigureAwait(false);
 
@@ -78,9 +75,10 @@ public async Task GenerateDocumentationProposalAsync(DocumentationCommentSnippet
                 return;
             }
 
-            var suggestion = new DocumentationCommentSuggestion(this, proposal);
+            var suggestion = new DocumentationCommentSuggestion(this, proposal, _suggestionManager, intellicodeLineCompletionsDisposable);
 
-            var session = this._suggestionSession = await (_suggestionManager.TryDisplaySuggestionAsync(suggestion, cancellationToken)).ConfigureAwait(false);
+            var session = await suggestion.GetSuggestionSessionAsync(cancellationToken).ConfigureAwait(false);
+            //var session = this._suggestionSession = await (_suggestionManager.TryDisplaySuggestionAsync(suggestion, cancellationToken)).ConfigureAwait(false);
 
             if (session != null)
             {
@@ -290,26 +288,6 @@ private async Task<bool> TryDisplaySuggestionAsync(SuggestionSessionBase session
             return false;
         }
 
-        public async Task ClearSuggestionAsync(ReasonForDismiss reason, CancellationToken cancellationToken)
-        {
-            if (_suggestionSession != null)
-            {
-                await _suggestionSession.DismissAsync(reason, cancellationToken).ConfigureAwait(false);
-            }
-
-            _suggestionSession = null;
-            await DisposeAsync().ConfigureAwait(false);
-        }
-
-        public async Task DisposeAsync()
-        {
-            if (_intellicodeLineCompletionsDisposable != null)
-            {
-                await _intellicodeLineCompletionsDisposable.DisposeAsync().ConfigureAwait(false);
-                _intellicodeLineCompletionsDisposable = null;
-            }
-        }
-
         public override Task EnabledAsync(CancellationToken cancel)
         {
             _enabled = true;

src/EditorFeatures/Core/DocumentationComments/DocumentationCommentSuggestion.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
@@ -11,24 +12,31 @@
 
 namespace Microsoft.CodeAnalysis.DocumentationComments
 {
-    internal class DocumentationCommentSuggestion(CopilotGenerateDocumentationCommentProvider providerInstance, ProposalBase proposal) : SuggestionBase
+    internal class DocumentationCommentSuggestion(CopilotGenerateDocumentationCommentProvider providerInstance, ProposalBase proposal,
+        SuggestionManagerBase suggestionManager, VisualStudio.Threading.IAsyncDisposable? intellicodeLineCompletionsDisposable) : SuggestionBase
     {
         public ProposalBase Proposal { get; } = proposal;
 
+        public SuggestionManagerBase SuggestionManager { get; } = suggestionManager;
+
+        public VisualStudio.Threading.IAsyncDisposable? IntellicodeLineCompletionsDisposable { get; set; } = intellicodeLineCompletionsDisposable;
+
         public override TipStyle TipStyle => TipStyle.AlwaysShowTip;
 
         public override EditDisplayStyle EditStyle => EditDisplayStyle.GrayText;
 
         public override bool HasMultipleSuggestions => false;
 
         public override event PropertyChangedEventHandler? PropertyChanged;
 
+        private SuggestionSessionBase? _suggestionSession;
+
         public override async Task OnAcceptedAsync(SuggestionSessionBase session, ProposalBase originalProposal, ProposalBase currentProposal, ReasonForAccept reason, CancellationToken cancel)
         {
             var threadingContext = providerInstance.ThreadingContext;
 
             await threadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(cancel);
-            await providerInstance.DisposeAsync().ConfigureAwait(false);
+            await DisposeAsync().ConfigureAwait(false);
         }
 
         public override Task OnChangeProposalAsync(SuggestionSessionBase session, ProposalBase originalProposal, ProposalBase currentProposal, bool forward, CancellationToken cancel)
@@ -42,7 +50,7 @@
             if (threadingContext != null)
             {
                 await threadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(cancel);
-                await providerInstance.ClearSuggestionAsync(reason, cancel).ConfigureAwait(false);
+                await ClearSuggestionAsync(reason, cancel).ConfigureAwait(false);
             }
         }
 
@@ -55,5 +63,30 @@
 
             return Task.CompletedTask;
         }
+
+        public async Task<SuggestionSessionBase?> GetSuggestionSessionAsync(CancellationToken cancellationToken)
+        {
+            return _suggestionSession = await SuggestionManager.TryDisplaySuggestionAsync(this, cancellationToken).ConfigureAwait(false);
+        }
+
+        private async Task ClearSuggestionAsync(ReasonForDismiss reason, CancellationToken cancellationToken)
+        {
+            if (_suggestionSession != null)
+            {
+                await _suggestionSession.DismissAsync(reason, cancellationToken).ConfigureAwait(false);
+            }
+
+            _suggestionSession = null;
+            await DisposeAsync().ConfigureAwait(false);
+        }
+
+        private async Task DisposeAsync()
+        {
+            if (IntellicodeLineCompletionsDisposable != null)
+            {
+                await IntellicodeLineCompletionsDisposable.DisposeAsync().ConfigureAwait(false);
+                IntellicodeLineCompletionsDisposable = null;
+            }
+        }
     }
 }