WIP

Mike McLaughlin · Mike McLaughlin · commit 52d2ca1002b0 · 2019-02-21T23:14:57.000-08:00
diff --git a/src/Microsoft.Diagnostic.Repl/Console/ConsoleProvider.cs b/src/Microsoft.Diagnostic.Repl/Console/ConsoleProvider.cs
@@ -121,9 +121,6 @@ public void WriteLine(OutputType type, string format, params object[] parameters
         /// <exception cref="OperationCanceledException">ctrl-c interrupted the command</exception>
         public void WriteOutput(OutputType type, string message)
         {
-            if (m_interruptExecutingCommand != null) {
-                m_interruptExecutingCommand.Token.ThrowIfCancellationRequested();
-            }
             switch (type)
             {
                 case OutputType.Normal:
@@ -400,6 +397,7 @@ private async Task Dispatch(string newCommand, Func<string, CancellationToken, T
                 catch (OperationCanceledException)
                 {
                     // ctrl-c interrupted the command
+                    m_lastCommandLine = null;
                 }
                 catch (Exception ex) when (!(ex is NullReferenceException || ex is ArgumentNullException))
                 {

Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,6 @@ public void WriteLine(OutputType type, string format, params object[] parameters`
`121`	`121`	`/// <exception cref="OperationCanceledException">ctrl-c interrupted the command</exception>`
`122`	`122`	`public void WriteOutput(OutputType type, string message)`
`123`	`123`	`{`
`124`		`- if (m_interruptExecutingCommand != null) {`
`125`		`- m_interruptExecutingCommand.Token.ThrowIfCancellationRequested();`
`126`		`- }`
`127`	`124`	`switch (type)`
`128`	`125`	`{`
`129`	`126`	`case OutputType.Normal:`
`@@ -400,6 +397,7 @@ private async Task Dispatch(string newCommand, Func<string, CancellationToken, T`
`400`	`397`	`catch (OperationCanceledException)`
`401`	`398`	`{`
`402`	`399`	`// ctrl-c interrupted the command`
	`400`	`+ m_lastCommandLine = null;`
`403`	`401`	`}`
`404`	`402`	`catch (Exception ex) when (!(ex is NullReferenceException \|\| ex is ArgumentNullException))`
`405`	`403`	`{`