Only show breakpoints at possible breakpoint positions in 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 'dart:math';
 import 'observatory_element.dart';
@@ skipping 368 matching lines @@
   @published Element scroller;
   RefreshButtonElement _refreshButton;
 
   int _currentLine;
   int _currentCol;
   int _startLine;
   int _endLine;
 
   Map<int, List<ServiceMap>> _rangeMap = {};
   Set _callSites = new Set<CallSite>();
+  Set _possibleBreakpointLines = new Set<int>();
 
   var annotations = [];
   var annotationsCursor;
 
   StreamSubscription _scriptChangeSubscription;
   Future<StreamSubscription> _debugSubscriptionFuture;
   StreamSubscription _scrollSubscription;
 
   bool hasLoadedLibraryDeclarations = false;
 
@@ skipping 28 matching lines @@
     }
     if (_scriptChangeSubscription != null) {
       // Don't leak. If only Dart and Javascript exposed weak references...
       _scriptChangeSubscription.cancel();
       _scriptChangeSubscription = null;
     }
     super.detached();
   }
 
   void _onScroll(event) {
+    if (_refreshButton == null) {
+      return;
+    }
     var currentTop = _refreshButton.style.top;
     var newTop = _refreshButtonTop();
     if (currentTop != newTop) {
       _refreshButton.style.top = '${newTop}px';
     }
   }
 
   void _onDebugEvent(event) {
     if (script == null) {
       return;
@@ skipping 78 matching lines @@
 
   Element container;
 
   Future _refresh() async {
     await update();
   }
 
   // Build _rangeMap and _callSites from a source report.
   Future _refreshSourceReport() async {
     var sourceReport = await script.isolate.getSourceReport(
-        [Isolate.kCallSitesReport], script, startPos, endPos);
+        [Isolate.kCallSitesReport, Isolate.kPossibleBreakpointsReport],
+        script, startPos, endPos);
+    _possibleBreakpointLines = getPossibleBreakpointLines(sourceReport, script);
     _rangeMap.clear();
     _callSites.clear();
     for (var range in sourceReport['ranges']) {
       int startLine = script.tokenToLine(range['startPos']);
       int endLine = script.tokenToLine(range['endPos']);
       for (var line = startLine; line <= endLine; line++) {
         var rangeList = _rangeMap[line];
         if (rangeList == null) {
           _rangeMap[line] = [range];
         } else {
           rangeList.add(range);
         }
       }
-      var rangeCallSites = range['callSites'];
-      if (rangeCallSites != null) {
-        for (var callSiteMap in rangeCallSites) {
-          _callSites.add(new CallSite.fromMap(callSiteMap, script));
+      if (range['compiled']) {
+        var rangeCallSites = range['callSites'];
+        if (rangeCallSites != null) {
+          for (var callSiteMap in rangeCallSites) {
+            _callSites.add(new CallSite.fromMap(callSiteMap, script));
+          }
         }
       }
     }
   }
 
   Task _updateTask;
   Future update() async {
     assert(_updateTask != null);
     if (script == null) {
       // We may have previously had a script.
@@ skipping 423 matching lines @@
   Element lineElement(ScriptLine line, int lineNumPad) {
     var e = new DivElement();
     e.classes.add("sourceRow");
     e.append(lineBreakpointElement(line));
     e.append(lineNumberElement(line, lineNumPad));
     e.append(lineSourceElement(line));
     return e;
   }
 
   Element lineBreakpointElement(ScriptLine line) {
-    var e = new DivElement();
-    var busy = false;
-    if (line == null || !line.possibleBpt) {
+    if (line == null || !_possibleBreakpointLines.contains(line.line)) {
+      var e = new DivElement();

[Cutch, 2016/01/15 21:06:02]

Why move the var e = new DivElement() into the branch and then duplicate it
below? The original code just allocates it right away.

[turnidge, 2016/01/15 22:41:39]

Done.

+      e.classes.add('noCopy');
       e.classes.add("emptyBreakpoint");
-      e.classes.add('noCopy');
       e.text = nbsp;
       return e;
     }
+
+    var e = new DivElement();
     e.text = 'B';
-    update() {
+    var busy = false;
+    void update() {
       e.classes.clear();
       e.classes.add('noCopy');
-
-      if (!line.possibleBpt) {
-        e.classes.add("emptyBreakpoint");
-        e.text = nbsp;
-      } else if (busy) {
+      if (busy) {
         e.classes.add("busyBreakpoint");
+      } else if (line.breakpoints != null) {
+        bool resolved = false;
+        for (var bpt in line.breakpoints) {
+          if (bpt.resolved) {
+            resolved = true;
+            break;
+          }
+        }
+        if (resolved) {
+          e.classes.add("resolvedBreakpoint");
+        } else {
+          e.classes.add("unresolvedBreakpoint");
+        }
       } else {
-        if (line.breakpoints != null) {
-          if (line.breakpointResolved) {
-            e.classes.add("resolvedBreakpoint");
-          } else {
-            e.classes.add("unresolvedBreakpoint");
-          }
-        } else {
-          e.classes.add("possibleBreakpoint");
-        }
+        e.classes.add("possibleBreakpoint");
       }
     }
-    line.changes.listen((_) => update());
+
+    line.changes.listen((_) => update);

[Cutch, 2016/01/15 21:06:02]

update()

[turnidge, 2016/01/15 22:41:38]

Done.

     e.onClick.listen((event) {
       if (busy) {
         return;
       }
       busy = true;
       if (line.breakpoints == null) {
         // No breakpoint.  Add it.
         line.script.isolate.addBreakpoint(line.script, line.line)
           .catchError((e, st) {
             if (e is! ServerRpcException ||
@@ skipping 144 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;
   @published Element scroller;
 }