Only show breakpoints at possible breakpoint positions in Observatory.

runtime/observatory/lib/src/service/object.dart

 // Copyright (c) 2014, 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 service;
 
 // Some value smaller than the object ring, so requesting a large array
 // doesn't result in an expired ref because the elements lapped it in the
 // object ring.
 const int kDefaultFieldLimit = 100;
@@ skipping 1143 matching lines @@
         Code code = value;
         code.profile = null;
       } else if (value is ServiceFunction) {
         ServiceFunction function = value;
         function.profile = null;
       }
     });
   }
 
   static const kCallSitesReport = '_CallSites';
+  static const kPossibleBreakpointsReport = 'PossibleBreakpoints';
 
   Future<ServiceMap> getSourceReport(List<String> report_kinds,
                                      [Script script,
                                       int startPos,
                                       int endPos]) {
     var params = { 'reports' : report_kinds };
     if (script != null) {
       params['scriptId'] = script.id;
     }
     if (startPos != null) {
@@ skipping 340 matching lines @@
         // Ignore GC events for now.
         break;
 
       default:
         // Log unexpected events.
         Logger.root.severe('Unexpected event: $event');
         break;
     }
   }
 
-  Future<ServiceObject> addBreakpoint(
-      Script script, int line, [int col]) async {
-    // TODO(turnidge): Pass line as an int instead of a string.
-    try {
-      Map params = {
-        'scriptId': script.id,
-        'line': line.toString(),
-      };
-      if (col != null) {
-        params['column'] = col.toString();
-      }
-      Breakpoint bpt = await invokeRpc('addBreakpoint', params);
-      if (bpt.resolved && script.loaded) {
-        SourceLocation loc = bpt.location;
-        if (script.tokenToLine(loc.tokenPos) != line) {
-          script.getLine(line).possibleBpt = false;
-        }
-      }
-      return bpt;
-    } on ServerRpcException catch(e) {
-      if (e.code == ServerRpcException.kCannotAddBreakpoint) {
-        // Unable to set a breakpoint at the desired line.
-        if (script.loaded) {
-          script.getLine(line).possibleBpt = false;
-        }
-      }
-      rethrow;
+  Future<ServiceObject> addBreakpoint(Script script, int line, [int col]) {
+    Map params = {
+      'scriptId': script.id,
+      'line': line,
+    };
+    if (col != null) {
+      params['column'] = col;
     }
+    return invokeRpc('addBreakpoint', params);

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

You're dropping the catch block is that intentional?

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

Yes.

   }
 
   Future<ServiceObject> addBreakpointByScriptUri(
       String uri, int line, [int col]) {
     Map params = {
       'scriptUri': uri,
       'line': line.toString(),
     };
     if (col != null) {
       params['column'] = col.toString();
@@ skipping 1154 matching lines @@
   }
 
   String toString() => 'Field(${dartOwner.name}.$name)';
 }
 
 
 class ScriptLine extends Observable {
   final Script script;
   final int line;
   final String text;
-  @observable bool possibleBpt = true;
-  @observable bool breakpointResolved = false;
   @observable Set<Breakpoint> breakpoints;
 
+  ScriptLine(this.script, this.line, this.text);
+
   bool get isBlank {
-    // Compute isBlank on demand.
-    if (_isBlank == null) {
-      _isBlank = text.trim().isEmpty;
+    return text.isEmpty || text.trim().isEmpty;
+  }
+
+  bool _isTrivial = null;
+  bool get isTrivial {
+    if (_isTrivial == null) {
+      _isTrivial = _isTrivialLine(text);
     }
-    return _isBlank;
+    return _isTrivial;
   }
-  bool _isBlank;
-
-  bool get isTrivialLine => !possibleBpt;
 
   static bool _isTrivialToken(String token) {
     if (token == 'else') {
       return true;
     }
     for (var c in token.split('')) {
       switch (c) {
         case '{':
         case '}':
         case '(':
@@ skipping 16 matching lines @@
       var tokens = wsToken.split(new RegExp(r"(\b)"));
       for (var token in tokens) {
         if (!_isTrivialToken(token)) {
           return false;
         }
       }
     }
     return true;
   }
 
-  ScriptLine(this.script, this.line, this.text) {
-    possibleBpt = !_isTrivialLine(text);
-  }
-
   void addBreakpoint(Breakpoint bpt) {
     if (breakpoints == null) {
       breakpoints = new Set<Breakpoint>();
     }
     breakpoints.add(bpt);
-    breakpointResolved = breakpointResolved || bpt.resolved;
   }
 
   void removeBreakpoint(Breakpoint bpt) {
     assert(breakpoints != null && breakpoints.contains(bpt));
     breakpoints.remove(bpt);
     if (breakpoints.isEmpty) {
       breakpoints = null;
-      breakpointResolved = false;
     }
   }
 }
 
 class CallSite {
   final String name;
   // TODO(turnidge): Use SourceLocation here instead.
   final Script script;
   final int tokenPos;
   final List<CallSiteEntry> entries;
@@ skipping 192 matching lines @@
           // Keep track of max and min token positions.
           firstTokenPos = (firstTokenPos <= tokenOffset) ?
               firstTokenPos : tokenOffset;
           lastTokenPos = (lastTokenPos >= tokenOffset) ?
               lastTokenPos : tokenOffset;
         }
         _tokenToLine[tokenOffset] = lineNumber;
         _tokenToCol[tokenOffset] = colNumber;
       }
     }
-
-    for (var line in lines) {
-      // Remove possible breakpoints on lines with no tokens.
-      if (!lineSet.contains(line.line)) {
-        line.possibleBpt = false;
-      }
-    }
   }
 
   void _processSource(String source) {
     if (source == null) {
       return;
     }
     var sourceLines = source.split('\n');
     if (sourceLines.length == 0) {
       return;
     }
@@ skipping 95 matching lines @@
 
     // Move back by name length.
     // TODO(johnmccutchan): Fix LocalVarDescriptor to set column before the
     // identifier name.
     column = math.max(0, column - name.length);
 
     var lineContents;
 
     if (line == lastLine) {
       // Only one line.
-      if (!getLine(line).isTrivialLine) {
+      if (!getLine(line).isTrivial) {
         // TODO(johnmccutchan): end token pos -> column can lie for snapshotted
         // code. e.g.:
         // io_sink.dart source line 23 ends at column 39
         // io_sink.dart snapshotted source line 23 ends at column 35.
         lastColumn = math.min(getLine(line).text.length, lastColumn);
         lineContents = getLine(line).text.substring(column, lastColumn - 1);
         return scanLineForLocalVariableLocations(pattern,
                                                   name,
                                                   lineContents,
                                                   line,
                                                   column);
       }
     }
 
     // Scan first line.
-    if (!getLine(line).isTrivialLine) {
+    if (!getLine(line).isTrivial) {
       lineContents = getLine(line).text.substring(column);
       r.addAll(scanLineForLocalVariableLocations(pattern,
                                                   name,
                                                   lineContents,
                                                   line++,
                                                   column));
     }
 
     // Scan middle lines.
     while (line < (lastLine - 1)) {
-      if (getLine(line).isTrivialLine) {
+      if (getLine(line).isTrivial) {
         line++;
         continue;
       }
       lineContents = getLine(line).text;
       r.addAll(
           scanLineForLocalVariableLocations(pattern,
                                              name,
                                              lineContents,
                                              line++,
                                              0));
     }
 
     // Scan last line.
-    if (!getLine(line).isTrivialLine) {
+    if (!getLine(line).isTrivial) {
       // TODO(johnmccutchan): end token pos -> column can lie for snapshotted
       // code. e.g.:
       // io_sink.dart source line 23 ends at column 39
       // io_sink.dart snapshotted source line 23 ends at column 35.
       lastColumn = math.min(getLine(line).text.length, lastColumn);
       lineContents = getLine(line).text.substring(0, lastColumn - 1);
       r.addAll(
           scanLineForLocalVariableLocations(pattern,
                                              name,
                                              lineContents,
@@ skipping 789 matching lines @@
     _upgradeCollection(map, owner);
     this.messageObjectId = map['messageObjectId'];
     this.index = map['index'];
     this.size = map['size'];
     this.handler = map['handler'];
     this.location = map['location'];
   }
 }
 
 
+// Helper function to extract possible breakpoint locations from a
+// SourceReport for some script.
+Set<int> getPossibleBreakpointLines(ServiceMap report, Script script) {
+  var result = new Set<int>();
+  int scriptIndex;
+  int numScripts = report['scripts'].length;
+  for (scriptIndex = 0; scriptIndex < numScripts; scriptIndex++) {
+    if (report['scripts'][scriptIndex].id == script.id) {
+      break;
+    }
+  }
+  if (scriptIndex == numScripts) {
+    return result;
+  }
+  var ranges = report['ranges'];
+  if (ranges != null) {
+    for (var range in ranges) {
+      if (range['scriptIndex'] != scriptIndex) {
+        continue;
+      }
+      if (range['compiled']) {
+        var possibleBpts = range['possibleBreakpoints'];
+        if (possibleBpts != null) {
+          for (var tokenPos in possibleBpts) {
+            result.add(script.tokenToLine(tokenPos));
+          }
+        }
+      } else {
+        int startLine = script.tokenToLine(range['startPos']);
+        int endLine = script.tokenToLine(range['endPos']);
+        for (int line = startLine; line <= endLine; line++) {
+          if (!script.getLine(line).isTrivial) {
+            result.add(line);
+          }
+        }
+      }
+    }
+  }
+  return result;
+}
+
+
 // Returns true if [map] is a service map. i.e. it has the following keys:
 // 'id' and a 'type'.
 bool _isServiceMap(ObservableMap m) {
   return (m != null) && (m['type'] != null);
 }
 
 bool _hasRef(String type) => type.startsWith('@');
 String _stripRef(String type) => (_hasRef(type) ? type.substring(1) : type);
 
 /// Recursively upgrades all [ServiceObject]s inside [collection] which must
@@ skipping 27 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }