Support column-based breakpoints in the VM and Observatory.

runtime/observatory/lib/src/elements/script_inset.dart

 // Copyright (c) 2013, 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.
 
 library script_inset_element;
 
 import 'dart:async';
 import 'dart:html';
 import 'observatory_element.dart';
 import 'service_ref.dart';
@@ skipping 103 matching lines @@
     element.title = "Current execution";
   }
 }
 
 class BreakpointAnnotation extends Annotation {
   Breakpoint bpt;
   int priority = 1;
 
   BreakpointAnnotation(this.bpt) {
     var script = bpt.location.script;
-    var pos = bpt.location.tokenPos;
-    line = script.tokenToLine(pos);
-    columnStart = script.tokenToCol(pos) - 1;  // tokenToCol is 1-origin.
+    if (bpt.location.tokenPos != null) {
+      var pos = bpt.location.tokenPos;
+      line = script.tokenToLine(pos);
+      columnStart = script.tokenToCol(pos) - 1;  // tokenToCol is 1-origin.
+    } else {
+      line = bpt.location.line;
+      columnStart = bpt.location.column;
+      if (columnStart == null) {
+        columnStart = 0;
+      }
+    }
     var length = script.guessTokenLength(line, columnStart);
     if (length == null) {
       length = 1;
     }
     columnStop = columnStart + length;
   }
 
   void applyStyleTo(element) {
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
     var script = bpt.location.script;
     var pos = bpt.location.tokenPos;
     int line = script.tokenToLine(pos);
     int column = script.tokenToCol(pos);
-    element.classes.add("breakAnnotation");
+    if (bpt.resolved) {
+      element.classes.add("resolvedBreakAnnotation");
+    } else {
+      element.classes.add("unresolvedBreakAnnotation");
+    }
     element.title = "Breakpoint ${bpt.number} at ${line}:${column}";
   }
 }
 
 class LibraryAnnotation extends Annotation {
   Library target;
   String url;
   int priority = 2;
 
   LibraryAnnotation(this.target, this.url);
@@ skipping 288 matching lines @@
     _updateTask.queue();
   }
 
   void variablesChanged(oldValue) {
     _updateTask.queue();
   }
 
   Element a(String text) => new AnchorElement()..text = text;
   Element span(String text) => new SpanElement()..text = text;
 
+  Element hitsCurrent(Element element) {
+    element.classes.add('hitsCurrent');
+    element.title = "";
+    return element;
+  }
   Element hitsUnknown(Element element) {
     element.classes.add('hitsNone');
     element.title = "";
     return element;
   }
   Element hitsNotExecuted(Element element) {
     element.classes.add('hitsNotExecuted');
     element.title = "Line did not execute";
     return element;
   }
@@ skipping 462 matching lines @@
     });
     update();
     return e;
   }
 
   Element lineNumberElement(ScriptLine line) {
     var lineNumber = line == null ? "..." : line.line;
     var e = span("$nbsp$lineNumber$nbsp");
     e.classes.add('noCopy');
 
-    if ((line == null) || (line.hits == null)) {
+    if (lineNumber == _currentLine) {
+      hitsCurrent(e);
+    } else if ((line == null) || (line.hits == null)) {
       hitsUnknown(e);
     } else if (line.hits == 0) {
       hitsNotExecuted(e);
     } else {
       hitsExecuted(e);
     }
 
     return e;
   }
 
@@ skipping 50 matching lines @@
 class SourceInsetElement extends PolymerElement {
   SourceInsetElement.created() : super.created();
 
   @published SourceLocation location;
   @published String height = null;
   @published int currentPos;
   @published bool inDebuggerContext = false;
   @published ObservableList variables;
 }