Make methods synchronous

src/EditorFeatures/CSharpTest/ChangeSignature/RemoveParametersTests.cs

@@ -241,7 +241,7 @@ void M()
 
             var updatedSignature = new[] { 0, 2 };
 
-            using (var testState = await ChangeSignatureTestState.CreateAsync(XElement.Parse(workspaceXml)))
+            using (var testState = ChangeSignatureTestState.Create(XElement.Parse(workspaceXml)))
             {
                 testState.TestChangeSignatureOptionsService.IsCancelled = false;
                 testState.TestChangeSignatureOptionsService.UpdatedSignature = updatedSignature;

src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs

@@ -128,7 +128,7 @@ internal sealed class RenameTrackingTestState : IDisposable
             }
         }
 
-        private static Task<TestWorkspace> CreateTestWorkspaceAsync(string code, string languageName, ExportProvider exportProvider = null)
+        private static async Task<TestWorkspace> CreateTestWorkspaceAsync(string code, string languageName, ExportProvider exportProvider = null)
         {
             var xml = string.Format(@"
 <Workspace>

src/EditorFeatures/TestUtilities/ChangeSignature/ChangeSignatureTestState.cs

@@ -36,7 +36,7 @@ public static async Task<ChangeSignatureTestState> CreateAsync(string markup, st
             return new ChangeSignatureTestState(workspace);
         }
 
-        public static async Task<ChangeSignatureTestState> CreateAsync(XElement workspaceXml)
+        public static ChangeSignatureTestState Create(XElement workspaceXml)
         {
             var workspace = TestWorkspace.Create(workspaceXml);
             return new ChangeSignatureTestState(workspace);

src/EditorFeatures/VisualBasicTest/ChangeSignature/ReorderParameters.MultiFile.vb

@@ -48,7 +48,7 @@ class C
     }
 }]]></Text>.NormalizedValue()
 
-            Using testState = Await ChangeSignatureTestState.CreateAsync(workspace)
+            Using testState = ChangeSignatureTestState.Create(workspace)
                 Dim history = testState.Workspace.GetService(Of ITextUndoHistoryRegistry)().RegisterHistory(testState.Workspace.Documents.First().GetTextBuffer())
                 testState.TestChangeSignatureOptionsService.IsCancelled = False
                 testState.TestChangeSignatureOptionsService.UpdatedSignature = permutation
@@ -102,7 +102,7 @@ class C
     }
 }]]></Text>.NormalizedValue()
 
-            Using testState = Await ChangeSignatureTestState.CreateAsync(workspace)
+            Using testState = ChangeSignatureTestState.Create(workspace)
                 Dim history = testState.Workspace.GetService(Of ITextUndoHistoryRegistry)().RegisterHistory(testState.Workspace.Documents.First().GetTextBuffer())
                 testState.TestChangeSignatureOptionsService.IsCancelled = False
                 testState.TestChangeSignatureOptionsService.UpdatedSignature = permutation

src/VisualStudio/Core/Test/CodeModel/AbstractRootCodeModelTests.vb

@@ -37,7 +37,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
         End Function
 
         Protected Overloads Async Function TestChildren(code As XElement, ParamArray names() As String) As Task
-            Await TestRootCodeModelWithCodeFile(code,
+            TestRootCodeModelWithCodeFile(code,
                 Sub(rootCodeModel)
                     Assert.Equal(names.Length, rootCodeModel.CodeElements.Count)
 
@@ -54,7 +54,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
         End Function
 
         Protected Async Function TestCreateCodeTypeRef(code As XElement, type As Object, data As CodeTypeRefData) As Task
-            Await TestRootCodeModelWithCodeFile(code,
+            TestRootCodeModelWithCodeFile(code,
                 Sub(rootCodeModel)
                     Dim codeTypeRef = rootCodeModel.CreateCodeTypeRef(type)
 
@@ -67,7 +67,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
         End Function
 
         Protected Async Function TestCreateCodeTypeRef(Of TException As Exception)(code As XElement, type As Object) As Task
-            Await TestRootCodeModelWithCodeFile(code,
+            TestRootCodeModelWithCodeFile(code,
                 Sub(rootCodeModel)
                     Assert.Throws(Of TException)(
                         Sub()

src/VisualStudio/Core/Test/CodeModel/CSharp/CodeClassTests.vb

@@ -3902,7 +3902,7 @@ class C$$
 }
 </Code>
 
-            Await TestElement(code,
+            TestElement(code,
                 Sub(state, codeClass)
                     For i = 1 To 100
                         Dim variable = codeClass.AddVariable("x", "System.Int32")

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

@@ -3151,7 +3151,7 @@ Class C$$
 End Class
 </Code>
 
-            Await TestElement(code,
+            TestElement(code,
                 Sub(state, codeClass)
                     For i = 1 To 100
                         Dim variable = codeClass.AddVariable("x", "System.Int32")

src/VisualStudio/Core/Test/Snippets/CSharpSnippetExpansionClientTests.vb

@@ -198,7 +198,7 @@ using G=   H.I;
         } 
 &lt;/div&gt;</SurfaceBuffer>
 
-            Await TestProjectionFormattingAsync(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
+            TestProjectionFormatting(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Snippets)>
@@ -228,7 +228,7 @@ using G=   H.I;
 }
 &lt;/div&gt;</SurfaceBuffer>
 
-            Await TestProjectionFormattingAsync(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
+            TestProjectionFormatting(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Snippets)>
@@ -258,7 +258,7 @@ using G=   H.I;
 }
 &lt;/div&gt;</SurfaceBuffer>
 
-            Await TestProjectionFormattingAsync(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
+            TestProjectionFormatting(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
         End Function
 
         <WpfFact, WorkItem(4652, "https://github.com/dotnet/roslyn/issues/4652")>

src/VisualStudio/Core/Test/Snippets/VisualBasicSnippetExpansionClientTests.vb

@@ -221,7 +221,7 @@ End Class</Document>
 Next 
 &lt;/div&gt;</SurfaceBuffer>
 
-            Await TestFormattingAsync(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
+            TestFormatting(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Snippets)>
@@ -253,7 +253,7 @@ For index2 = 1 to length
         Next 
 &lt;/div&gt;</SurfaceBuffer>
 
-            Await TestFormattingAsync(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
+            TestFormatting(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Snippets)>
@@ -281,7 +281,7 @@ Next|]
 Next
 &lt;/div&gt;</SurfaceBuffer>
 
-            Await TestFormattingAsync(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
+            TestFormatting(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Snippets)>
@@ -309,7 +309,7 @@ Next|]
 Next
 &lt;/div&gt;</SurfaceBuffer>
 
-            Await TestFormattingAsync(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
+            TestFormatting(workspaceXmlWithSubjectBufferDocument, surfaceBufferDocument, expectedSurfaceBuffer)
         End Function
 
         <WpfFact, WorkItem(4652, "https://github.com/dotnet/roslyn/issues/4652")>

src/VisualStudio/Core/Test/Venus/AbstractContainedLanguageCodeSupportTests.vb

@@ -12,12 +12,12 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Venus
         Protected MustOverride ReadOnly Property Language As String
         Protected MustOverride ReadOnly Property DefaultCode As String
 
-        Protected Function AssertValidIdAsync(id As String) As Task
-            Return AssertValidId(id, Sub(value) Assert.True(value))
+        Protected Async Function AssertValidIdAsync(id As String) As Task
+            AssertValidId(id, Sub(value) Assert.True(value))
         End Function
 
-        Protected Function AssertNotValidIdAsync(id As String) As Task
-            Return AssertValidId(id, Sub(value) Assert.False(value))
+        Protected Async Function AssertNotValidIdAsync(id As String) As Task
+            AssertValidId(id, Sub(value) Assert.False(value))
         End Function
 
         Private Sub AssertValidId(id As String, assertion As Action(Of Boolean))