Simplify code.

src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/AbstractVisualBasicCompletionProviderTests.vb

@@ -40,7 +40,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
                 code As String, position As Integer,
                 expectedItemOrNull As String, expectedDescriptionOrNull As String,
                 sourceCodeKind As SourceCodeKind, usePreviousCharAsTrigger As Boolean,
-                checkForAbsence As Boolean, glyph As Integer?, matchPriority As Integer?) As Threading.Tasks.Task
+                checkForAbsence As Boolean, glyph As Integer?, matchPriority As Integer?) As Task
             ' Script/interactive support removed for now.
             ' TODO: Re-enable these when interactive is back in the product.
             If sourceCodeKind <> Microsoft.CodeAnalysis.SourceCodeKind.Regular Then
@@ -58,7 +58,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
             End If
         End Function
 
-        Protected Overrides Async Function VerifyCustomCommitProviderWorkerAsync(codeBeforeCommit As String, position As Integer, itemToCommit As String, expectedCodeAfterCommit As String, sourceCodeKind As SourceCodeKind, Optional commitChar As Char? = Nothing) As Threading.Tasks.Task
+        Protected Overrides Async Function VerifyCustomCommitProviderWorkerAsync(codeBeforeCommit As String, position As Integer, itemToCommit As String, expectedCodeAfterCommit As String, sourceCodeKind As SourceCodeKind, Optional commitChar As Char? = Nothing) As Task
             ' Script/interactive support removed for now.
             ' TODO: Re-enable these when interactive is back in the product.
             If sourceCodeKind <> Microsoft.CodeAnalysis.SourceCodeKind.Regular Then
@@ -92,7 +92,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
         End Function
 
         Protected Async Function VerifySendEnterThroughToEditorAsync(
-                initialMarkup As String, textTypedSoFar As String, expected As Boolean) As Threading.Tasks.Task
+                initialMarkup As String, textTypedSoFar As String, expected As Boolean) As Task
             Using workspace = Await TestWorkspace.CreateVisualBasicAsync(initialMarkup)
                 Dim hostDocument = workspace.DocumentWithCursor
                 Dim documentId = workspace.GetDocumentId(hostDocument)
@@ -107,7 +107,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
             End Using
         End Function
 
-        Protected Async Function TestCommonIsTextualTriggerCharacterAsync() As Threading.Tasks.Task
+        Protected Async Function TestCommonIsTextualTriggerCharacterAsync() As Task
             Dim alwaysTriggerList =
             {
                 "foo$$.",

src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/ObjectInitializerCompletionProviderTests.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis.Completion
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
 Imports Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
@@ -17,7 +16,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
                 code As String, position As Integer,
                 expectedItemOrNull As String, expectedDescriptionOrNull As String,
                 sourceCodeKind As SourceCodeKind, usePreviousCharAsTrigger As Boolean,
-                checkForAbsence As Boolean, glyph As Integer?, matchPriority As Integer?) As Threading.Tasks.Task
+                checkForAbsence As Boolean, glyph As Integer?, matchPriority As Integer?) As Task
             ' Script/interactive support removed for now.
             ' TODO: Re-enable these when interactive is back in the product.
             If sourceCodeKind <> SourceCodeKind.Regular Then
@@ -376,7 +375,7 @@ End Class
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function IsCommitCharacterTest() As Threading.Tasks.Task
+        Public Async Function IsCommitCharacterTest() As Task
             Const code = "
 Public Class C
     Public bar as Integer
@@ -419,7 +418,7 @@ End Program</Document>
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function SendEnterThroughToEditorTest() As Threading.Tasks.Task
+        Public Async Function SendEnterThroughToEditorTest() As Task
             Const code = "
 Public Class C
     Public bar as Integer

src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/OverrideCompletionProviderTests.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-Imports System.Threading
-Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.Completion
-Imports Microsoft.CodeAnalysis.Editor.UnitTests.Utilities
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
 Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.CompletionProviders
 Imports Microsoft.CodeAnalysis.VisualBasic.Completion.Providers

src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SymbolCompletionProviderTests.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis.Completion
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
 Imports Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
@@ -21,7 +20,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
 
 #Region "StandaloneNamespaceAndTypeSourceTests"
 
-        Private Async Function VerifyNSATIsAbsentAsync(markup As String) As Threading.Tasks.Task
+        Private Async Function VerifyNSATIsAbsentAsync(markup As String) As Task
             ' Verify namespace 'System' is absent
             Await VerifyItemIsAbsentAsync(markup, "System")
 
@@ -29,7 +28,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
             Await VerifyItemIsAbsentAsync(markup, "String")
         End Function
 
-        Private Async Function VerifyNSATExistsAsync(markup As String) As Threading.Tasks.Task
+        Private Async Function VerifyNSATExistsAsync(markup As String) As Task
             ' Verify namespace 'System' is absent
             Await VerifyItemExistsAsync(markup, "System")
 
@@ -694,7 +693,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
 #Region "SymbolCompletionProviderTests"
 
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function IsCommitCharacterTest() As Threading.Tasks.Task
+        Public Async Function IsCommitCharacterTest() As Task
             Const code = "
 Imports System
 Class C
@@ -707,12 +706,12 @@ End Class"
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function IsTextualTriggerCharacterTest() As Threading.Tasks.Task
+        Public Async Function IsTextualTriggerCharacterTest() As Task
             Await TestCommonIsTextualTriggerCharacterAsync()
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function SendEnterThroughToEditorTest() As Threading.Tasks.Task
+        Public Async Function SendEnterThroughToEditorTest() As Task
             Const code = "
 Imports System
 Class C
@@ -1328,7 +1327,7 @@ Class C
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function LabelAfterGoto3() As Threading.Tasks.Task
+        Public Async Function LabelAfterGoto3() As Task
             Dim test = <Text>
 Class C
     Sub M()
@@ -2596,7 +2595,7 @@ End Class
 
         <WorkItem(645898, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/645898")>
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function EscapedKeywordAttributeCommit() As Threading.Tasks.Task
+        Public Async Function EscapedKeywordAttributeCommit() As Task
             Dim markup = <Text>
 Imports System
 Class classattribute : Inherits Attribute
@@ -5222,7 +5221,7 @@ Class C
 
         <WorkItem(546802, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546802")>
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function Inherits_KeywordIdentifiersCommitEscaped() As Threading.Tasks.Task
+        Public Async Function Inherits_KeywordIdentifiersCommitEscaped() As Task
             Const markup = "
 Public Class [Inherits]
 End Class
@@ -5381,7 +5380,7 @@ Interface IFoo
 
         <WorkItem(547291, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/547291")>
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function Inherits_CommitGenericOnParen() As Threading.Tasks.Task
+        Public Async Function Inherits_CommitGenericOnParen() As Task
             Const markup = "
 Class G(Of T)
 End Class
@@ -5423,7 +5422,7 @@ End Class
 
         <WorkItem(622563, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/622563")>
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function Inherits_CommitNonGenericOnParen() As Threading.Tasks.Task
+        Public Async Function Inherits_CommitNonGenericOnParen() As Task
             Const markup = "
 Class G
 End Class
@@ -5624,7 +5623,7 @@ Class C
         <WorkItem(909121, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/909121")>
         <WorkItem(2048, "https://github.com/dotnet/roslyn/issues/2048")>
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function CommitGenericOnParen() As Threading.Tasks.Task
+        Public Async Function CommitGenericOnParen() As Task
             Dim text =
 <code>
 Class G(Of T)
@@ -5750,7 +5749,7 @@ End Module
 
         <WorkItem(925469, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/925469")>
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function CommitWithCloseBracketLeaveOpeningBracket1() As Threading.Tasks.Task
+        Public Async Function CommitWithCloseBracketLeaveOpeningBracket1() As Task
             Dim text =
 <code><![CDATA[
 Class Await
@@ -5772,7 +5771,7 @@ End Class]]></code>.Value
 
         <WorkItem(925469, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/925469")>
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function CommitWithCloseBracketLeavesOpeningBracket2() As Threading.Tasks.Task
+        Public Async Function CommitWithCloseBracketLeavesOpeningBracket2() As Task
             Dim text =
 <code><![CDATA[
 Class [Class]
@@ -6723,7 +6722,7 @@ End Class]]>
 
         <WorkItem(4405, "https://github.com/dotnet/roslyn/issues/4405")>
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function VerifyDelegateEscapedWhenCommitted() As Threading.Tasks.Task
+        Public Async Function VerifyDelegateEscapedWhenCommitted() As Task
             Dim text =
 <code><![CDATA[
 Imports System