Support column-based breakpoints in the VM and Observatory.

runtime/observatory/lib/src/debugger/debugger_location.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of debugger;
 
 class DebuggerLocation {
   DebuggerLocation.file(this.script, this.line, this.col);
   DebuggerLocation.func(this.function);
   DebuggerLocation.error(this.errorMessage);
@@ skipping 34 matching lines @@
   static Future<DebuggerLocation> _currentLocation(Debugger debugger) {
     ServiceMap stack = debugger.stack;
     if (stack == null || stack['frames'].length == 0) {
       return new Future.value(new DebuggerLocation.error(
           'A script must be provided when the stack is empty'));
     }
     var frame = stack['frames'][debugger.currentFrame];
     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));
     });
   }
 
   static Future<DebuggerLocation> _parseScriptLine(Debugger debugger,
                                                    Match match) {
     var scriptName = match.group(1);
     if (scriptName != null) {
       scriptName = scriptName.substring(0, scriptName.length - 1);
     }
     var lineStr = match.group(2);
@@ skipping 27 matching lines @@
           return new DebuggerLocation.error("Script '${scriptName}' is ambigous");
         }
       });
     } else {
       // No script provided.  Default to top of stack for now.
       ServiceMap stack = debugger.stack;
       if (stack == null || stack['frames'].length == 0) {
         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));
+      });
     }
   }
 
   static Future<List<Script>> _lookupScript(Isolate isolate,
                                             String name,
                                             {bool allowPrefix: false}) {
     var pending = [];
     for (var lib in isolate.libraries) {
       if (!lib.loaded) {
         pending.add(lib.load());
@@ skipping 241 matching lines @@
     return 'invalid source location (${errorMessage})';
   }
 
   Script script;
   int line;
   int col;
   ServiceFunction function;
   String errorMessage;
   bool get valid => (errorMessage == null);
 }