Add source annotations for breakpoints.

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 39 matching lines @@
   a.text = content.text;
   content.text = '';
   content.append(a);
 }
 
 
 abstract class Annotation implements Comparable<Annotation> {
   int line;
   int columnStart;
   int columnStop;
+  int get priority;
 
   void applyStyleTo(element);
 
   int compareTo(Annotation other) {
     if (line == other.line) {
+      if (columnStart == other.columnStart) {
+        return priority.compareTo(other.priority);
+      }
       return columnStart.compareTo(other.columnStart);
     }
     return line.compareTo(other.line);
   }
 
   Element table() {
     var e = new DivElement();
     e.style.display = "table";
     e.style.color = "#333";
     e.style.font = "400 14px 'Montserrat', sans-serif";
@@ skipping 18 matching lines @@
   }
 
   Element serviceRef(object) {
     AnyServiceRefElement e = new Element.tag("any-service-ref");
     e.ref = object;
     return e;
   }
 }
 
 class CurrentExecutionAnnotation extends Annotation {
+  int priority = 0;  // highest priority.
+
   void applyStyleTo(element) {
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
     element.classes.add("currentCol");
     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.
+    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");
+    element.title = "Breakpoint ${bpt.number} at ${line}:${column}";
+  }
+}
+
 class LibraryAnnotation extends Annotation {
   Library target;
   String url;
+  int priority = 2;
+
   LibraryAnnotation(this.target, this.url);
 
   void applyStyleTo(element) {
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
     element.title = "library ${target.uri}";
     addLink(element, url);
   }
 }
 
 class PartAnnotation extends Annotation {
   Script part;
   String url;
+  int priority = 2;
+
   PartAnnotation(this.part, this.url);
 
   void applyStyleTo(element) {
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
     element.title = "script ${part.uri}";
     addLink(element, url);
   }
 }
 
 class LocalVariableAnnotation extends Annotation {
   final value;
+  int priority = 2;
 
   LocalVariableAnnotation(LocalVarLocation location, this.value) {
     line = location.line;
     columnStart = location.column;
     columnStop = location.endColumn;
   }
 
   void applyStyleTo(element) {
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
     element.style.fontWeight = "bold";
     element.title = "${value.shortName}";
   }
 }
 
 class CallSiteAnnotation extends Annotation {
   CallSite callSite;
+  int priority = 2;
 
   CallSiteAnnotation(this.callSite) {
     line = callSite.line;
     columnStart = callSite.column - 1;  // Call site is 1-origin.
     var tokenLength = callSite.script.guessTokenLength(line, columnStart);
     if (tokenLength == null) {
       tokenLength = callSite.name.length;  // Approximate.
       if (callSite.name.startsWith("get:") ||
           callSite.name.startsWith("set:")) tokenLength -= 4;
     }
@@ skipping 26 matching lines @@
           details.append(r);
         }
       }
       return details;
     });
   }
 }
 
 abstract class DeclarationAnnotation extends Annotation {
   String url;
+  int priority = 2;
+
   DeclarationAnnotation(decl, this.url) {
     assert(decl.loaded);
     SourceLocation location = decl.location;
     if (location == null) {
       line = 0;
       columnStart = 0;
       columnStop = 0;
       return;
     }
 
@@ skipping 103 matching lines @@
   @published ObservableList variables;
 
   int _currentLine;
   int _currentCol;
   int _startLine;
   int _endLine;
 
   var annotations = [];
   var annotationsCursor;
 
-  StreamSubscription scriptChangeSubscription;
+  StreamSubscription _scriptChangeSubscription;
+  Future<StreamSubscription> _debugSubscriptionFuture;
 
   bool hasLoadedLibraryDeclarations = false;
 
   String makeLineId(int line) {
     return 'line-$line';
   }
 
   void _scrollToCurrentPos() {
     var line = shadowRoot.getElementById(makeLineId(_currentLine));
     if (line != null) {
       line.scrollIntoView();
     }
   }
 
+  void attached() {
+    super.attached();
+    _debugSubscriptionFuture =
+        app.vm.listenEventStream(VM.kDebugStream, _onDebugEvent);
+  }
+
   void detached() {
-    if (scriptChangeSubscription != null) {
+    cancelFutureSubscription(_debugSubscriptionFuture);
+    _debugSubscriptionFuture = null;
+    if (_scriptChangeSubscription != null) {
       // Don't leak. If only Dart and Javascript exposed weak references...
-      scriptChangeSubscription.cancel();
-      scriptChangeSubscription = null;
+      _scriptChangeSubscription.cancel();
+      _scriptChangeSubscription = null;
     }
     super.detached();
   }
 
+  void _onDebugEvent(event) {
+    if (script == null) {
+      return;
+    }
+    switch (event.kind) {
+      case ServiceEvent.kBreakpointAdded:
+      case ServiceEvent.kBreakpointResolved:
+      case ServiceEvent.kBreakpointRemoved:
+        var loc = event.breakpoint.location;
+        if (loc.script == script) {
+          int line = script.tokenToLine(loc.tokenPos);
+          if ((line >= _startLine) && (line <= _endLine)) {
+            _updateTask.queue();
+          }
+        }
+        break;
+      default:
+        // Ignore.
+        break;
+    }
+  }
+
   void currentPosChanged(oldValue) {
     _updateTask.queue();
     _scrollToCurrentPos();
   }
 
   void startPosChanged(oldValue) {
     _updateTask.queue();
   }
 
   void endPosChanged(oldValue) {
@@ skipping 37 matching lines @@
       if (container != null) {
         container.children.clear();
       }
       return;
     }
     if (!script.loaded) {
       script.load().then((_) => update());
       return;
     }
 
-    if (scriptChangeSubscription == null) {
-      scriptChangeSubscription = script.changes.listen((_) => update());
+    if (_scriptChangeSubscription == null) {
+      _scriptChangeSubscription = script.changes.listen((_) => update());
     }
 
     computeAnnotations();
 
     var table = linesTable();
     var firstBuild = false;
     if (container == null) {
       // Indirect to avoid deleting the style element.
       container = new DivElement();
       shadowRoot.append(container);
@@ skipping 21 matching lines @@
       _currentCol--;  // make this 0-based.
     }
 
     _endLine = (endPos != null
                 ? script.tokenToLine(endPos)
                 : script.lines.length + script.lineOffset);
 
     annotations.clear();
 
     addCurrentExecutionAnnotation();
+    addBreakpointAnnotations();
 
     if (!inDebuggerContext && script.library != null) {
       if (hasLoadedLibraryDeclarations) {
         addLibraryAnnotations();
         addDependencyAnnotations();
         addPartAnnotations();
         addClassAnnotations();
         addFieldAnnotations();
         addFunctionAnnotations();
         addCallSiteAnnotations();
@@ skipping 17 matching lines @@
       a.columnStart = _currentCol;
       var length = script.guessTokenLength(_currentLine, _currentCol);
       if (length == null) {
         length = 1;
       }
       a.columnStop = _currentCol + length;
       annotations.add(a);
     }
   }
 
+  void addBreakpointAnnotations() {
+    for (var line = _startLine; line <= _endLine; line++) {
+      var bpts = script.getLine(line).breakpoints;
+      if (bpts != null) {
+        for (var bpt in bpts) {
+          if (bpt.location != null) {
+            annotations.add(new BreakpointAnnotation(bpt));
+          }
+        }
+      }
+    }
+  }
+
   Future loadDeclarationsOfLibrary(Library lib) {
     return lib.load().then((lib) {
       var loads = [];
       for (var func in lib.functions) {
         loads.add(func.load());
       }
       for (var field in lib.variables) {
         loads.add(field.load());
       }
       for (var cls in lib.classes) {
@@ skipping 406 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;
 }