Remove last instance of GetAwaiter()

And so stop ignoring `VSTHRD002`.

Author: andyleejordan

test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs

@@ -35,19 +35,19 @@ internal class TestReadLine : IReadLine
     [Trait("Category", "DebugService")]
     public class DebugServiceTests : IAsyncLifetime
     {
-        private readonly PsesInternalHost psesHost;
-        private readonly BreakpointService breakpointService;
-        private readonly DebugService debugService;
+        private PsesInternalHost psesHost;
+        private BreakpointService breakpointService;
+        private DebugService debugService;
         private readonly BlockingCollection<DebuggerStoppedEventArgs> debuggerStoppedQueue = new();
-        private readonly WorkspaceService workspace;
-        private readonly ScriptFile debugScriptFile;
-        private readonly ScriptFile oddPathScriptFile;
-        private readonly ScriptFile variableScriptFile;
+        private WorkspaceService workspace;
+        private ScriptFile debugScriptFile;
+        private ScriptFile oddPathScriptFile;
+        private ScriptFile variableScriptFile;
         private readonly TestReadLine testReadLine = new();
 
-        public DebugServiceTests()
+        public async Task InitializeAsync()
         {
-            psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
+            psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
             // This is required for remote debugging, but we call it here to end up in the same
             // state as the usual startup path.
             psesHost.DebugContext.EnableDebugMode();
@@ -76,7 +76,6 @@ public DebugServiceTests()
             variableScriptFile = GetDebugScript("VariableTest.ps1");
         }
 
-        public Task InitializeAsync() => Task.CompletedTask;
 
         public async Task DisposeAsync()
         {

test/PowerShellEditorServices.Test/Extensions/ExtensionCommandTests.cs

@@ -28,7 +28,7 @@ public class ExtensionCommandTests : IAsyncLifetime
 
         public async Task InitializeAsync()
         {
-            psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
+            psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
             ExtensionService extensionService = new(
                 languageServer: null,
                 serviceProvider: null,

test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs

@@ -22,19 +22,17 @@ namespace PowerShellEditorServices.Test.Language
     [Trait("Category", "Completions")]
     public class CompletionHandlerTests : IAsyncLifetime
     {
-        private readonly PsesInternalHost psesHost;
-        private readonly WorkspaceService workspace;
-        private readonly PsesCompletionHandler completionHandler;
+        private PsesInternalHost psesHost;
+        private WorkspaceService workspace;
+        private PsesCompletionHandler completionHandler;
 
-        public CompletionHandlerTests()
+        public async Task InitializeAsync()
         {
-            psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
+            psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
             workspace = new WorkspaceService(NullLoggerFactory.Instance);
             completionHandler = new PsesCompletionHandler(NullLoggerFactory.Instance, psesHost, psesHost, workspace);
         }
 
-        public Task InitializeAsync() => Task.CompletedTask;
-
         public async Task DisposeAsync() => await Task.Run(psesHost.StopAsync);
 
         private ScriptFile GetScriptFile(ScriptRegion scriptRegion) => workspace.GetFile(TestUtilities.GetSharedPath(scriptRegion.File));

test/PowerShellEditorServices.Test/Language/SymbolsServiceTests.cs

@@ -31,14 +31,14 @@ namespace PowerShellEditorServices.Test.Language
     [Trait("Category", "Symbols")]
     public class SymbolsServiceTests : IAsyncLifetime
     {
-        private readonly PsesInternalHost psesHost;
-        private readonly WorkspaceService workspace;
-        private readonly SymbolsService symbolsService;
+        private PsesInternalHost psesHost;
+        private WorkspaceService workspace;
+        private SymbolsService symbolsService;
         private static readonly bool s_isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 
-        public SymbolsServiceTests()
+        public async Task InitializeAsync()
         {
-            psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
+            psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
             workspace = new WorkspaceService(NullLoggerFactory.Instance);
             workspace.WorkspaceFolders.Add(new WorkspaceFolder
             {
@@ -52,8 +52,6 @@ public SymbolsServiceTests()
                 new ConfigurationService());
         }
 
-        public Task InitializeAsync() => Task.CompletedTask;
-
         public async Task DisposeAsync()
         {
             psesHost.StopAsync();

test/PowerShellEditorServices.Test/PsesHostFactory.cs

@@ -7,6 +7,7 @@
 using System.Management.Automation.Host;
 using System.Management.Automation.Runspaces;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Hosting;
 using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
@@ -28,7 +29,7 @@ internal static class PsesHostFactory
 
         public static readonly string BundledModulePath = Path.GetFullPath(TestUtilities.NormalizePath("../../../../../module"));
 
-        public static PsesInternalHost Create(ILoggerFactory loggerFactory, bool loadProfiles = false)
+        public static async Task<PsesInternalHost> Create(ILoggerFactory loggerFactory, bool loadProfiles = false)
         {
             // We intentionally use `CreateDefault2()` as it loads `Microsoft.PowerShell.Core` only,
             // which is a more minimal and therefore safer state.
@@ -62,9 +63,7 @@ public static PsesInternalHost Create(ILoggerFactory loggerFactory, bool loadPro
 
             PsesInternalHost psesHost = new(loggerFactory, null, testHostDetails);
 
-            #pragma warning disable VSTHRD002 // Because this is used by constructors it can't use await.
-            if (psesHost.TryStartAsync(new HostStartOptions { LoadProfiles = loadProfiles }, CancellationToken.None).GetAwaiter().GetResult())
-            #pragma warning restore VSTHRD002
+            if (await psesHost.TryStartAsync(new HostStartOptions { LoadProfiles = loadProfiles }, CancellationToken.None))
             {
                 return psesHost;
             }

test/PowerShellEditorServices.Test/Session/PsesInternalHostTests.cs

@@ -22,11 +22,9 @@ namespace PowerShellEditorServices.Test.Session
     [Trait("Category", "PsesInternalHost")]
     public class PsesInternalHostTests : IAsyncLifetime
     {
-        private readonly PsesInternalHost psesHost;
+        private PsesInternalHost psesHost;
 
-        public PsesInternalHostTests() => psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
-
-        public Task InitializeAsync() => Task.CompletedTask;
+        public async Task InitializeAsync() => psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
 
         public async Task DisposeAsync() => await psesHost.StopAsync();
 
@@ -84,7 +82,7 @@ public async Task CanQueueParallelPSCommands()
         public async Task CanCancelExecutionWithToken()
         {
             using CancellationTokenSource cancellationSource = new(millisecondsDelay: 1000);
-            _ = await Assert.ThrowsAsync<TaskCanceledException>(() =>
+            await Assert.ThrowsAsync<TaskCanceledException>(() =>
             {
                 return psesHost.ExecutePSCommandAsync(
                     new PSCommand().AddScript("Start-Sleep 10"),
@@ -100,9 +98,8 @@ public async Task CanCancelExecutionWithMethod()
                 new PSCommand().AddScript("Start-Sleep 10"),
                 CancellationToken.None);
 
-            // Wait until our task has started.
-            Thread.Sleep(2000);
-            psesHost.CancelCurrentTask();
+            // Cancel the task after 1 second in another thread.
+            Task.Run(() => { Thread.Sleep(1000); psesHost.CancelCurrentTask(); });
             await Assert.ThrowsAsync<TaskCanceledException>(() => executeTask);
             Assert.True(executeTask.IsCanceled);
         }
@@ -236,11 +233,9 @@ public async Task CanHandleBadInitialWorkingDirectory(string path)
     [Trait("Category", "PsesInternalHost")]
     public class PsesInternalHostWithProfileTests : IAsyncLifetime
     {
-        private readonly PsesInternalHost psesHost;
-
-        public PsesInternalHostWithProfileTests() => psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance, loadProfiles: true);
+        private PsesInternalHost psesHost;
 
-        public Task InitializeAsync() => Task.CompletedTask;
+        public async Task InitializeAsync() => psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance, loadProfiles: true);
 
         public async Task DisposeAsync() => await psesHost.StopAsync();