Merge pull request #1690 from PowerShell/andschwa/fix-prompting

Display prompt after `F8` finishes

Author: andyleejordan

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs

@@ -47,10 +47,10 @@ public async Task<EvaluateResponseBody> Handle(EvaluateRequestArguments request,
 
             if (isFromRepl)
             {
-                _executionService.ExecutePSCommandAsync(
+                await _executionService.ExecutePSCommandAsync(
                     new PSCommand().AddScript(request.Expression),
                     CancellationToken.None,
-                    new PowerShellExecutionOptions { WriteOutputToHost = true, ThrowOnError = false, AddToHistory = true }).HandleErrorsAsync(_logger);
+                    new PowerShellExecutionOptions { WriteOutputToHost = true, ThrowOnError = false, AddToHistory = true }).HandleErrorsAsync(_logger).ConfigureAwait(false);
             }
             else
             {

src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousTask.cs

@@ -55,10 +55,7 @@ public TResult Result
                     throw new OperationCanceledException();
                 }
 
-                if (_exceptionInfo is not null)
-                {
-                    _exceptionInfo.Throw();
-                }
+                _exceptionInfo?.Throw();
 
                 return _result;
             }
@@ -79,27 +76,25 @@ public void ExecuteSynchronously(CancellationToken executorCancellationToken)
                 return;
             }
 
-            using (var cancellationSource = CancellationTokenSource.CreateLinkedTokenSource(_taskRequesterCancellationToken, executorCancellationToken))
+            using var cancellationSource = CancellationTokenSource.CreateLinkedTokenSource(_taskRequesterCancellationToken, executorCancellationToken);
+            if (cancellationSource.IsCancellationRequested)
             {
-                if (cancellationSource.IsCancellationRequested)
-                {
-                    SetCanceled();
-                    return;
-                }
+                SetCanceled();
+                return;
+            }
 
-                try
-                {
-                    TResult result = Run(cancellationSource.Token);
-                    SetResult(result);
-                }
-                catch (OperationCanceledException)
-                {
-                    SetCanceled();
-                }
-                catch (Exception e)
-                {
-                    SetException(e);
-                }
+            try
+            {
+                TResult result = Run(cancellationSource.Token);
+                SetResult(result);
+            }
+            catch (OperationCanceledException)
+            {
+                SetCanceled();
+            }
+            catch (Exception e)
+            {
+                SetException(e);
             }
         }
 

src/PowerShellEditorServices/Services/PowerShell/Handlers/EvaluateHandler.cs

@@ -28,23 +28,22 @@ public EvaluateHandler(
             _executionService = executionService;
         }
 
-        public Task<EvaluateResponseBody> Handle(EvaluateRequestArguments request, CancellationToken cancellationToken)
+        public async Task<EvaluateResponseBody> Handle(EvaluateRequestArguments request, CancellationToken cancellationToken)
         {
             // TODO: Understand why we currently handle this asynchronously and why we return a dummy result value
             //       instead of awaiting the execution and returing a real result of some kind
 
             // This API is mostly used for F8 execution, so needs to interrupt the command prompt
-            _executionService.ExecutePSCommandAsync(
+            await _executionService.ExecutePSCommandAsync(
                 new PSCommand().AddScript(request.Expression),
                 CancellationToken.None,
-                new PowerShellExecutionOptions { WriteInputToHost = true, WriteOutputToHost = true, AddToHistory = true, ThrowOnError = false, InterruptCurrentForeground = true })
-                .HandleErrorsAsync(_logger);
+                new PowerShellExecutionOptions { WriteInputToHost = true, WriteOutputToHost = true, AddToHistory = true, ThrowOnError = false, InterruptCurrentForeground = true }).ConfigureAwait(false);
 
-            return Task.FromResult(new EvaluateResponseBody
+            return new EvaluateResponseBody
             {
                 Result = "",
                 VariablesReference = 0
-            });
+            };
         }
     }
 }

src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs

@@ -270,11 +270,13 @@ public Task<T> InvokeTaskOnPipelineThreadAsync<T>(
                 //  - block the consumer thread from mutating the queue
                 //  - cancel any running task on the consumer thread
                 //  - place our task on the front of the queue
+                //  - skip the next prompt so the task runs instead
                 //  - unblock the consumer thread
                 using (_taskQueue.BlockConsumers())
                 {
                     CancelCurrentTask();
                     _taskQueue.Prepend(task);
+                    _skipNextPrompt = true;
                 }
 
                 return task.Task;