Slight tweaks to ConsoleService APIs

Author: daviwil

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -146,7 +146,7 @@ protected override void Initialize()
         protected override async Task Shutdown()
         {
             // Stop the interactive terminal
-            this.editorSession.ConsoleService.StopInteractiveConsole();
+            this.editorSession.ConsoleService.CancelReadLoop();
 
             // Make sure remaining output is flushed before exiting
             await this.outputDebouncer.Flush();
@@ -1080,6 +1080,9 @@ protected Task HandleEvaluateRequest(
             DebugAdapterMessages.EvaluateRequestArguments evaluateParams,
             RequestContext<DebugAdapterMessages.EvaluateResponseBody> requestContext)
         {
+            // Cancel the read loop before executing
+            this.editorSession.ConsoleService.CancelReadLoop();
+
             // We don't await the result of the execution here because we want
             // to be able to receive further messages while the current script
             // is executing.  This important in cases where the pipeline thread
@@ -1095,6 +1098,9 @@ protected Task HandleEvaluateRequest(
             executeTask.ContinueWith(
                 (task) =>
                 {
+                    // Start the command loop again
+                    this.editorSession.ConsoleService.StartReadLoop();
+
                     // Return an empty result since the result value is irrelevant
                     // for this request in the LanguageServer
                     return

src/PowerShellEditorServices/Console/ConsoleService.cs

@@ -80,18 +80,6 @@ public ConsoleService(
 
             this.consoleReadLine = new ConsoleReadLine(powerShellContext);
 
-            // TODO: Move this to the PSHost implementation
-
-            Console.CancelKeyPress +=
-                (obj, args) =>
-                {
-                    // TODO: Don't abort if we're in a native app, let the native app
-                    // handle the ctrl+c
-
-                    // We'll handle Ctrl+C
-                    args.Cancel = true;
-                    this.powerShellContext.AbortExecution();
-                };
         }
 
         #endregion
@@ -138,18 +126,6 @@ public void CancelReadLoop()
             }
         }
 
-        /// <summary>
-        /// Stops the current terminal-based interactive console.
-        /// </summary>
-        public void StopInteractiveConsole()
-        {
-            if (this.readLineCancellationToken != null)
-            {
-                this.readLineCancellationToken.Cancel();
-                this.readLineCancellationToken = null;
-            }
-        }
-
         /// <summary>
         /// Called when a command string is received from the user.
         /// If a prompt is currently active, the prompt handler is
@@ -321,7 +297,7 @@ await this.consoleReadLine.ReadCommandLine(
                 catch (Exception e) // Narrow this if possible
                 {
                     this.WriteOutput(
-                        $"\n\nAn error occurred while accepting input:\n\n{e.ToString()}\n",
+                        $"\n\nAn error occurred while reading input:\n\n{e.ToString()}\n",
                         true,
                         OutputType.Error);
 

src/PowerShellEditorServices/Session/SessionPSHost.cs

@@ -23,6 +23,7 @@ internal class ConsoleServicePSHost : PSHost, IHostSupportsInteractiveSession
 
         private HostDetails hostDetails;
         private IConsoleHost consoleHost;
+        private bool isNativeApplicationRunning;
         private Guid instanceId = Guid.NewGuid();
         private ConsoleServicePSHostUserInterface hostUserInterface;
         private IHostSupportsInteractiveSession hostSupportsInteractiveSession;
@@ -62,6 +63,20 @@ public ConsoleServicePSHost(
             this.hostDetails = hostDetails;
             this.hostUserInterface = new ConsoleServicePSHostUserInterface();
             this.hostSupportsInteractiveSession = hostSupportsInteractiveSession;
+
+            System.Console.CancelKeyPress +=
+                (obj, args) =>
+                {
+                    if (!this.isNativeApplicationRunning)
+                    {
+                        // We'll handle Ctrl+C
+                        if (this.ConsoleHost != null)
+                        {
+                            args.Cancel = true;
+                            this.consoleHost.SendControlC();
+                        }
+                    }
+                };
         }
 
         #endregion
@@ -113,11 +128,13 @@ public override void ExitNestedPrompt()
         public override void NotifyBeginApplication()
         {
             Logger.Write(LogLevel.Verbose, "NotifyBeginApplication() called.");
+            this.isNativeApplicationRunning = true;
         }
 
         public override void NotifyEndApplication()
         {
             Logger.Write(LogLevel.Verbose, "NotifyEndApplication() called.");
+            this.isNativeApplicationRunning = false;
         }
 
         public override void SetShouldExit(int exitCode)