Merge pull request #43612 from sharwell/dismiss-completion

Dismiss completion in SetUpEditor

src/VisualStudio/IntegrationTest/IntegrationTests/AbstractEditorTest.cs

@@ -68,6 +68,8 @@ protected void SetUpEditor(string markupCode)
         {
             MarkupTestFile.GetPosition(markupCode, out string code, out int caretPosition);
 
+            VisualStudio.Editor.DismissCompletionSessions();
+
             var originalValue = VisualStudio.Workspace.IsPrettyListingOn(LanguageName);
 
             VisualStudio.Workspace.SetPrettyListing(LanguageName, false);

src/VisualStudio/IntegrationTest/TestUtilities/InProcess/TextViewWindow_InProc.cs

@@ -487,6 +487,13 @@ public void DismissLightBulbSession()
                 broker.DismissSession(view);
             });
 
+        public void DismissCompletionSessions()
+            => ExecuteOnActiveView(view =>
+            {
+                var broker = GetComponentModel().GetService<ICompletionBroker>();
+                broker.DismissAllSessions(view);
+            });
+
         protected abstract bool HasActiveTextView();
 
         protected abstract IWpfTextView GetActiveTextView();

src/VisualStudio/IntegrationTest/TestUtilities/OutOfProcess/Editor_OutOfProc.cs

@@ -14,6 +14,7 @@
 using Microsoft.VisualStudio.IntegrationTest.Utilities.InProcess;
 using Microsoft.VisualStudio.IntegrationTest.Utilities.Input;
 using UIAutomationClient;
+using Xunit;
 
 namespace Microsoft.VisualStudio.IntegrationTest.Utilities.OutOfProcess
 {
@@ -233,7 +234,10 @@ public bool IsUseSuggestionModeOn()
             => _editorInProc.IsUseSuggestionModeOn();
 
         public void SetUseSuggestionMode(bool value)
-            => _editorInProc.SetUseSuggestionMode(value);
+        {
+            Assert.False(IsCompletionActive());
+            _editorInProc.SetUseSuggestionMode(value);
+        }
 
         public void WaitForActiveView(string viewName)
             => _editorInProc.WaitForActiveView(viewName);

src/VisualStudio/IntegrationTest/TestUtilities/OutOfProcess/TextViewWindow_OutOfProc.cs

@@ -77,6 +77,12 @@ public bool IsLightBulbSessionExpanded()
         public void DismissLightBulbSession()
             => _textViewWindowInProc.DismissLightBulbSession();
 
+        public void DismissCompletionSessions()
+        {
+            WaitForCompletionSet();
+            _textViewWindowInProc.DismissCompletionSessions();
+        }
+
         public string[] GetLightBulbActions()
             => _textViewWindowInProc.GetLightBulbActions();