Fix analyzer problems in object.dart.

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;
 
 /// Helper function for canceling a Future<StreamSubscription>.
 Future cancelFutureSubscription(
     Future<StreamSubscription> subscriptionFuture) async {
   if (subscriptionFuture != null) {
@@ skipping 411 matching lines @@
 abstract class ServiceObjectOwner extends ServiceObject {
   /// Creates an empty [ServiceObjectOwner].
   ServiceObjectOwner._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   /// Builds a [ServiceObject] corresponding to the [id] from [map].
   /// The result may come from the cache.  The result will not necessarily
   /// be [loaded].
   ServiceObject getFromMap(ObservableMap map);
 }
 
+abstract class Location  {
+  Script get script;
+  int get tokenPos;
+}
+
 /// A [SourceLocation] represents a location or range in the source code.
-class SourceLocation extends ServiceObject {
+class SourceLocation extends ServiceObject implements Location {
   Script script;
   int tokenPos;
   int endTokenPos;
 
   Future<int> getLine() async {
     await script.load();
     return script.tokenToLine(tokenPos);
   }
 
   Future<int> getColumn() async {
@@ skipping 23 matching lines @@
     if (endTokenPos == null) {
       return '${script.name}:token(${tokenPos})';
     } else {
       return '${script.name}:tokens(${tokenPos}-${endTokenPos})';
     }
   }
 }
 
 /// An [UnresolvedSourceLocation] represents a location in the source
 // code which has not been precisely mapped to a token position.
-class UnresolvedSourceLocation extends ServiceObject {
+class UnresolvedSourceLocation extends ServiceObject implements Location {
   Script script;
   String scriptUri;
   int line;
   int column;
   int tokenPos;
 
   Future<int> getLine() async {
     if (tokenPos != null) {
       await script.load();
       return script.tokenToLine(tokenPos);
@@ skipping 1007 matching lines @@
     // 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 &&
-          script.tokenToLine(bpt.location.tokenPos) != line) {
-        // TODO(turnidge): Can this still happen?
-        script.getLine(line).possibleBpt = false;
+      if (bpt.resolved && script.loaded) {
+        SourceLocation loc = bpt.location;

[Ivan Posva, 2015/09/09 17:09:27]

Was this change still needed after adding the Location interface?

+        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.
         script.getLine(line).possibleBpt = false;
       }
       rethrow;
     }
   }
@@ skipping 445 matching lines @@
 
   // TODO(turnidge): Add state to track if a breakpoint has been
   // removed from the program.  Remove from the cache when deleted.
   bool get canCache => true;
   bool get immutable => false;
 
   // A unique integer identifier for this breakpoint.
   @observable int number;
 
   // Either SourceLocation or UnresolvedSourceLocation.
-  @observable ServiceObject location;
+  @observable Location location;
 
   // The breakpoint is in a file which is not yet loaded.
   @observable bool latent;
 
   // The breakpoint has been assigned to a final source location.
   @observable bool resolved;
 
   void _update(ObservableMap map, bool mapIsRef) {
     _loaded = true;
     _upgradeCollection(map, owner);
@@ skipping 1010 matching lines @@
       var hits = _hits[line.line];
       line.hits = hits;
     }
   }
 
   void _addBreakpoint(Breakpoint bpt) {
     var line;
     if (bpt.location.tokenPos != null) {
       line = tokenToLine(bpt.location.tokenPos);
     } else {
-      line = bpt.location.line;
+      UnresolvedSourceLocation loc = bpt.location;
+      line = loc.line;
     }
     getLine(line).addBreakpoint(bpt);
   }
 
   void _removeBreakpoint(Breakpoint bpt) {
     var line;
     if (bpt.location.tokenPos != null) {
       line = tokenToLine(bpt.location.tokenPos);
     } else {
-      line = bpt.location.line;
+      UnresolvedSourceLocation loc = bpt.location;
+      line = loc.line;
     }
     if (line != null) {
       getLine(line).removeBreakpoint(bpt);
     }
   }
 
   List<LocalVarLocation> scanLineForLocalVariableLocations(Pattern pattern,
                                                             String name,
                                                             String lineContents,
                                                             int lineNumber,
@@ skipping 909 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);
     }
   }
 }