Make methods synchronous

src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticLineEnderTests.cs

@@ -837,10 +837,8 @@ void Method()
 }");
         }
 
-        protected override Task<TestWorkspace> CreateWorkspaceAsync(string code)
-        {
-            return TestWorkspace.CreateCSharp(code);
-        }
+        protected override async Task<TestWorkspace> CreateWorkspaceAsync(string code)
+            => TestWorkspace.CreateCSharp(code);
 
         protected override Action CreateNextHandler(TestWorkspace workspace)
         {

src/EditorFeatures/CSharpTest/BlockCommentEditing/BlockCommentEditingTests.cs

@@ -677,7 +677,8 @@ public async Task InsertOnMiddleLine5_Tab()
             await VerifyTabsAsync(code, expected);
         }
 
-        protected override Task<TestWorkspace> CreateTestWorkspaceAsync(string initialMarkup) => TestWorkspace.CreateCSharp(initialMarkup);
+        protected override async Task<TestWorkspace> CreateTestWorkspaceAsync(string initialMarkup)
+            => TestWorkspace.CreateCSharp(initialMarkup);
 
         internal override ICommandHandler<ReturnKeyCommandArgs> CreateCommandHandler(ITextUndoHistoryRegistry undoHistoryRegistry, IEditorOperationsFactoryService editorOperationsFactoryService)
             => new BlockCommentEditingCommandHandler(undoHistoryRegistry, editorOperationsFactoryService);

src/EditorFeatures/CSharpTest/BraceHighlighting/BraceHighlightingTests.cs

@@ -11,10 +11,8 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.BraceHighlighting
 {
     public class BraceHighlightingTests : AbstractBraceHighlightingTests
     {
-        protected override Task<TestWorkspace> CreateWorkspaceAsync(string markup, ParseOptions options)
-        {
-            return TestWorkspace.CreateCSharp(markup, parseOptions: options);
-        }
+        protected override async Task<TestWorkspace> CreateWorkspaceAsync(string markup, ParseOptions options)
+            => TestWorkspace.CreateCSharp(markup, parseOptions: options);
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.BraceHighlighting)]
         public async Task TestCurlies()

src/EditorFeatures/CSharpTest/BraceMatching/CSharpBraceMatcherTests.cs

@@ -11,10 +11,8 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.BraceMatching
 {
     public class CSharpBraceMatcherTests : AbstractBraceMatcherTests
     {
-        protected override Task<TestWorkspace> CreateWorkspaceFromCodeAsync(string code, ParseOptions options)
-        {
-            return TestWorkspace.CreateCSharp(code, options);
-        }
+        protected override async Task<TestWorkspace> CreateWorkspaceFromCodeAsync(string code, ParseOptions options)
+            => TestWorkspace.CreateCSharp(code, options);
 
         [Fact, Trait(Traits.Feature, Traits.Features.BraceMatching)]
         public async Task TestEmptyFile()

src/EditorFeatures/CSharpTest/ChangeSignature/ChangeSignature_Delegates.cs

@@ -20,7 +20,7 @@ protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspa
         protected override string GetLanguage()
             => LanguageNames.CSharp;
 
-        protected override Task<TestWorkspace> CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
+        protected override TestWorkspace CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
             => TestWorkspace.CreateCSharp(initialMarkup, parameters.parseOptions, parameters.compilationOptions);
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]

src/EditorFeatures/CSharpTest/CodeActions/AbstractCSharpCodeActionTest.cs

@@ -12,7 +12,7 @@ public abstract class AbstractCSharpCodeActionTest : AbstractCodeActionTest
 
         protected override string GetLanguage() => LanguageNames.CSharp;
 
-        protected override Task<TestWorkspace> CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
+        protected override TestWorkspace CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
             => TestWorkspace.CreateCSharp(initialMarkup, parameters.parseOptions, parameters.compilationOptions);
     }
 }
\ No newline at end of file

src/EditorFeatures/CSharpTest/CodeActions/Preview/PreviewExceptionTests.cs

@@ -22,7 +22,7 @@ public partial class PreviewTests
         [WpfFact]
         public async Task TestExceptionInComputePreview()
         {
-            using (var workspace = await CreateWorkspaceFromFile("class D {}", new TestParameters()))
+            using (var workspace = CreateWorkspaceFromFile("class D {}", new TestParameters()))
             {
                 await GetPreview(workspace, new ErrorCases.ExceptionInCodeAction());
             }
@@ -31,7 +31,7 @@ public async Task TestExceptionInComputePreview()
         [Fact]
         public async Task TestExceptionInDisplayText()
         {
-            using (var workspace = await CreateWorkspaceFromFile("class D {}", new TestParameters()))
+            using (var workspace = CreateWorkspaceFromFile("class D {}", new TestParameters()))
             {
                 DisplayText(workspace, new ErrorCases.ExceptionInCodeAction());
             }
@@ -40,7 +40,7 @@ public async Task TestExceptionInDisplayText()
         [WpfFact]
         public async Task TestExceptionInActionSets()
         {
-            using (var workspace = await CreateWorkspaceFromFile("class D {}", new TestParameters()))
+            using (var workspace = CreateWorkspaceFromFile("class D {}", new TestParameters()))
             {
                 await ActionSets(workspace, new ErrorCases.ExceptionInCodeAction());
             }

src/EditorFeatures/CSharpTest/Completion/CompletionProviders/AbstractCSharpCompletionProviderTests.cs

@@ -18,10 +18,8 @@ protected AbstractCSharpCompletionProviderTests(CSharpTestWorkspaceFixture works
         {
         }
 
-        protected override Task<TestWorkspace> CreateWorkspaceAsync(string fileContents)
-        {
-            return TestWorkspace.CreateCSharp(fileContents);
-        }
+        protected override async Task<TestWorkspace> CreateWorkspaceAsync(string fileContents)
+            => TestWorkspace.CreateCSharp(fileContents);
 
         internal override CompletionServiceWithProviders CreateCompletionService(
             Workspace workspace, ImmutableArray<CompletionProvider> exclusiveProviders)

src/EditorFeatures/CSharpTest/Diagnostics/AbstractCSharpDiagnosticProviderBasedUserDiagnosticTest.cs

@@ -12,7 +12,7 @@ public abstract class AbstractCSharpDiagnosticProviderBasedUserDiagnosticTest :
 
         protected override string GetLanguage() => LanguageNames.CSharp;
 
-        protected override Task<TestWorkspace> CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
+        protected override TestWorkspace CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
             => TestWorkspace.CreateCSharp(initialMarkup, parameters.parseOptions, parameters.compilationOptions);
     }
 }
\ No newline at end of file

src/EditorFeatures/CSharpTest/Diagnostics/AddUsing/AddUsingTests_NuGet.cs

@@ -29,9 +29,9 @@ public class NuGet : AddUsingTests
             private static readonly ImmutableArray<PackageSource> NugetPackageSources =
                 ImmutableArray.Create(new PackageSource(NugetOrgSource, "http://nuget.org/"));
 
-            protected override async Task<TestWorkspace> CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
+            protected override TestWorkspace CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
             {
-                var workspace = await base.CreateWorkspaceFromFile(initialMarkup, parameters);
+                var workspace = base.CreateWorkspaceFromFile(initialMarkup, parameters);
                 workspace.Options = workspace.Options
                     .WithChangedOption(SymbolSearchOptions.SuggestForTypesInNuGetPackages, LanguageNames.CSharp, true)
                     .WithChangedOption(SymbolSearchOptions.SuggestForTypesInReferenceAssemblies, LanguageNames.CSharp, true);

src/EditorFeatures/CSharpTest/Diagnostics/Suppression/SuppressionAllCodeTests.cs

@@ -15,10 +15,8 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics.Suppression
 {
     public class CSharpSuppressionAllCodeTests : AbstractSuppressionAllCodeTests
     {
-        protected override Task<TestWorkspace> CreateWorkspaceFromFileAsync(string definition, ParseOptions parseOptions)
-        {
-            return TestWorkspace.CreateCSharp(definition, (CSharpParseOptions)parseOptions);
-        }
+        protected override async Task<TestWorkspace> CreateWorkspaceFromFileAsync(string definition, ParseOptions parseOptions)
+            => TestWorkspace.CreateCSharp(definition, (CSharpParseOptions)parseOptions);
 
         internal override Tuple<Analyzer, ISuppressionFixProvider> CreateDiagnosticProviderAndFixer(Workspace workspace)
         {

src/EditorFeatures/CSharpTest/Diagnostics/Suppression/SuppressionTests.cs

@@ -30,7 +30,7 @@ public abstract partial class CSharpSuppressionTests : AbstractSuppressionDiagno
 
         protected override string GetLanguage() => LanguageNames.CSharp;
 
-        protected override Task<TestWorkspace> CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
+        protected override TestWorkspace CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
             => TestWorkspace.CreateCSharp(initialMarkup, parameters.parseOptions, parameters.compilationOptions);
 
         #region "Pragma disable tests"

src/EditorFeatures/CSharpTest/DocumentationComments/DocumentationCommentTests.cs

@@ -1891,9 +1891,7 @@ protected override char DocumentationCommentCharacter
             return new DocumentationCommentCommandHandler(waitIndicator, undoHistoryRegistry, editorOperationsFactoryService);
         }
 
-        protected override Task<TestWorkspace> CreateTestWorkspaceAsync(string code)
-        {
-            return TestWorkspace.CreateCSharp(code);
-        }
+        protected override async Task<TestWorkspace> CreateTestWorkspaceAsync(string code)
+            => TestWorkspace.CreateCSharp(code);
     }
 }
\ No newline at end of file

src/EditorFeatures/CSharpTest/DocumentationComments/XmlTagCompletionTests.cs

@@ -256,7 +256,7 @@ internal override ICommandHandler<TypeCharCommandArgs> CreateCommandHandler(ITex
             return new XmlTagCompletionCommandHandler(undoHistory, TestWaitIndicator.Default);
         }
 
-        protected override Task<TestWorkspace> CreateTestWorkspaceAsync(string initialMarkup)
+        protected override async Task<TestWorkspace> CreateTestWorkspaceAsync(string initialMarkup)
         {
             return TestWorkspace.CreateCSharp(initialMarkup);
         }

src/EditorFeatures/CSharpTest/Interactive/NavigateTo/InteractiveNavigateToTests.cs

@@ -25,7 +25,7 @@ public class InteractiveNavigateToTests : AbstractNavigateToTests
     {
         protected override string Language => "csharp";
 
-        protected override Task<TestWorkspace> CreateWorkspace(string content, ExportProvider exportProvider)
+        protected override async Task<TestWorkspace> CreateWorkspace(string content, ExportProvider exportProvider)
             => TestWorkspace.CreateCSharp(content, parseOptions: Options.Script);
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.NavigateTo)]

src/EditorFeatures/CSharpTest/KeywordHighlighting/AbstractCSharpKeywordHighlighterTests.cs

@@ -11,10 +11,8 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.KeywordHighlighting
     public abstract class AbstractCSharpKeywordHighlighterTests
         : AbstractKeywordHighlighterTests
     {
-        protected override Task<TestWorkspace> CreateWorkspaceFromFileAsync(string code, ParseOptions options)
-        {
-            return TestWorkspace.CreateCSharp(code, (CSharpParseOptions)options);
-        }
+        protected override async Task<TestWorkspace> CreateWorkspaceFromFileAsync(string code, ParseOptions options)
+            => TestWorkspace.CreateCSharp(code, (CSharpParseOptions)options);
 
         protected override IEnumerable<ParseOptions> GetOptions()
         {

src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs

@@ -22,7 +22,7 @@ public class NavigateToTests : AbstractNavigateToTests
     {
         protected override string Language => "csharp";
 
-        protected override Task<TestWorkspace> CreateWorkspace(string content, ExportProvider exportProvider)
+        protected override async Task<TestWorkspace> CreateWorkspace(string content, ExportProvider exportProvider)
             => TestWorkspace.CreateCSharp(content, exportProvider: exportProvider);
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.NavigateTo)]

src/EditorFeatures/Test/Diagnostics/SuppressMessageAttributeTests.cs

@@ -33,7 +33,7 @@ protected override async Task VerifyAsync(string source, string language, Diagno
             }
         }
 
-        private static Task<TestWorkspace> CreateWorkspaceFromFileAsync(string source, string language, string rootNamespace)
+        private static async Task<TestWorkspace> CreateWorkspaceFromFileAsync(string source, string language, string rootNamespace)
         {
             if (language == LanguageNames.CSharp)
             {

src/EditorFeatures/Test/LinkedFiles/LinkedFileDiffMergingEditorTests.cs

@@ -73,7 +73,7 @@ public async Task TestWorkspaceTryApplyChangesDirectCall()
             }
         }
 
-        protected override Task<TestWorkspace> CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
+        protected override TestWorkspace CreateWorkspaceFromFile(string initialMarkup, TestParameters parameters)
         {
             throw new NotSupportedException();
         }

src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLineEnderTests.vb

@@ -263,7 +263,7 @@ End Module
                    End Sub
         End Function
 
-        Protected Overrides Function CreateWorkspaceAsync(code As String) As Task(Of TestWorkspace)
+        Protected Overrides Async Function CreateWorkspaceAsync(code As String) As Task(Of TestWorkspace)
             Return TestWorkspace.CreateVisualBasic(code)
         End Function
     End Class

src/EditorFeatures/VisualBasicTest/BraceMatching/VisualBasicBraceMatcherTests.vb

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

src/EditorFeatures/VisualBasicTest/ChangeSignature/ChangeSignature_Delegates.vb

@@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
             Return New ChangeSignatureCodeRefactoringProvider()
         End Function
 
-        Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
+        Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As TestWorkspace
             Return TestWorkspace.CreateVisualBasic(initialMarkup, parameters.parseOptions, parameters.compilationOptions)
         End Function
 

src/EditorFeatures/VisualBasicTest/CodeActions/AbstractVisualBasicCodeActionTest.vb

@@ -16,7 +16,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
             Return TestOptions.Script
         End Function
 
-        Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
+        Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As TestWorkspace
             Return TestWorkspace.CreateVisualBasic(
                 initialMarkup,
                 parameters.parseOptions,

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

@@ -10,7 +10,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings.M
     Public Class BasicMoveTypeTestsBase
         Inherits AbstractMoveTypeTest
 
-        Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
+        Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As TestWorkspace
             Return TestWorkspace.CreateVisualBasic(
                 initialMarkup,
                 parameters.parseOptions,

src/EditorFeatures/VisualBasicTest/CodeActions/Preview/PreviewTests.vb

@@ -79,7 +79,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
         <WpfFact(Skip:="https://github.com/dotnet/roslyn/issues/14421")>
         Public Async Function TestPickTheRightPreview_NoPreference() As Task
             Dim parameters As New TestParameters()
-            Using workspace = Await CreateWorkspaceFromFile("Class D : End Class", parameters)
+            Using workspace = CreateWorkspaceFromFile("Class D : End Class", parameters)
                 Dim document As Document = Nothing
                 Dim previews As SolutionPreviewResult = Nothing
                 GetMainDocumentAndPreviews(parameters, workspace, document, previews)

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

@@ -16,7 +16,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet
             MyBase.New(workspaceFixture)
         End Sub
 
-        Protected Overrides Function CreateWorkspaceAsync(fileContents As String) As Task(Of TestWorkspace)
+        Protected Overrides Async Function CreateWorkspaceAsync(fileContents As String) As Task(Of TestWorkspace)
             Return TestWorkspace.CreateVisualBasic(fileContents)
         End Function
 

src/EditorFeatures/VisualBasicTest/Diagnostics/AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest.vb

@@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics
             Return TestOptions.Script
         End Function
 
-        Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
+        Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As TestWorkspace
             Return TestWorkspace.CreateVisualBasic(
                 initialMarkup,
                 parameters.parseOptions,

src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests_NuGet.vb

@@ -22,8 +22,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeActions.AddImp
             Private Shared ReadOnly NugetPackageSources As ImmutableArray(Of PackageSource) =
                 ImmutableArray.Create(New PackageSource(NugetOrgSource, "http://nuget.org"))
 
-            Protected Overrides Async Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
-                Dim workspace = Await MyBase.CreateWorkspaceFromFile(initialMarkup, parameters)
+            Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As TestWorkspace
+                Dim workspace = MyBase.CreateWorkspaceFromFile(initialMarkup, parameters)
                 workspace.Options = workspace.Options.
                     WithChangedOption(SymbolSearchOptions.SuggestForTypesInNuGetPackages, LanguageNames.VisualBasic, True).
                     WithChangedOption(SymbolSearchOptions.SuggestForTypesInReferenceAssemblies, LanguageNames.VisualBasic, True)

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

@@ -2313,7 +2313,7 @@ End Module
 </Code>
 
             Dim parameters As New TestParameters()
-            Using workspace = Await CreateWorkspaceFromFile(source, parameters)
+            Using workspace = CreateWorkspaceFromFile(source, parameters)
                 Dim diagnostics = (Await GetDiagnosticsAsync(workspace, parameters)).Where(Function(d) d.Id = IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId)
                 Assert.Equal(1, diagnostics.Count)
             End Using
@@ -2329,7 +2329,7 @@ End Module
 </Code>
 
             Dim parameters2 As New TestParameters()
-            Using workspace = Await CreateWorkspaceFromFile(source, parameters2)
+            Using workspace = CreateWorkspaceFromFile(source, parameters2)
                 workspace.ApplyOptions(PreferIntrinsicPredefinedTypeEverywhere())
                 Dim diagnostics = (Await GetDiagnosticsAsync(workspace, parameters2)).Where(Function(d) d.Id = IDEDiagnosticIds.PreferIntrinsicPredefinedTypeInDeclarationsDiagnosticId)
                 Assert.Equal(1, diagnostics.Count)
@@ -2347,7 +2347,7 @@ End Module
 </Code>
 
             Dim parameters3 As New TestParameters()
-            Using workspace = Await CreateWorkspaceFromFile(source, parameters3)
+            Using workspace = CreateWorkspaceFromFile(source, parameters3)
                 Dim diagnostics = (Await GetDiagnosticsAsync(workspace, parameters3)).Where(Function(d) d.Id = IDEDiagnosticIds.RemoveQualificationDiagnosticId)
                 Assert.Equal(1, diagnostics.Count)
             End Using

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

@@ -11,7 +11,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.Suppre
     Public Class VisualBasicSuppressionAllCodeTests
         Inherits AbstractSuppressionAllCodeTests
 
-        Protected Overrides Function CreateWorkspaceFromFileAsync(definition As String, parseOptions As ParseOptions) As Threading.Tasks.Task(Of TestWorkspace)
+        Protected Overrides Async Function CreateWorkspaceFromFileAsync(definition As String, parseOptions As ParseOptions) As Threading.Tasks.Task(Of TestWorkspace)
             Return TestWorkspace.CreateVisualBasic(definition, DirectCast(parseOptions, VisualBasicParseOptions))
         End Function
 

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

@@ -22,7 +22,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.Suppre
             Return TestOptions.Script
         End Function
 
-        Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As Task(Of TestWorkspace)
+        Protected Overrides Function CreateWorkspaceFromFile(initialMarkup As String, parameters As TestParameters) As TestWorkspace
             Return TestWorkspace.CreateVisualBasic(
                 initialMarkup,
                 parameters.parseOptions,

src/EditorFeatures/VisualBasicTest/DocumentationComments/DocumentationCommentTests.vb

@@ -1202,7 +1202,7 @@ End Class
             Return New DocumentationCommentCommandHandler(waitIndicator, undoHistoryRegistry, editorOperationsFactoryService)
         End Function
 
-        Protected Overrides Function CreateTestWorkspaceAsync(code As String) As Task(Of TestWorkspace)
+        Protected Overrides Async Function CreateTestWorkspaceAsync(code As String) As Task(Of TestWorkspace)
             Return TestWorkspace.CreateVisualBasic(code)
         End Function
 

src/EditorFeatures/VisualBasicTest/DocumentationComments/XmlTagCompletionTests.vb

@@ -15,7 +15,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.DocumentationComme
             Return New XmlTagCompletionCommandHandler(undoHistory, TestWaitIndicator.Default)
         End Function
 
-        Protected Overrides Function CreateTestWorkspaceAsync(initialMarkup As String) As Task(Of TestWorkspace)
+        Protected Overrides Async Function CreateTestWorkspaceAsync(initialMarkup As String) As Task(Of TestWorkspace)
             Return TestWorkspace.CreateVisualBasic(initialMarkup)
         End Function
 

src/EditorFeatures/VisualBasicTest/KeywordHighlighting/AbstractVisualBasicKeywordHighlighterTests.vb

@@ -17,8 +17,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.KeywordHighlightin
             Return TestAsync(element.NormalizedValue)
         End Function
 
-        Protected Overrides Function CreateWorkspaceFromFileAsync(code As String, options As ParseOptions) As Threading.Tasks.Task(Of TestWorkspace)
+        Protected Overrides Async Function CreateWorkspaceFromFileAsync(code As String, options As ParseOptions) As Threading.Tasks.Task(Of TestWorkspace)
             Return TestWorkspace.CreateVisualBasic(code, DirectCast(options, ParseOptions))
         End Function
     End Class
-End Namespace
+End Namespace
\ No newline at end of file

src/EditorFeatures/VisualBasicTest/NavigateTo/NavigateToTests.vb

@@ -12,7 +12,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)
+        Protected Overrides Async Function CreateWorkspace(content As String, exportProvider As ExportProvider) As Task(Of TestWorkspace)
             Return TestWorkspace.CreateVisualBasic(content, exportProvider:=exportProvider)
         End Function
 

src/VisualStudio/CSharp/Test/CodeModel/AbstractFileCodeElementTests.cs

@@ -15,18 +15,16 @@ namespace Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.CodeModel
     /// </summary>
     public abstract class AbstractFileCodeElementTests : IDisposable
     {
-        private readonly Task<Tuple<TestWorkspace, FileCodeModel>> _task;
+        private readonly Tuple<TestWorkspace, FileCodeModel> _workspaceAndCodeModel;
 
         protected async Task<TestWorkspace> GetWorkspaceAsync()
         {
-            var tuple = await _task;
-            return tuple.Item1;
+            return _workspaceAndCodeModel.Item1;
         }
 
         protected async Task<FileCodeModel> GetCodeModelAsync()
         {
-            var tuple = await _task;
-            return tuple.Item2;
+            return _workspaceAndCodeModel.Item2;
         }
 
         protected async Task<Microsoft.CodeAnalysis.Solution> GetCurrentSolutionAsync()
@@ -46,13 +44,11 @@ protected async Task<Microsoft.CodeAnalysis.Document> GetCurrentDocumentAsync()
 
         public AbstractFileCodeElementTests(string contents)
         {
-            _task = CreateWorkspaceAndFileCodeModelAsync(contents);
+            _workspaceAndCodeModel = CreateWorkspaceAndFileCodeModelAsync(contents);
         }
 
-        protected static Task<Tuple<TestWorkspace, EnvDTE.FileCodeModel>> CreateWorkspaceAndFileCodeModelAsync(string file)
-        {
-            return FileCodeModelTestHelpers.CreateWorkspaceAndFileCodeModelAsync(file);
-        }
+        protected static Tuple<TestWorkspace, EnvDTE.FileCodeModel> CreateWorkspaceAndFileCodeModelAsync(string file)
+            => FileCodeModelTestHelpers.CreateWorkspaceAndFileCodeModel(file);
 
         protected async Task<CodeElement> GetCodeElementAsync(params object[] path)
         {

src/VisualStudio/CSharp/Test/CodeModel/FileCodeModelTestHelpers.cs

@@ -20,7 +20,7 @@ internal static class FileCodeModelTestHelpers
         // finalizer complaining we didn't clean it up. Catching AVs is of course not safe, but this is balancing
         // "probably not crash" as an improvement over "will crash when the finalizer throws."
         [HandleProcessCorruptedStateExceptions]
-        public static async Task<Tuple<TestWorkspace, EnvDTE.FileCodeModel>> CreateWorkspaceAndFileCodeModelAsync(string file)
+        public static Tuple<TestWorkspace, EnvDTE.FileCodeModel> CreateWorkspaceAndFileCodeModel(string file)
         {
             var workspace = TestWorkspace.CreateCSharp(file, exportProvider: VisualStudioTestExportProvider.ExportProvider);
 

src/VisualStudio/CSharp/Test/Options/OptionViewModelTests.cs

@@ -43,7 +43,7 @@ public OptionViewModelTests()
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.Options)]
-        public async Task TestCheckBox()
+        public void TestCheckBox()
         {
             using (var workspace = TestWorkspace.CreateCSharp(""))
             {
@@ -69,7 +69,7 @@ public async Task TestCheckBox()
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.Options)]
-        public async Task TestOptionLoading()
+        public void TestOptionLoading()
         {
             using (var workspace = TestWorkspace.CreateCSharp(""))
             {
@@ -86,7 +86,7 @@ public async Task TestOptionLoading()
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.Options)]
-        public async Task TestOptionSaving()
+        public void TestOptionSaving()
         {
             using (var workspace = TestWorkspace.CreateCSharp(""))
             {

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

@@ -40,7 +40,7 @@ void Method()
     }
 }";
 
-            using (var workspace = await CreateWorkspaceAsync(LanguageNames.CSharp, code))
+            using (var workspace = CreateWorkspace(LanguageNames.CSharp, code))
             {
                 var analyzerType = typeof(CSharpUseExplicitTypeDiagnosticAnalyzer);
                 var analyzerResult = await AnalyzeAsync(workspace, workspace.CurrentSolution.ProjectIds.First(), analyzerType);
@@ -66,7 +66,7 @@ Sub Method()
     End Sub
 End Class";
 
-            using (var workspace = await CreateWorkspaceAsync(LanguageNames.VisualBasic, code))
+            using (var workspace = CreateWorkspace(LanguageNames.VisualBasic, code))
             {
                 // set option
                 workspace.Options = workspace.Options.WithChangedOption(CodeStyleOptions.PreferNullPropagation, LanguageNames.VisualBasic, new CodeStyleOption<bool>(false, NotificationOption.None));
@@ -90,7 +90,7 @@ public async Task TestCancellation()
         {
             var code = @"class Test { void Method() { } }";
 
-            using (var workspace = await CreateWorkspaceAsync(LanguageNames.CSharp, code))
+            using (var workspace = CreateWorkspace(LanguageNames.CSharp, code))
             {
                 var analyzerType = typeof(MyAnalyzer);
 
@@ -132,7 +132,7 @@ void Method()
     }
 }";
 
-            using (var workspace = await CreateWorkspaceAsync(LanguageNames.CSharp, code))
+            using (var workspace = CreateWorkspace(LanguageNames.CSharp, code))
             {
                 var analyzerType = typeof(CSharpUseExplicitTypeDiagnosticAnalyzer);
                 var analyzerReference = new AnalyzerFileReference(analyzerType.Assembly.Location, new TestAnalyzerAssemblyLoader());
@@ -180,7 +180,7 @@ private static async Task<DiagnosticAnalysisResult> AnalyzeAsync(TestWorkspace w
             return result.AnalysisResult[analyzerDriver.Analyzers[0]];
         }
 
-        private async Task<TestWorkspace> CreateWorkspaceAsync(string language, string code, ParseOptions options = null)
+        private TestWorkspace CreateWorkspace(string language, string code, ParseOptions options = null)
         {
             var workspace = (language == LanguageNames.CSharp) ?
                 TestWorkspace.CreateCSharp(code, parseOptions: options, exportProvider: TestHostServices.SharedExportProvider) :

src/VisualStudio/Core/Test/CodeModel/MethodXML/MethodXMLTests_CSAssignments.vb

@@ -942,7 +942,7 @@ public class C
 
         <WorkItem(831374, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/831374")>
         <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModelMethodXml)>
-        Public Async Function TestCSAssignments_TypeConfluence() As Task
+        Public Sub TestCSAssignments_TypeConfluence()
             Dim definition =
     <Workspace>
         <Project Language="C#" CommonReferences="true">
@@ -974,11 +974,11 @@ class C
 </Block>
 
             Test(definition, expected)
-        End Function
+        End Sub
 
         <WorkItem(887584, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/887584")>
         <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModelMethodXml)>
-        Public Async Function TestCSAssignments_EscapedNames() As Task
+        Public Sub TestCSAssignments_EscapedNames()
             Dim definition =
     <Workspace>
         <Project Language="C#" CommonReferences="true">
@@ -1030,11 +1030,11 @@ class C
 </Block>
 
             Test(definition, expected)
-        End Function
+        End Sub
 
         <WorkItem(1126037, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1126037")>
         <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModelMethodXml)>
-        Public Async Function TestCSAssignments_ControlChar() As Task
+        Public Sub TestCSAssignments_ControlChar()
             Dim definition =
     <Workspace>
         <Project Language="C#" CommonReferences="true">
@@ -1081,11 +1081,11 @@ class C
 </Block>
 
             Test(definition, expected)
-        End Function
+        End Sub
 
         <WorkItem(4312, "https://github.com/dotnet/roslyn/issues/4312")>
         <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModelMethodXml)>
-        Public Async Function TestCSAssignments_PropertyAssignedWithEmptyArray() As Task
+        Public Sub TestCSAssignments_PropertyAssignedWithEmptyArray()
             Dim definition =
     <Workspace>
         <Project Language="C#" CommonReferences="true">
@@ -1141,11 +1141,11 @@ class C
 </Block>
 
             Test(definition, expected)
-        End Function
+        End Sub
 
         <WorkItem(4149, "https://github.com/dotnet/roslyn/issues/4149")>
         <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModelMethodXml)>
-        Public Async Function TestCSAssignments_RoundTrippedDoubles() As Task
+        Public Sub TestCSAssignments_RoundTrippedDoubles()
             Dim definition =
     <Workspace>
         <Project Language="C#" CommonReferences="true">
@@ -1175,7 +1175,7 @@ class C
 </Block>
 
             Test(definition, expected)
-        End Function
+        End Sub
 
         <WorkItem(4149, "https://github.com/dotnet/roslyn/issues/4149")>
         <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModelMethodXml)>

src/VisualStudio/Core/Test/CodeModel/VisualBasic/CodeImportTests.vb

@@ -201,17 +201,17 @@ Imports System, $$S = System.Linq
 #Region "FullName tests"
 
         <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
-        Public Async Function TestFullName1() As Task
+        Public Sub TestFullName1()
             Dim code =
 <Code>
 Imports $$System
 </Code>
 
-            Await Assert.ThrowsAsync(Of NotImplementedException)(
-                Function()
+            Assert.Throws(Of NotImplementedException)(
+                Sub()
                     TestFullName(code, "System")
-                End Function)
-        End Function
+                End Sub)
+        End Sub
 
 #End Region