Merge pull request #1291 from microsoft/main

WardenGnaw · web-flow · commit 560b24a6910c · 2022-03-11T16:43:28.000-08:00
Merge 'main' into 'release_mdd'
diff --git a/src/MICore/Debugger.cs b/src/MICore/Debugger.cs
@@ -1253,10 +1253,10 @@ public void ProcessStdOutLine(string line)
                         {
                             WaitingOperationDescriptor waitingOperation;
                             if (_waitingOperations.TryGetValue(id, out waitingOperation) &&
-                                !waitingOperation.EchoReceived &&
                                 line == waitingOperation.Command)
                             {
                                 // This is just the echo. Ignore.
+                                // Sometimes with lldb we are seeing 2 command echos 
                                 waitingOperation.EchoReceived = true;
                                 return;
                             }
@@ -1267,6 +1267,7 @@ public void ProcessStdOutLine(string line)
                 switch (c)
                 {
                     case '~':
+                    case '@':
                         OnDebuggeeOutput(noprefix);         // Console stream
                         break;
                     case '^':

Original file line number	Diff line number	Diff line change
`@@ -1253,10 +1253,10 @@ public void ProcessStdOutLine(string line)`
`1253`	`1253`	`{`
`1254`	`1254`	`WaitingOperationDescriptor waitingOperation;`
`1255`	`1255`	`if (_waitingOperations.TryGetValue(id, out waitingOperation) &&`
`1256`		`- !waitingOperation.EchoReceived &&`
`1257`	`1256`	`line == waitingOperation.Command)`
`1258`	`1257`	`{`
`1259`	`1258`	`// This is just the echo. Ignore.`
	`1259`	`+ // Sometimes with lldb we are seeing 2 command echos`
`1260`	`1260`	`waitingOperation.EchoReceived = true;`
`1261`	`1261`	`return;`
`1262`	`1262`	`}`
`@@ -1267,6 +1267,7 @@ public void ProcessStdOutLine(string line)`
`1267`	`1267`	`switch (c)`
`1268`	`1268`	`{`
`1269`	`1269`	`case '~':`
	`1270`	`+ case '@':`
`1270`	`1271`	`OnDebuggeeOutput(noprefix); // Console stream`
`1271`	`1272`	`break;`
`1272`	`1273`	`case '^':`