Merge pull request #34740 from dotnet/merges/dev16.1-preview1-to-master

Merge dev16.1-preview1 to master

src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpIntelliSense.cs

@@ -270,7 +270,23 @@ void Main(string[] args)
                 'M',
                 Shift(VirtualKey.Enter));
 
-            VisualStudio.Editor.Verify.TextContains(@"
+            if (LegacyCompletionCondition.Instance.ShouldSkip)
+            {
+                // Async completion commits the item and inserts a blank line
+                VisualStudio.Editor.Verify.TextContains(@"
+class Class1
+{
+    void Main(string[] args)
+    {
+        Main
+$$
+    }
+}",
+assertCaretPosition: true);
+            }
+            else
+            {
+                VisualStudio.Editor.Verify.TextContains(@"
 class Class1
 {
     void Main(string[] args)
@@ -279,6 +295,7 @@ void Main(string[] args)
     }
 }",
 assertCaretPosition: true);
+            }
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.Completion)]
@@ -299,7 +316,23 @@ void Main(string[] args)
                 'M',
                 Shift(VirtualKey.Enter));
 
-            VisualStudio.Editor.Verify.TextContains(@"
+            if (LegacyCompletionCondition.Instance.ShouldSkip)
+            {
+                // Async completion commits the item (even in suggestion mode) and inserts a blank line
+                VisualStudio.Editor.Verify.TextContains(@"
+class Class1
+{
+    void Main(string[] args)
+    {
+        Main
+$$
+    }
+}",
+assertCaretPosition: true);
+            }
+            else
+            {
+                VisualStudio.Editor.Verify.TextContains(@"
 class Class1
 {
     void Main(string[] args)
@@ -309,6 +342,7 @@ void Main(string[] args)
     }
 }",
 assertCaretPosition: true);
+            }
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.Completion)]