Skip to content

Commit 6ef2d0b

Browse files
andyleejordanandyleejordan
committed
Remove last instance of GetAwaiter()
And so stop ignoring `VSTHRD002`.
1 parent 4aa6db6 commit 6ef2d0b

File tree

6 files changed

+30
-41
lines changed

6 files changed

+30
-41
lines changed

‎test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ internal class TestReadLine : IReadLine
3535
[Trait("Category", "DebugService")]
3636
public class DebugServiceTests : IAsyncLifetime
3737
{
38-
private readonly PsesInternalHost psesHost;
39-
private readonly BreakpointService breakpointService;
40-
private readonly DebugService debugService;
38+
private PsesInternalHost psesHost;
39+
private BreakpointService breakpointService;
40+
private DebugService debugService;
4141
private readonly BlockingCollection<DebuggerStoppedEventArgs> debuggerStoppedQueue = new();
42-
private readonly WorkspaceService workspace;
43-
private readonly ScriptFile debugScriptFile;
44-
private readonly ScriptFile oddPathScriptFile;
45-
private readonly ScriptFile variableScriptFile;
42+
private WorkspaceService workspace;
43+
private ScriptFile debugScriptFile;
44+
private ScriptFile oddPathScriptFile;
45+
private ScriptFile variableScriptFile;
4646
private readonly TestReadLine testReadLine = new();
4747

48-
public DebugServiceTests()
48+
public async Task InitializeAsync()
4949
{
50-
psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
50+
psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
5151
// This is required for remote debugging, but we call it here to end up in the same
5252
// state as the usual startup path.
5353
psesHost.DebugContext.EnableDebugMode();
@@ -76,7 +76,6 @@ public DebugServiceTests()
7676
variableScriptFile = GetDebugScript("VariableTest.ps1");
7777
}
7878

79-
public Task InitializeAsync() => Task.CompletedTask;
8079

8180
public async Task DisposeAsync()
8281
{

‎test/PowerShellEditorServices.Test/Extensions/ExtensionCommandTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class ExtensionCommandTests : IAsyncLifetime
2828

2929
public async Task InitializeAsync()
3030
{
31-
psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
31+
psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
3232
ExtensionService extensionService = new(
3333
languageServer: null,
3434
serviceProvider: null,

‎test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,17 @@ namespace PowerShellEditorServices.Test.Language
2222
[Trait("Category", "Completions")]
2323
public class CompletionHandlerTests : IAsyncLifetime
2424
{
25-
private readonly PsesInternalHost psesHost;
26-
private readonly WorkspaceService workspace;
27-
private readonly PsesCompletionHandler completionHandler;
25+
private PsesInternalHost psesHost;
26+
private WorkspaceService workspace;
27+
private PsesCompletionHandler completionHandler;
2828

29-
public CompletionHandlerTests()
29+
public async Task InitializeAsync()
3030
{
31-
psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
31+
psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
3232
workspace = new WorkspaceService(NullLoggerFactory.Instance);
3333
completionHandler = new PsesCompletionHandler(NullLoggerFactory.Instance, psesHost, psesHost, workspace);
3434
}
3535

36-
public Task InitializeAsync() => Task.CompletedTask;
37-
3836
public async Task DisposeAsync() => await Task.Run(psesHost.StopAsync);
3937

4038
private ScriptFile GetScriptFile(ScriptRegion scriptRegion) => workspace.GetFile(TestUtilities.GetSharedPath(scriptRegion.File));

‎test/PowerShellEditorServices.Test/Language/SymbolsServiceTests.cs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ namespace PowerShellEditorServices.Test.Language
3131
[Trait("Category", "Symbols")]
3232
public class SymbolsServiceTests : IAsyncLifetime
3333
{
34-
private readonly PsesInternalHost psesHost;
35-
private readonly WorkspaceService workspace;
36-
private readonly SymbolsService symbolsService;
34+
private PsesInternalHost psesHost;
35+
private WorkspaceService workspace;
36+
private SymbolsService symbolsService;
3737
private static readonly bool s_isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
3838

39-
public SymbolsServiceTests()
39+
public async Task InitializeAsync()
4040
{
41-
psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
41+
psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
4242
workspace = new WorkspaceService(NullLoggerFactory.Instance);
4343
workspace.WorkspaceFolders.Add(new WorkspaceFolder
4444
{
@@ -52,8 +52,6 @@ public SymbolsServiceTests()
5252
new ConfigurationService());
5353
}
5454

55-
public Task InitializeAsync() => Task.CompletedTask;
56-
5755
public async Task DisposeAsync()
5856
{
5957
psesHost.StopAsync();

‎test/PowerShellEditorServices.Test/PsesHostFactory.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Management.Automation.Host;
88
using System.Management.Automation.Runspaces;
99
using System.Threading;
10+
using System.Threading.Tasks;
1011
using Microsoft.Extensions.Logging;
1112
using Microsoft.PowerShell.EditorServices.Hosting;
1213
using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
@@ -28,7 +29,7 @@ internal static class PsesHostFactory
2829

2930
public static readonly string BundledModulePath = Path.GetFullPath(TestUtilities.NormalizePath("../../../../../module"));
3031

31-
public static PsesInternalHost Create(ILoggerFactory loggerFactory, bool loadProfiles = false)
32+
public static async Task<PsesInternalHost> Create(ILoggerFactory loggerFactory, bool loadProfiles = false)
3233
{
3334
// We intentionally use `CreateDefault2()` as it loads `Microsoft.PowerShell.Core` only,
3435
// which is a more minimal and therefore safer state.
@@ -62,9 +63,7 @@ public static PsesInternalHost Create(ILoggerFactory loggerFactory, bool loadPro
6263

6364
PsesInternalHost psesHost = new(loggerFactory, null, testHostDetails);
6465

65-
#pragma warning disable VSTHRD002 // Because this is used by constructors it can't use await.
66-
if (psesHost.TryStartAsync(new HostStartOptions { LoadProfiles = loadProfiles }, CancellationToken.None).GetAwaiter().GetResult())
67-
#pragma warning restore VSTHRD002
66+
if (await psesHost.TryStartAsync(new HostStartOptions { LoadProfiles = loadProfiles }, CancellationToken.None))
6867
{
6968
return psesHost;
7069
}

‎test/PowerShellEditorServices.Test/Session/PsesInternalHostTests.cs‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ namespace PowerShellEditorServices.Test.Session
2222
[Trait("Category", "PsesInternalHost")]
2323
public class PsesInternalHostTests : IAsyncLifetime
2424
{
25-
private readonly PsesInternalHost psesHost;
25+
private PsesInternalHost psesHost;
2626

27-
public PsesInternalHostTests() => psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
28-
29-
public Task InitializeAsync() => Task.CompletedTask;
27+
public async Task InitializeAsync() => psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
3028

3129
public async Task DisposeAsync() => await psesHost.StopAsync();
3230

@@ -84,7 +82,7 @@ public async Task CanQueueParallelPSCommands()
8482
public async Task CanCancelExecutionWithToken()
8583
{
8684
using CancellationTokenSource cancellationSource = new(millisecondsDelay: 1000);
87-
_ = await Assert.ThrowsAsync<TaskCanceledException>(() =>
85+
await Assert.ThrowsAsync<TaskCanceledException>(() =>
8886
{
8987
return psesHost.ExecutePSCommandAsync(
9088
new PSCommand().AddScript("Start-Sleep 10"),
@@ -100,9 +98,8 @@ public async Task CanCancelExecutionWithMethod()
10098
new PSCommand().AddScript("Start-Sleep 10"),
10199
CancellationToken.None);
102100

103-
// Wait until our task has started.
104-
Thread.Sleep(2000);
105-
psesHost.CancelCurrentTask();
101+
// Cancel the task after 1 second in another thread.
102+
Task.Run(() => { Thread.Sleep(1000); psesHost.CancelCurrentTask(); });
106103
await Assert.ThrowsAsync<TaskCanceledException>(() => executeTask);
107104
Assert.True(executeTask.IsCanceled);
108105
}
@@ -236,11 +233,9 @@ public async Task CanHandleBadInitialWorkingDirectory(string path)
236233
[Trait("Category", "PsesInternalHost")]
237234
public class PsesInternalHostWithProfileTests : IAsyncLifetime
238235
{
239-
private readonly PsesInternalHost psesHost;
240-
241-
public PsesInternalHostWithProfileTests() => psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance, loadProfiles: true);
236+
private PsesInternalHost psesHost;
242237

243-
public Task InitializeAsync() => Task.CompletedTask;
238+
public async Task InitializeAsync() => psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance, loadProfiles: true);
244239

245240
public async Task DisposeAsync() => await psesHost.StopAsync();
246241

0 commit comments

Comments
 (0)