Await ExecutePSCommandAsync in evaluate handlers

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/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
-            });
+            };
         }
     }
 }