| Index: runtime/observatory/lib/src/debugger/debugger_location.dart
|
| diff --git a/runtime/observatory/lib/src/debugger/debugger_location.dart b/runtime/observatory/lib/src/debugger/debugger_location.dart
|
| index 469609bf9603d14643d56b256432c2a678270ca0..a517cd28ab3fada3c2508bc650be83517ad6461e 100644
|
| --- a/runtime/observatory/lib/src/debugger/debugger_location.dart
|
| +++ b/runtime/observatory/lib/src/debugger/debugger_location.dart
|
| @@ -52,8 +52,8 @@ class DebuggerLocation {
|
| Script script = frame.location.script;
|
| return script.load().then((_) {
|
| var line = script.tokenToLine(frame.location.tokenPos);
|
| - // TODO(turnidge): Pass in the column here once the protocol supports it.
|
| - return new Future.value(new DebuggerLocation.file(script, line, null));
|
| + var col = script.tokenToCol(frame.location.tokenPos);
|
| + return new Future.value(new DebuggerLocation.file(script, line, col));
|
| });
|
| }
|
|
|
| @@ -101,8 +101,11 @@ class DebuggerLocation {
|
| return new Future.value(new DebuggerLocation.error(
|
| 'A script must be provided when the stack is empty'));
|
| }
|
| - Script script = stack['frames'][0].location.script;
|
| - return new Future.value(new DebuggerLocation.file(script, line, col));
|
| + var frame = stack['frames'][debugger.currentFrame];
|
| + Script script = frame.location.script;
|
| + return script.load().then((_) {
|
| + return new Future.value(new DebuggerLocation.file(script, line, col));
|
| + });
|
| }
|
| }
|
|
|
|
|