Make methods synchronous

src/EditorFeatures/Test/CodeGeneration/CodeGenerationTests.cs

@@ -966,7 +966,7 @@ private static bool ContainsVisualBasicKeywords(string input)
             private static async Task<TestWorkspace> CreateWorkspaceFromFileAsync(string file, bool isVisualBasic, ParseOptions parseOptions, CompilationOptions compilationOptions)
             {
                 return isVisualBasic ?
-                    await TestWorkspace.CreateVisualBasicAsync(file, (VB.VisualBasicParseOptions)parseOptions, (VB.VisualBasicCompilationOptions)compilationOptions) :
+                    TestWorkspace.CreateVisualBasic(file, (VB.VisualBasicParseOptions)parseOptions, (VB.VisualBasicCompilationOptions)compilationOptions) :
                     TestWorkspace.CreateCSharp(file, (CS.CSharpParseOptions)parseOptions, (CS.CSharpCompilationOptions)compilationOptions);
             }
         }

src/EditorFeatures/Test/Diagnostics/SuppressMessageAttributeTests.cs

@@ -41,7 +41,7 @@ private static Task<TestWorkspace> CreateWorkspaceFromFileAsync(string source, s
             }
             else
             {
-                return TestWorkspace.CreateVisualBasicAsync(
+                return TestWorkspace.CreateVisualBasic(
                     source,
                     compilationOptions: new VisualBasic.VisualBasicCompilationOptions(
                         OutputKind.DynamicallyLinkedLibrary, rootNamespace: rootNamespace));

src/EditorFeatures/Test/Structure/StructureTaggerTests.cs

@@ -119,7 +119,7 @@ End Module
 #End Region
 End Namespace";
 
-            using (var workspace = await TestWorkspace.CreateVisualBasicAsync(code))
+            using (var workspace = TestWorkspace.CreateVisualBasic(code))
             {
                 var tags = await GetTagsFromWorkspaceAsync(workspace);
 
@@ -150,7 +150,7 @@ Sub Main(args As String())
     End Sub
 End Module";
 
-            using (var workspace = await TestWorkspace.CreateVisualBasicAsync(code))
+            using (var workspace = TestWorkspace.CreateVisualBasic(code))
             {
                 var tags = await GetTagsFromWorkspaceAsync(workspace);
 

src/EditorFeatures/Test/Utilities/SymbolEquivalenceComparerTests.cs

@@ -119,7 +119,7 @@ public async Task TestArraysInDifferentLanguagesAreEquivalent()
 end class";
 
             using (var csharpWorkspace = TestWorkspace.CreateCSharp(csharpCode))
-            using (var vbWorkspace = await TestWorkspace.CreateVisualBasicAsync(vbCode))
+            using (var vbWorkspace = TestWorkspace.CreateVisualBasic(vbCode))
             {
                 var csharpType = (ITypeSymbol)(await csharpWorkspace.CurrentSolution.Projects.Single().GetCompilationAsync()).GlobalNamespace.GetTypeMembers("C").Single();
                 var vbType = (await vbWorkspace.CurrentSolution.Projects.Single().GetCompilationAsync()).GlobalNamespace.GetTypeMembers("C").Single();
@@ -245,7 +245,7 @@ class Type2
     dim field2 as String;
 end class";
             using (var workspace1 = TestWorkspace.CreateCSharp(csharpCode1))
-            using (var workspace2 = await TestWorkspace.CreateVisualBasicAsync(vbCode1))
+            using (var workspace2 = TestWorkspace.CreateVisualBasic(vbCode1))
             {
                 var type1_v1 = (await workspace1.CurrentSolution.Projects.Single().GetCompilationAsync()).GlobalNamespace.GetTypeMembers("Type1").Single();
                 var type2_v1 = (await workspace1.CurrentSolution.Projects.Single().GetCompilationAsync()).GlobalNamespace.GetTypeMembers("Type2").Single();
@@ -646,7 +646,7 @@ sub Quux()
     end sub
 end class";
             using (var workspace1 = TestWorkspace.CreateCSharp(csharpCode1))
-            using (var workspace2 = await TestWorkspace.CreateVisualBasicAsync(vbCode1))
+            using (var workspace2 = TestWorkspace.CreateVisualBasic(vbCode1))
             {
                 var csharpType1 = (await workspace1.CurrentSolution.Projects.Single().GetCompilationAsync()).GlobalNamespace.GetTypeMembers("Type1").Single();
                 var vbType1 = (await workspace2.CurrentSolution.Projects.Single().GetCompilationAsync()).GlobalNamespace.GetTypeMembers("Type1").Single();
@@ -693,7 +693,7 @@ sub Bar(x as Object)
     end sub
 end class";
             using (var workspace1 = TestWorkspace.CreateCSharp(csharpCode1))
-            using (var workspace2 = await TestWorkspace.CreateVisualBasicAsync(vbCode1))
+            using (var workspace2 = TestWorkspace.CreateVisualBasic(vbCode1))
             {
                 var csharpType1 = (await workspace1.CurrentSolution.Projects.Single().GetCompilationAsync()).GlobalNamespace.GetTypeMembers("Type1").Single();
                 var vbType1 = (await workspace2.CurrentSolution.Projects.Single().GetCompilationAsync()).GlobalNamespace.GetTypeMembers("Type1").Single();
@@ -1317,8 +1317,8 @@ Sub GenericThisAndOther()
     End Sub
 End Class
 ";
-            using (var workspace1 = await TestWorkspace.CreateVisualBasicAsync(code))
-            using (var workspace2 = await TestWorkspace.CreateVisualBasicAsync(code))
+            using (var workspace1 = TestWorkspace.CreateVisualBasic(code))
+            using (var workspace2 = TestWorkspace.CreateVisualBasic(code))
             {
                 var comp1 = (await workspace1.CurrentSolution.Projects.Single().GetCompilationAsync());
                 var comp2 = (await workspace2.CurrentSolution.Projects.Single().GetCompilationAsync());

src/EditorFeatures/TestUtilities/ChangeSignature/ChangeSignatureTestState.cs

@@ -31,7 +31,7 @@ public static async Task<ChangeSignatureTestState> CreateAsync(string markup, st
         {
             var workspace = languageName == LanguageNames.CSharp
                   ? TestWorkspace.CreateCSharp(markup, exportProvider: s_exportProvider, parseOptions: (CSharpParseOptions)parseOptions)
-                  : await TestWorkspace.CreateVisualBasicAsync(markup, exportProvider: s_exportProvider, parseOptions: parseOptions, compilationOptions: new VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+                  : TestWorkspace.CreateVisualBasic(markup, exportProvider: s_exportProvider, parseOptions: parseOptions, compilationOptions: new VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
 
             return new ChangeSignatureTestState(workspace);
         }

src/EditorFeatures/TestUtilities/Diagnostics/GenerateType/GenerateTypeTestState.cs

@@ -46,7 +46,7 @@ internal sealed class GenerateTypeTestState : IDisposable
                 ? TestWorkspace.Create(initial, exportProvider: s_exportProvider)
                 : languageName == LanguageNames.CSharp
                   ? TestWorkspace.CreateCSharp(initial, exportProvider: s_exportProvider)
-                  : await TestWorkspace.CreateVisualBasicAsync(initial, exportProvider: s_exportProvider);
+                  : TestWorkspace.CreateVisualBasic(initial, exportProvider: s_exportProvider);
 
             return new GenerateTypeTestState(projectToBeModified, typeName, existingFileName, workspace);
         }

src/EditorFeatures/TestUtilities/ExtractInterface/ExtractInterfaceTestState.cs

@@ -33,7 +33,7 @@ public static async Task<ExtractInterfaceTestState> CreateAsync(string markup, s
         {
             var workspace = languageName == LanguageNames.CSharp
                 ? TestWorkspace.CreateCSharp(markup, exportProvider: ExportProvider, compilationOptions: compilationOptions as CSharpCompilationOptions)
-                : await TestWorkspace.CreateVisualBasicAsync(markup, exportProvider: ExportProvider, compilationOptions: compilationOptions);
+                : TestWorkspace.CreateVisualBasic(markup, exportProvider: ExportProvider, compilationOptions: compilationOptions);
             return new ExtractInterfaceTestState(workspace);
         }
 

src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace_Create.cs

@@ -233,17 +233,17 @@ public partial class TestWorkspace
 
         #region VB
 
-        public static Task<TestWorkspace> CreateVisualBasicAsync(
+        public static TestWorkspace CreateVisualBasic(
             string file,
             ParseOptions parseOptions = null,
             CompilationOptions compilationOptions = null,
             ExportProvider exportProvider = null,
             string[] metadataReferences = null)
         {
-            return CreateVisualBasicAsync(new[] { file }, parseOptions, compilationOptions, exportProvider, metadataReferences);
+            return CreateVisualBasic(new[] { file }, parseOptions, compilationOptions, exportProvider, metadataReferences);
         }
 
-        public static async Task<TestWorkspace> CreateVisualBasicAsync(
+        public static TestWorkspace CreateVisualBasic(
             string[] files,
             ParseOptions parseOptions = null,
             CompilationOptions compilationOptions = null,

src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb

@@ -96,7 +96,7 @@ End Class</code>
 
         Friend Overloads Async Function CreateSessionASync(code As String) As Threading.Tasks.Task(Of Holder)
             Return CreateSession(
-                Await TestWorkspace.CreateVisualBasicAsync(code),
+                TestWorkspace.CreateVisualBasic(code),
                 BraceCompletionSessionProvider.CurlyBrace.OpenCharacter, BraceCompletionSessionProvider.CurlyBrace.CloseCharacter)
         End Function
     End Class

src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb

@@ -104,7 +104,7 @@ End Class</code>
 
         Friend Overloads Async Function CreateSessionAsync(code As String) As Threading.Tasks.Task(Of Holder)
             Return CreateSession(
-                Await TestWorkspace.CreateVisualBasicAsync(code),
+                TestWorkspace.CreateVisualBasic(code),
                 BraceCompletionSessionProvider.Bracket.OpenCharacter, BraceCompletionSessionProvider.Bracket.CloseCharacter)
         End Function
     End Class

src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb

@@ -70,7 +70,7 @@ End Class</code>
 
         Friend Overloads Async Function CreateSessionAsync(code As String) As Threading.Tasks.Task(Of Holder)
             Return CreateSession(
-                Await TestWorkspace.CreateVisualBasicAsync(code),
+                TestWorkspace.CreateVisualBasic(code),
                 BraceCompletionSessionProvider.DoubleQuote.OpenCharacter, BraceCompletionSessionProvider.DoubleQuote.CloseCharacter)
         End Function
     End Class

src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb

@@ -98,7 +98,7 @@ End Class</code>
 
         Friend Overloads Async Function CreateSessionAsync(code As String) As Threading.Tasks.Task(Of Holder)
             Return CreateSession(
-                Await TestWorkspace.CreateVisualBasicAsync(code),
+                TestWorkspace.CreateVisualBasic(code),
                 BraceCompletionSessionProvider.CurlyBrace.OpenCharacter, BraceCompletionSessionProvider.CurlyBrace.CloseCharacter)
         End Function
     End Class

src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb

@@ -111,7 +111,7 @@ End Class</code>
 
         Friend Overloads Async Function CreateSessionAsync(code As String) As Threading.Tasks.Task(Of Holder)
             Return CreateSession(
-                Await TestWorkspace.CreateVisualBasicAsync(code),
+                TestWorkspace.CreateVisualBasic(code),
                 BraceCompletionSessionProvider.LessAndGreaterThan.OpenCharacter, BraceCompletionSessionProvider.LessAndGreaterThan.CloseCharacter)
         End Function
     End Class

src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLineEnderTests.vb

@@ -264,7 +264,7 @@ End Module
         End Function
 
         Protected Overrides Function CreateWorkspaceAsync(code As String) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(code)
+            Return TestWorkspace.CreateVisualBasic(code)
         End Function
     End Class
 End Namespace

src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb

@@ -355,7 +355,7 @@ End Class</code>
 
         Friend Overloads Async Function CreateSessionAsync(code As String) As Threading.Tasks.Task(Of Holder)
             Return CreateSession(
-                Await TestWorkspace.CreateVisualBasicAsync(code),
+                TestWorkspace.CreateVisualBasic(code),
                 BraceCompletionSessionProvider.Parenthesis.OpenCharacter, BraceCompletionSessionProvider.Parenthesis.CloseCharacter)
         End Function
     End Class

src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb

@@ -162,7 +162,7 @@ End Class</code>
 
         Friend Overloads Async Function CreateSessionAsync(code As String) As Threading.Tasks.Task(Of Holder)
             Return CreateSession(
-                Await TestWorkspace.CreateVisualBasicAsync(code),
+                TestWorkspace.CreateVisualBasic(code),
                 BraceCompletionSessionProvider.DoubleQuote.OpenCharacter, BraceCompletionSessionProvider.DoubleQuote.CloseCharacter)
         End Function
     End Class

src/EditorFeatures/VisualBasicTest/AutomaticEndConstructCorrection/AutomaticEndConstructCorrectorTests.vb

@@ -346,7 +346,7 @@ End Class</code>.Value
             ' do this since xml value put only vbLf
             codeWithMarker = codeWithMarker.Replace(vbLf, vbCrLf)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(codeWithMarker)
+            Using workspace = TestWorkspace.CreateVisualBasic(codeWithMarker)
                 Dim document = workspace.Documents.Single()
 
                 Dim buffer = document.TextBuffer
@@ -397,7 +397,7 @@ End Class</code>.Value
         End Function
 
         Private Async Function VerifyBeginAsync(code As String, keyword As String, Optional expected As String = Nothing) As Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(code)
+            Using workspace = TestWorkspace.CreateVisualBasic(code)
                 Dim document = workspace.Documents.Single()
 
                 Dim selectedSpans = document.SelectedSpans
@@ -410,7 +410,7 @@ End Class</code>.Value
         End Function
 
         Private Async Function VerifyEndAsync(code As String, keyword As String, Optional expected As String = Nothing) As Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(code)
+            Using workspace = TestWorkspace.CreateVisualBasic(code)
                 Dim document = workspace.Documents.Single()
 
                 Dim selectedSpans = document.SelectedSpans

src/EditorFeatures/VisualBasicTest/BraceMatching/BraceHighlightingTests.vb

@@ -35,7 +35,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.BraceMatching
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.BraceHighlighting)>
         Public Async Function TestParens() As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(
+            Using workspace = TestWorkspace.CreateVisualBasic(
 "Module Module1
     Function Foo(x As Integer) As Integer
     End Function
@@ -71,7 +71,7 @@ End Module")
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.BraceHighlighting)>
         Public Async Function TestNestedTouchingItems() As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(
+            Using workspace = TestWorkspace.CreateVisualBasic(
 "Module Module1
     <SomeAttr(New With {.name = ""test""})>  
     Sub Foo()
@@ -146,7 +146,7 @@ End Module")
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.BraceHighlighting)>
         Public Async Function TestUnnestedTouchingItems() As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(
+            Using workspace = TestWorkspace.CreateVisualBasic(
 "Module Module1
     Dim arr()() As Integer
 End Module")
@@ -186,7 +186,7 @@ End Module")
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.BraceHighlighting)>
         Public Async Function TestAngles() As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(
+            Using workspace = TestWorkspace.CreateVisualBasic(
 "Module Module1
     <Attribute()>
     Sub Foo()

src/EditorFeatures/VisualBasicTest/BraceMatching/VisualBasicBraceMatcherTests.vb

@@ -8,7 +8,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.BraceMatching
         Inherits AbstractBraceMatcherTests
 
         Protected Overrides Function CreateWorkspaceFromCodeAsync(code As String, options As ParseOptions) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(code)
+            Return TestWorkspace.CreateVisualBasic(code)
         End Function
 
         Private Async Function TestInClassAsync(code As String, expectedCode As String) As Task

src/EditorFeatures/VisualBasicTest/CaseCorrecting/CaseCorrectionServiceTests.vb

@@ -20,7 +20,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CaseCorrecting
         End Function
 
         Private Async Function TestAsync(input As String, expected As String) As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(input)
+            Using workspace = TestWorkspace.CreateVisualBasic(input)
                 Await TestAsync(expected, workspace)
             End Using
         End Function

src/EditorFeatures/VisualBasicTest/ChangeSignature/ChangeSignature_Delegates.vb

@@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
         End Function
 
         Protected Overrides Function CreateWorkspaceFromFileAsync(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(initialMarkup, parameters.parseOptions, parameters.compilationOptions)
+            Return TestWorkspace.CreateVisualBasic(initialMarkup, parameters.parseOptions, parameters.compilationOptions)
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>

src/EditorFeatures/VisualBasicTest/Classification/SemanticClassifierTests.vb

@@ -12,7 +12,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Classification
         Inherits AbstractVisualBasicClassifierTests
 
         Friend Overrides Async Function GetClassificationSpansAsync(code As String, textSpan As TextSpan) As Tasks.Task(Of IEnumerable(Of ClassifiedSpan))
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(code)
+            Using workspace = TestWorkspace.CreateVisualBasic(code)
                 Dim document = workspace.CurrentSolution.GetDocument(workspace.Documents.First().Id)
 
                 Dim service = document.GetLanguageService(Of IClassificationService)()

src/EditorFeatures/VisualBasicTest/Classification/SyntacticClassifierTests.vb

@@ -10,7 +10,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Classification
         Inherits AbstractVisualBasicClassifierTests
 
         Friend Overrides Async Function GetClassificationSpansAsync(code As String, textSpan As TextSpan) As Tasks.Task(Of IEnumerable(Of ClassifiedSpan))
-            Using Workspace = Await TestWorkspace.CreateVisualBasicAsync(code)
+            Using Workspace = TestWorkspace.CreateVisualBasic(code)
                 Dim document = Workspace.CurrentSolution.Projects.First().Documents.First()
                 Dim tree = Await document.GetSyntaxTreeAsync()
 

src/EditorFeatures/VisualBasicTest/CodeActions/AbstractVisualBasicCodeActionTest.vb

@@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
         End Function
 
         Protected Overrides Function CreateWorkspaceFromFileAsync(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(
+            Return TestWorkspace.CreateVisualBasic(
                 initialMarkup,
                 parameters.parseOptions,
                 If(parameters.compilationOptions, New VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary)))

src/EditorFeatures/VisualBasicTest/CodeActions/MoveType/BasicMoveTypeTestsBase.vb

@@ -11,7 +11,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings.M
         Inherits AbstractMoveTypeTest
 
         Protected Overrides Function CreateWorkspaceFromFileAsync(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(
+            Return TestWorkspace.CreateVisualBasic(
                 initialMarkup,
                 parameters.parseOptions,
                 If(parameters.compilationOptions, New VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary)))

src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicCommentSelectionTests.vb

@@ -75,7 +75,7 @@ End Module</code>
 
             MarkupTestFile.GetSpans(code, codeWithoutMarkup, spans)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(codeWithoutMarkup)
+            Using workspace = TestWorkspace.CreateVisualBasic(codeWithoutMarkup)
                 Dim doc = workspace.Documents.First()
                 SetupSelection(doc.GetTextView(), spans.Select(Function(s) Span.FromBounds(s.Start, s.End)))
 

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

@@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
         End Sub
 
         Protected Overrides Function CreateWorkspaceAsync(fileContents As String) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(fileContents)
+            Return TestWorkspace.CreateVisualBasic(fileContents)
         End Function
 
         Friend Overrides Function CreateCompletionService(workspace As Workspace, exclusiveProviders As ImmutableArray(Of CompletionProvider)) As CompletionServiceWithProviders
@@ -92,7 +92,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
 
         Protected Async Function VerifySendEnterThroughToEditorAsync(
                 initialMarkup As String, textTypedSoFar As String, expected As Boolean) As Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(initialMarkup)
+            Using workspace = TestWorkspace.CreateVisualBasic(initialMarkup)
                 Dim hostDocument = workspace.DocumentWithCursor
                 Dim documentId = workspace.GetDocumentId(hostDocument)
                 Dim document = workspace.CurrentSolution.GetDocument(documentId)

src/EditorFeatures/VisualBasicTest/Diagnostics/AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest.vb

@@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics
         End Function
 
         Protected Overrides Function CreateWorkspaceFromFileAsync(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(
+            Return TestWorkspace.CreateVisualBasic(
                 initialMarkup,
                 parameters.parseOptions,
                 If(parameters.compilationOptions, New VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary)))

src/EditorFeatures/VisualBasicTest/Diagnostics/DiagnosticAnalyzerDriver/DiagnosticAnalyzerDriverTests.vb

@@ -13,7 +13,7 @@ Public Class DiagnosticAnalyzerDriverTests
     Public Async Function DiagnosticAnalyzerDriverAllInOne() As Task
         Dim source = TestResource.AllInOneVisualBasicCode
         Dim analyzer = New BasicTrackingDiagnosticAnalyzer()
-        Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source)
+        Using workspace = TestWorkspace.CreateVisualBasic(source)
             Dim document = workspace.CurrentSolution.Projects.Single().Documents.Single()
             AccessSupportedDiagnostics(analyzer)
             Await DiagnosticProviderTestUtilities.GetAllDiagnosticsAsync(analyzer, document, New TextSpan(0, document.GetTextAsync().Result.Length))
@@ -36,7 +36,7 @@ End Class
 ]]></file>
 
         Dim ideEngineAnalyzer = New BasicTrackingDiagnosticAnalyzer()
-        Using ideEngineWorkspace = Await TestWorkspace.CreateVisualBasicAsync(source.Value)
+        Using ideEngineWorkspace = TestWorkspace.CreateVisualBasic(source.Value)
             Dim ideEngineDocument = ideEngineWorkspace.CurrentSolution.Projects.Single().Documents.Single()
             Await DiagnosticProviderTestUtilities.GetAllDiagnosticsAsync(ideEngineAnalyzer, ideEngineDocument, New TextSpan(0, ideEngineDocument.GetTextAsync().Result.Length))
             For Each method In methodNames
@@ -47,7 +47,7 @@ End Class
         End Using
 
         Dim compilerEngineAnalyzer = New BasicTrackingDiagnosticAnalyzer()
-        Using compilerEngineWorkspace = Await TestWorkspace.CreateVisualBasicAsync(source.Value)
+        Using compilerEngineWorkspace = TestWorkspace.CreateVisualBasic(source.Value)
             Dim compilerEngineCompilation = CType(compilerEngineWorkspace.CurrentSolution.Projects.Single().GetCompilationAsync().Result, VisualBasicCompilation)
             compilerEngineCompilation.GetAnalyzerDiagnostics({compilerEngineAnalyzer})
             For Each method In methodNames
@@ -62,7 +62,7 @@ End Class
     <WorkItem(759, "https://github.com/dotnet/roslyn/issues/759")>
     Public Async Function DiagnosticAnalyzerDriverIsSafeAgainstAnalyzerExceptions() As Task
         Dim source = TestResource.AllInOneVisualBasicCode
-        Using Workspace = Await TestWorkspace.CreateVisualBasicAsync(source)
+        Using Workspace = TestWorkspace.CreateVisualBasic(source)
             Dim document = Workspace.CurrentSolution.Projects.Single().Documents.Single()
             Await ThrowingDiagnosticAnalyzer(Of SyntaxKind).VerifyAnalyzerEngineIsSafeAgainstExceptionsAsync(
                 Async Function(analyzer) Await DiagnosticProviderTestUtilities.GetAllDiagnosticsAsync(analyzer, document, New TextSpan(0, document.GetTextAsync().Result.Length), logAnalyzerExceptionAsDiagnostics:=True))
@@ -84,7 +84,7 @@ End Class
 
     <Fact>
     Public Async Function AnalyzerOptionsArePassedToAllAnalyzers() As Task
-        Using workspace = Await TestWorkspace.CreateVisualBasicAsync(TestResource.AllInOneVisualBasicCode)
+        Using workspace = TestWorkspace.CreateVisualBasic(TestResource.AllInOneVisualBasicCode)
             Dim currentProject = workspace.CurrentSolution.Projects.Single()
             Dim additionalDocId = DocumentId.CreateNewId(currentProject.Id)
             Dim newSln = workspace.CurrentSolution.AddAdditionalDocument(additionalDocId, "add.config", SourceText.From("random text"))

src/EditorFeatures/VisualBasicTest/Diagnostics/SimplifyTypeNames/SimplifyTypeNamesTests.vb

@@ -1774,7 +1774,7 @@ End Module
 
             Await TestInRegularAndScriptAsync(source.Value, expected.Value)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source.Value)
+            Using workspace = TestWorkspace.CreateVisualBasic(source.Value)
                 Dim diagnosticAndFix = Await GetDiagnosticAndFixAsync(workspace, New TestParameters())
                 Dim span = diagnosticAndFix.Item1.Location.SourceSpan
                 Assert.NotEqual(span.Start, 0)
@@ -1823,7 +1823,7 @@ End Namespace
 
             Await TestInRegularAndScriptAsync(source.Value, expected.Value)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source.Value)
+            Using workspace = TestWorkspace.CreateVisualBasic(source.Value)
                 Dim diagnosticAndFix = Await GetDiagnosticAndFixAsync(workspace, New TestParameters())
                 Dim span = diagnosticAndFix.Item1.Location.SourceSpan
                 Assert.Equal(span.Start, expected.Value.ToString.Replace(vbLf, vbCrLf).IndexOf("new C", StringComparison.Ordinal) + 4)
@@ -1858,7 +1858,7 @@ End Module
 
             Await TestInRegularAndScriptAsync(source.Value, expected.Value)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source.Value)
+            Using workspace = TestWorkspace.CreateVisualBasic(source.Value)
                 Dim diagnosticAndFix = Await GetDiagnosticAndFixAsync(workspace, New TestParameters())
                 Dim span = diagnosticAndFix.Item1.Location.SourceSpan
                 Assert.Equal(span.Start, expected.Value.ToString.Replace(vbLf, vbCrLf).IndexOf("Console.WriteLine(""foo"")", StringComparison.Ordinal))

src/EditorFeatures/VisualBasicTest/Diagnostics/Suppression/SuppressionAllCodeTests.vb

@@ -12,7 +12,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.Suppre
         Inherits AbstractSuppressionAllCodeTests
 
         Protected Overrides Function CreateWorkspaceFromFileAsync(definition As String, parseOptions As ParseOptions) As Threading.Tasks.Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(definition, DirectCast(parseOptions, VisualBasicParseOptions))
+            Return TestWorkspace.CreateVisualBasic(definition, DirectCast(parseOptions, VisualBasicParseOptions))
         End Function
 
         Friend Overrides Function CreateDiagnosticProviderAndFixer(workspace As Workspace) As Tuple(Of Analyzer, ISuppressionFixProvider)

src/EditorFeatures/VisualBasicTest/Diagnostics/Suppression/SuppressionTests.vb

@@ -23,7 +23,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.Suppre
         End Function
 
         Protected Overrides Function CreateWorkspaceFromFileAsync(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(
+            Return TestWorkspace.CreateVisualBasic(
                 initialMarkup,
                 parameters.parseOptions,
                 If(parameters.compilationOptions, New VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary)))

src/EditorFeatures/VisualBasicTest/DocumentationComments/DocumentationCommentTests.vb

@@ -1203,7 +1203,7 @@ End Class
         End Function
 
         Protected Overrides Function CreateTestWorkspaceAsync(code As String) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(code)
+            Return TestWorkspace.CreateVisualBasic(code)
         End Function
 
         Protected Overrides ReadOnly Property DocumentationCommentCharacter As Char

src/EditorFeatures/VisualBasicTest/DocumentationComments/XmlTagCompletionTests.vb

@@ -16,7 +16,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.DocumentationComme
         End Function
 
         Protected Overrides Function CreateTestWorkspaceAsync(initialMarkup As String) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(initialMarkup)
+            Return TestWorkspace.CreateVisualBasic(initialMarkup)
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.XmlTagCompletion)>

src/EditorFeatures/VisualBasicTest/EditAndContinue/VisualBasicEditAndContinueAnalyzerTests.vb

@@ -433,7 +433,7 @@ End Class
 "
             Dim analyzer = New VisualBasicEditAndContinueAnalyzer()
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source1)
+            Using workspace = TestWorkspace.CreateVisualBasic(source1)
                 Dim documentId = workspace.CurrentSolution.Projects.First().Documents.First().Id
                 Dim oldSolution = workspace.CurrentSolution
                 Dim newSolution = workspace.CurrentSolution.WithDocumentText(documentId, SourceText.From(source2))
@@ -477,7 +477,7 @@ End Class
 "
 
             Dim analyzer = New VisualBasicEditAndContinueAnalyzer()
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source)
+            Using workspace = TestWorkspace.CreateVisualBasic(source)
                 Dim document = workspace.CurrentSolution.Projects.First().Documents.First()
                 Dim baseActiveStatements = ImmutableArray.Create(Of ActiveStatementSpan)()
                 Dim result = Await analyzer.AnalyzeDocumentAsync(workspace.CurrentSolution, baseActiveStatements, document, Nothing)
@@ -506,7 +506,7 @@ End Class
 "
 
             Dim analyzer = New VisualBasicEditAndContinueAnalyzer()
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source1)
+            Using workspace = TestWorkspace.CreateVisualBasic(source1)
                 Dim documentId = workspace.CurrentSolution.Projects.First().Documents.First().Id
                 Dim oldSolution = workspace.CurrentSolution
                 Dim newSolution = workspace.CurrentSolution.WithDocumentText(documentId, SourceText.From(source2))
@@ -532,7 +532,7 @@ End Class
 "
 
             Dim analyzer = New VisualBasicEditAndContinueAnalyzer()
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source)
+            Using workspace = TestWorkspace.CreateVisualBasic(source)
                 Dim document = workspace.CurrentSolution.Projects.First().Documents.First()
                 Dim baseActiveStatements = ImmutableArray.Create(Of ActiveStatementSpan)()
                 Dim result = Await analyzer.AnalyzeDocumentAsync(workspace.CurrentSolution, baseActiveStatements, document, Nothing)
@@ -563,7 +563,7 @@ End Class
 "
 
             Dim analyzer = New VisualBasicEditAndContinueAnalyzer()
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source1)
+            Using workspace = TestWorkspace.CreateVisualBasic(source1)
                 Dim documentId = workspace.CurrentSolution.Projects.First().Documents.First().Id
                 Dim oldSolution = workspace.CurrentSolution
                 Dim newSolution = workspace.CurrentSolution.WithDocumentText(documentId, SourceText.From(source2))
@@ -614,7 +614,7 @@ End Class
 "
             Dim analyzer = New VisualBasicEditAndContinueAnalyzer()
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source1)
+            Using workspace = TestWorkspace.CreateVisualBasic(source1)
                 ' fork the solution to introduce a change
                 Dim project = workspace.CurrentSolution.Projects.Single()
                 Dim newDocId = Microsoft.CodeAnalysis.DocumentId.CreateNewId(project.Id)

src/EditorFeatures/VisualBasicTest/EncapsulateField/EncapsulateFieldTestState.vb

@@ -30,7 +30,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EncapsulateField
         End Sub
 
         Public Shared Async Function CreateAsync(markup As String) As System.Threading.Tasks.Task(Of EncapsulateFieldTestState)
-            Dim workspace = Await TestWorkspace.CreateVisualBasicAsync(markup, exportProvider:=s_exportProvider)
+            Dim workspace = TestWorkspace.CreateVisualBasic(markup, exportProvider:=s_exportProvider)
             Return New EncapsulateFieldTestState(workspace)
         End Function
 

src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructTestingHelpers.vb

@@ -47,7 +47,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EndConstructGenera
                                            endCaretPos As Integer()) As Tasks.Task
             Dim caretPos = before.IndexOf("$$", StringComparison.Ordinal)
             Dim beforeText = before.Replace("$$", "")
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(beforeText, exportProvider:=DisabledLineCommitExportProvider)
+            Using workspace = TestWorkspace.CreateVisualBasic(beforeText, exportProvider:=DisabledLineCommitExportProvider)
                 DisableLineCommit(workspace)
 
                 Dim view = workspace.Documents.First().GetTextView()
@@ -76,7 +76,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EndConstructGenera
                                   beforeCaret As Integer(),
                                   after As String,
                                   afterCaret As Integer()) As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(before, exportProvider:=DisabledLineCommitExportProvider)
+            Using workspace = TestWorkspace.CreateVisualBasic(before, exportProvider:=DisabledLineCommitExportProvider)
                 DisableLineCommit(workspace)
 
                 Dim textView = workspace.Documents.First().GetTextView()
@@ -126,7 +126,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EndConstructGenera
         Private Async Function VerifyNotAppliedAsync(doFunc As Func(Of VisualBasicEndConstructService, ITextView, ITextBuffer, Boolean),
                                      text As String,
                                      caret As Integer()) As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(text)
+            Using workspace = TestWorkspace.CreateVisualBasic(text)
                 Dim textView = workspace.Documents.First().GetTextView()
                 Dim subjectBuffer = workspace.Documents.First().GetTextBuffer()
 
@@ -219,7 +219,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EndConstructGenera
             afterCaret As Integer()) As Tasks.Task
 
             ' create separate composition
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(before, exportProvider:=DisabledLineCommitExportProvider)
+            Using workspace = TestWorkspace.CreateVisualBasic(before, exportProvider:=DisabledLineCommitExportProvider)
                 DisableLineCommit(workspace)
 
                 Dim view = workspace.Documents.First().GetTextView()

src/EditorFeatures/VisualBasicTest/EndConstructGeneration/MiscellaneousTests.vb

@@ -125,7 +125,7 @@ End Class",
         <WpfFact, Trait(Traits.Feature, Traits.Features.EndConstructGeneration)>
         <WorkItem(539727, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539727")>
         Public Async Function DeletesSelectedText() As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync("Interface IFoo ~~")
+            Using workspace = TestWorkspace.CreateVisualBasic("Interface IFoo ~~")
                 Dim textView = workspace.Documents.Single().GetTextView()
                 Dim subjectBuffer = workspace.Documents.First().GetTextBuffer()
 

src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.vb

@@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ExtractMethod
             Dim textSpan As TextSpan
             MarkupTestFile.GetSpan(codeWithMarker.NormalizedValue, codeWithoutMarker, textSpan)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(codeWithoutMarker)
+            Using workspace = TestWorkspace.CreateVisualBasic(codeWithoutMarker)
                 Dim treeAfterExtractMethod = Await ExtractMethodAsync(workspace, workspace.Documents.First(), textSpan, succeeded:=False, dontPutOutOrRefOnStruct:=dontPutOutOrRefOnStruct)
             End Using
         End Function
@@ -29,7 +29,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ExtractMethod
             Dim textSpan As TextSpan
             MarkupTestFile.GetSpan(codeWithMarker.NormalizedValue, codeWithoutMarker, textSpan)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(codeWithoutMarker)
+            Using workspace = TestWorkspace.CreateVisualBasic(codeWithoutMarker)
                 Assert.NotNull(Await Record.ExceptionAsync(Async Function()
                                                                Dim tree = Await ExtractMethodAsync(workspace, workspace.Documents.First(), textSpan)
                                                            End Function))
@@ -48,7 +48,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ExtractMethod
 
             Dim metadataReferences = If(metadataReference Is Nothing, Array.Empty(Of String)(), New String() {metadataReference})
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(New String() {codeWithMarker}, metadataReferences:=metadataReferences, compilationOptions:=New VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
+            Using workspace = TestWorkspace.CreateVisualBasic(New String() {codeWithMarker}, metadataReferences:=metadataReferences, compilationOptions:=New VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
 
                 Dim document = workspace.Documents.First()
                 Dim subjectBuffer = document.TextBuffer
@@ -126,7 +126,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ExtractMethod
 
             MarkupTestFile.GetSpans(codeWithMarker.NormalizedValue, codeWithoutMarker, namedSpans)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(codeWithoutMarker)
+            Using workspace = TestWorkspace.CreateVisualBasic(codeWithoutMarker)
                 Dim document = workspace.CurrentSolution.GetDocument(workspace.Documents.First().Id)
                 Assert.NotNull(document)
 
@@ -157,7 +157,7 @@ End Class</text>
         End Function
 
         Private Shared Async Function IterateAllAsync(code As String) As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(code)
+            Using workspace = TestWorkspace.CreateVisualBasic(code)
                 Dim document = workspace.CurrentSolution.GetDocument(workspace.Documents.First().Id)
                 Assert.NotNull(document)
 

src/EditorFeatures/VisualBasicTest/Formatting/FormattingTestBase.vb

@@ -13,7 +13,7 @@ Imports Roslyn.Test.EditorUtilities
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Formatting
     Public Class FormattingTestBase
         Protected Async Function AssertFormatSpanAsync(content As String, expected As String, Optional baseIndentation As Integer? = Nothing, Optional span As TextSpan = Nothing) As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(content)
+            Using workspace = TestWorkspace.CreateVisualBasic(content)
                 Dim hostdoc = workspace.Documents.First()
 
                 ' get original buffer

src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb

@@ -2825,7 +2825,7 @@ End Class
 
         Private Shared Async Function AssertSmartIndentIndentationInProjectionAsync(markup As String,
                                                                     expectedIndentation As Integer) As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(markup)
+            Using workspace = TestWorkspace.CreateVisualBasic(markup)
                 Dim subjectDocument = workspace.Documents.Single()
                 Dim projectedDocument = workspace.CreateProjectionBufferDocument(s_htmlMarkup, workspace.Documents, LanguageNames.CSharp)
 
@@ -2874,7 +2874,7 @@ End Class
 
         ''' <param name="indentationLine">0-based. The line number in code to get indentation for.</param>
         Private Shared Async Function AssertSmartIndentAsync(code As String, indentationLine As Integer, expectedIndentation As Integer?, Optional indentStyle As FormattingOptions.IndentStyle = FormattingOptions.IndentStyle.Smart) As Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(code)
+            Using workspace = TestWorkspace.CreateVisualBasic(code)
                 Dim buffer = workspace.Documents.First().GetTextBuffer()
 
                 SetIndentStyle(buffer, indentStyle)

src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartTokenFormatter_FormatTokenTests.vb

@@ -174,7 +174,7 @@ End Class
             Dim position As Integer = 0
             MarkupTestFile.GetPosition(codeWithMarkup, code, position)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(code)
+            Using workspace = TestWorkspace.CreateVisualBasic(code)
                 Dim hostdoc = workspace.Documents.First()
                 Dim buffer = hostdoc.GetTextBuffer()
 

src/EditorFeatures/VisualBasicTest/KeywordHighlighting/AbstractVisualBasicKeywordHighlighterTests.vb

@@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.KeywordHighlightin
         End Function
 
         Protected Overrides Function CreateWorkspaceFromFileAsync(code As String, options As ParseOptions) As Threading.Tasks.Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(code, DirectCast(options, ParseOptions))
+            Return TestWorkspace.CreateVisualBasic(code, DirectCast(options, ParseOptions))
         End Function
     End Class
 End Namespace

src/EditorFeatures/VisualBasicTest/LineSeparators/LineSeparatorTests.vb

@@ -284,7 +284,7 @@ End Class")
         End Function
 
         Private Async Function GetSpansForAsync(content As String) As Tasks.Task(Of IEnumerable(Of TextSpan))
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(content)
+            Using workspace = TestWorkspace.CreateVisualBasic(content)
                 Dim document = workspace.CurrentSolution.GetDocument(workspace.Documents.First().Id)
                 Dim spans = Await New VisualBasicLineSeparatorService().GetLineSeparatorsAsync(document,
                     (Await document.GetSyntaxRootAsync()).FullSpan)

src/EditorFeatures/VisualBasicTest/NavigateTo/NavigateToTests.vb

@@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.NavigateTo
         Protected Overrides ReadOnly Property Language As String = "vb"
 
         Protected Overrides Function CreateWorkspace(content As String, exportProvider As ExportProvider) As Task(Of TestWorkspace)
-            Return TestWorkspace.CreateVisualBasicAsync(content, exportProvider:=exportProvider)
+            Return TestWorkspace.CreateVisualBasic(content, exportProvider:=exportProvider)
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.NavigateTo)>

src/EditorFeatures/VisualBasicTest/Organizing/AbstractOrganizerTests.vb

@@ -10,7 +10,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Organizing
     Public MustInherit Class AbstractOrganizerTests
 
         Protected Async Function CheckAsync(initial As XElement, final As XElement) As System.Threading.Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(initial.NormalizedValue)
+            Using workspace = TestWorkspace.CreateVisualBasic(initial.NormalizedValue)
                 Dim document = workspace.CurrentSolution.GetDocument(workspace.Documents.First().Id)
                 Dim newRoot = Await (Await OrganizingService.OrganizeAsync(document)).GetSyntaxRootAsync()
                 Assert.Equal(final.NormalizedValue, newRoot.ToFullString())

src/EditorFeatures/VisualBasicTest/Organizing/OrganizeImportsTests.vb

@@ -10,7 +10,7 @@ Imports Microsoft.CodeAnalysis.OrganizeImports
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Organizing
     Public Class OrganizeImportsTests
         Private Async Function CheckAsync(initial As XElement, final As XElement, Optional placeSystemNamespaceFirst As Boolean = False) As Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(initial.NormalizedValue)
+            Using workspace = TestWorkspace.CreateVisualBasic(initial.NormalizedValue)
                 Dim document = workspace.CurrentSolution.GetDocument(workspace.Documents.First().Id)
                 workspace.Options = workspace.Options.WithChangedOption(New OptionKey(GenerationOptions.PlaceSystemNamespaceFirst, document.Project.Language), placeSystemNamespaceFirst)
                 Dim newRoot = Await (Await OrganizeImportsService.OrganizeImportsAsync(document)).GetSyntaxRootAsync()

src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb

@@ -74,7 +74,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.QuickInfo
             Dim position As Integer = Nothing
             MarkupTestFile.GetPosition(markup, code, position)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(code, Nothing, metadataReferences:=metadataReferences)
+            Using workspace = TestWorkspace.CreateVisualBasic(code, Nothing, metadataReferences:=metadataReferences)
                 Await TestSharedAsync(workspace, position, expectedResults)
             End Using
         End Function

src/EditorFeatures/VisualBasicTest/Squiggles/ErrorSquiggleProducerTests.vb

@@ -19,13 +19,13 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Squiggles
         Private _producer As New DiagnosticTagProducer(Of IErrorTag)
 
         Private Async Function ProduceSquiggles(content As String) As Task(Of ImmutableArray(Of ITagSpan(Of IErrorTag)))
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(content)
+            Using workspace = TestWorkspace.CreateVisualBasic(content)
                 Return (Await _producer.GetDiagnosticsAndErrorSpans(workspace)).Item2
             End Using
         End Function
 
         Private Async Function ProduceSquiggles(analyzerMap As Dictionary(Of String, DiagnosticAnalyzer()), content As String) As Task(Of ImmutableArray(Of ITagSpan(Of IErrorTag)))
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(content)
+            Using workspace = TestWorkspace.CreateVisualBasic(content)
                 Return (Await _producer.GetDiagnosticsAndErrorSpans(workspace, analyzerMap)).Item2
             End Using
         End Function
@@ -99,7 +99,7 @@ End Class"
                         New VisualBasicRemoveUnnecessaryImportsDiagnosticAnalyzer()
                     })
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(content)
+            Using workspace = TestWorkspace.CreateVisualBasic(content)
                 Dim options As New Dictionary(Of OptionKey, Object)
                 Dim language = workspace.Projects.Single().Language
                 Dim preferIntrinsicPredefinedTypeOption = New OptionKey(CodeStyleOptions.PreferIntrinsicPredefinedTypeKeywordInDeclaration, language)

src/EditorFeatures/VisualBasicTest/TextStructureNavigation/TextStructureNavigatorTests.vb

@@ -227,7 +227,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.TextStructureNavig
             start As Integer,
             length As Integer) As Task
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(code)
+            Using workspace = TestWorkspace.CreateVisualBasic(code)
                 Dim buffer = workspace.Documents.First().GetTextBuffer()
 
                 Dim provider = New TextStructureNavigatorProvider(

src/EditorFeatures/VisualBasicTest/TodoComment/TodoCommentTests.vb

@@ -172,7 +172,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.TodoComment
             Dim list As IList(Of TextSpan) = Nothing
             MarkupTestFile.GetSpans(codeWithMarker.NormalizedValue, code, list)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(code)
+            Using workspace = TestWorkspace.CreateVisualBasic(code)
                 Dim commentTokens = New TodoCommentTokens()
                 Dim provider = New TodoCommentIncrementalAnalyzerProvider(commentTokens)
                 Dim worker = DirectCast(provider.CreateIncrementalAnalyzer(workspace), TodoCommentIncrementalAnalyzer)

src/VisualStudio/Core/Test.Next/Services/VisualStudioDiagnosticAnalyzerExecutorTests.cs

@@ -184,7 +184,7 @@ private async Task<TestWorkspace> CreateWorkspaceAsync(string language, string c
         {
             var workspace = (language == LanguageNames.CSharp) ?
                 TestWorkspace.CreateCSharp(code, parseOptions: options, exportProvider: TestHostServices.SharedExportProvider) :
-                await TestWorkspace.CreateVisualBasicAsync(code, parseOptions: options, exportProvider: TestHostServices.SharedExportProvider);
+                TestWorkspace.CreateVisualBasic(code, parseOptions: options, exportProvider: TestHostServices.SharedExportProvider);
 
             workspace.Options = workspace.Options.WithChangedOption(RemoteHostOptions.RemoteHostTest, true)
                                      .WithChangedOption(ServiceFeatureOnOffOptions.ClosedFileDiagnostic, LanguageNames.CSharp, true)

src/VisualStudio/Core/Test/Debugging/DataTipInfoGetterTests.vb

@@ -45,7 +45,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.UnitTests.Debuggin
         End Function
 
         Private Async Function TestSpanGetterAsync(parsedInput As String, position As Integer, continuation As Func(Of Document, Integer, Task)) As Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(parsedInput)
+            Using workspace = TestWorkspace.CreateVisualBasic(parsedInput)
                 Dim debugInfo = New VisualBasicLanguageDebugInfoService()
                 Await continuation(workspace.CurrentSolution.Projects.First.Documents.First, position)
             End Using

src/VisualStudio/Core/Test/Debugging/ProximityExpressionsGetterTests.vb

@@ -33,7 +33,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.UnitTests.Debuggin
         ''' </summary>
         Public Async Function GenerateBaselineAsync() As Task
             Dim text = Resources.ProximityExpressionsGetterTestFile
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(text)
+            Using workspace = TestWorkspace.CreateVisualBasic(text)
                 Dim languageDebugInfo = New VisualBasicLanguageDebugInfoService()
 
                 Dim hostdoc = workspace.Documents.First()
@@ -132,7 +132,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.UnitTests.Debuggin
 
         Private Async Function TestProximityExpressionsGetterAsync(markup As String,
                                                    continuation As Func(Of VisualBasicProximityExpressionsService, Document, Integer, Task)) As Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(markup)
+            Using workspace = TestWorkspace.CreateVisualBasic(markup)
                 Dim testDocument = workspace.Documents.Single()
                 Dim snapshot = testDocument.TextBuffer.CurrentSnapshot
                 Dim caretPosition = testDocument.CursorPosition.Value
@@ -213,7 +213,7 @@ End Module</text>.Value, "local", True)
             Dim caretPosition As Integer
             MarkupTestFile.GetPosition(input, parsedInput, caretPosition)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(parsedInput)
+            Using workspace = TestWorkspace.CreateVisualBasic(parsedInput)
                 Dim service = New VisualBasicProximityExpressionsService()
                 Dim hostdoc = workspace.Documents.First()
                 Dim snapshot = hostdoc.TextBuffer.CurrentSnapshot

src/VisualStudio/Core/Test/Debugging/VisualBasicBreakpointResolutionServiceTests.vb

@@ -21,7 +21,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.UnitTests.Debuggin
             Dim source As String = Nothing
             MarkupTestFile.GetPositionAndSpan(markup.NormalizedValue, source, position, expectedSpan)
 
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(source)
+            Using workspace = TestWorkspace.CreateVisualBasic(source)
                 Dim document = workspace.CurrentSolution.Projects.First.Documents.First
                 Dim result As BreakpointResolutionResult = Await VisualBasicBreakpointResolutionService.GetBreakpointAsync(document, position.Value, length, CancellationToken.None)
                 Assert.True(expectedSpan.Value = result.TextSpan,

src/VisualStudio/Core/Test/Diagnostics/DefaultDiagnosticUpdateSourceTests.vb

@@ -238,7 +238,7 @@ class 123 { }
 Class 123
 End Class
                        </code>
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(code.Value)
+            Using workspace = TestWorkspace.CreateVisualBasic(code.Value)
                 Dim miscService = New DefaultDiagnosticAnalyzerService(New MockDiagnosticUpdateSourceRegistrationService())
 
                 DiagnosticProvider.Enable(workspace, DiagnosticProvider.Options.Syntax)

src/VisualStudio/Core/Test/Help/HelpTests.vb

@@ -10,7 +10,7 @@ Imports Roslyn.Utilities
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Help
     Public Class HelpTests
         Public Async Function TestAsync(markup As String, expected As String) As Tasks.Task
-            Using workspace = Await TestWorkspace.CreateVisualBasicAsync(markup)
+            Using workspace = TestWorkspace.CreateVisualBasic(markup)
                 Dim caret = workspace.Documents.First().CursorPosition
                 Dim service = New VisualBasicHelpContextService()
                 Assert.Equal(expected, Await service.GetHelpTermAsync(workspace.CurrentSolution.Projects.First().Documents.First(), workspace.Documents.First().SelectedSpans.First(), CancellationToken.None))