| Index: runtime/observatory/lib/src/elements/debugger.dart
|
| diff --git a/runtime/observatory/lib/src/elements/debugger.dart b/runtime/observatory/lib/src/elements/debugger.dart
|
| index 70a32085393a0e3d987e51f4f2e82c270355e564..da34a3b148edc2df1fe85fb6443afc8327351ef1 100644
|
| --- a/runtime/observatory/lib/src/elements/debugger.dart
|
| +++ b/runtime/observatory/lib/src/elements/debugger.dart
|
| @@ -360,9 +360,7 @@ class AsyncNextCommand extends DebuggerCommand {
|
| debugger.console.print("No async continuation at this location");
|
| return;
|
| }
|
| - var bpt = await
|
| - debugger.isolate.addBreakOnActivation(event.asyncContinuation);
|
| - return debugger.isolate.resume();
|
| + return debugger.isolate.asyncStepOver()[0];
|
| } else {
|
| debugger.console.print('The program is already running');
|
| }
|
| @@ -997,7 +995,8 @@ class ObservatoryDebugger extends Debugger {
|
| void updateIsolate(Isolate iso) {
|
| _isolate = iso;
|
| if (_isolate != null) {
|
| - if (exceptions != iso.exceptionsPauseInfo) {
|
| + if ((exceptions != iso.exceptionsPauseInfo) &&
|
| + (iso.exceptionsPauseInfo != null)) {
|
| exceptions = iso.exceptionsPauseInfo;
|
| console.print("Now pausing for $exceptions exceptions");
|
| }
|
| @@ -1133,7 +1132,7 @@ class ObservatoryDebugger extends Debugger {
|
| console.print('Paused at ${script.name}:${line}:${col}');
|
| }
|
| if (event.asyncContinuation != null) {
|
| - console.print("Paused in async function: 'astep' available");
|
| + console.print("Paused in async function: 'anext' available");
|
| }
|
| });
|
| }
|
|
|