Consolidate InterruptCurrentForeground and MustRunInForeground
#1777
Conversation
And set them consistently. If the task needs to interrupt or run in the foreground, it really needs to do both.
|
This was tested on top of #1778 and good to go @SeeminglyScience |
…ound` (PowerShell#1777)" This reverts commit 39c9ed4.
andyleejordan
added
Issue-Enhancement
| private static readonly PowerShellExecutionOptions s_debuggerExecutionOptions = new() | ||
| { | ||
| MustRunInForeground = true, |
There was a problem hiding this comment.
@SeeminglyScience just looking back at this PR, knowing what we know now, we've moved F5 to priority next (seems right to me!)
| WriteOutputToHost = !editorCommand.SuppressOutput, | ||
| AddToHistory = !editorCommand.SuppressOutput, | ||
| ThrowOnError = false, | ||
| InterruptCurrentForeground = true |
There was a problem hiding this comment.
Editor command execution was already going to run with priority next.
| @@ -32,7 +32,11 @@ internal class PsrlReadLine : TerminalReadLine | |||
| _psrlProxy.OverrideIdleHandler(onIdleAction); | |||
| } | |||
|
|
|||
| public override string ReadLine(CancellationToken cancellationToken) => _psesHost.InvokeDelegate(representation: "ReadLine", new ExecutionOptions { MustRunInForeground = true }, InvokePSReadLine, cancellationToken); | |||
There was a problem hiding this comment.
ReadLine will now run with priority next (again, seems right!)
| WriteInputToHost = true, | ||
| WriteOutputToHost = true, | ||
| AddToHistory = true, | ||
| ThrowOnError = false, | ||
| InterruptCurrentForeground = true |
There was a problem hiding this comment.
F8 was already going to run with priority next, which F5 now matches.
| return ExecuteDelegateAsync( | ||
| "LoadProfiles", | ||
| new PowerShellExecutionOptions { MustRunInForeground = true, ThrowOnError = false }, |
There was a problem hiding this comment.
This one is what caused us trouble. Profiles was not going to run with priority next, which it then started running with, ahead of psEditor. We've fixed that by not specifying foreground at all, since this is a startup task.
Heck: should we add an "isStartup" task that only runs in the startup loop, and throws an error for us if it's encountered anywhere else?
| @@ -1146,7 +1160,7 @@ private Task PopOrReinitializeRunspaceAsync() | |||
| // we simply run this on its thread, guaranteeing that no other action can occur | |||
| return ExecuteDelegateAsync( | |||
| nameof(PopOrReinitializeRunspaceAsync), | |||
| new ExecutionOptions { InterruptCurrentForeground = true }, | |||
There was a problem hiding this comment.
PopOrReinitialize w as already going to run with priority next.
| await _executionService.ExecutePSCommandAsync( | ||
| command, | ||
| CancellationToken.None, | ||
| new PowerShellExecutionOptions { WriteOutputToHost = true, InterruptCurrentForeground = true, ThrowOnError = false }).ConfigureAwait(false); |
There was a problem hiding this comment.
As was the Invoke-Plaster.
And set them consistently. If the task needs to interrupt or run in the foreground, it really needs to do both. Also fixes some indentation.