Fix Observatory code coverage

runtime/bin/vmservice/client/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;
 
 /// A [ServiceObject] is an object known to the VM service and is tied
 /// to an owning [Isolate].
 abstract class ServiceObject extends Observable {
   /// The owner of this [ServiceObject].  This can be an [Isolate], a
@@ skipping 240 matching lines @@
       });
   }
 
   Future<ServiceObject> get(String id) {
     assert(id.startsWith('/') == false);
     // Isolates are handled specially, since they can cache sub-objects.
     if (id.startsWith(_isolatesPrefix)) {
       String isolateId = _parseIsolateId(id);
       String objectId = _parseObjectId(id);
       return _getIsolate(isolateId).then((isolate) {
-          if (isolate == null) {
-            // The isolate does not exist.  Return the VM object instead.
-            //
-            // TODO(turnidge): Generate a service error?
-            return this;
-          }
-          if (objectId == null) {
-            return isolate.reload();
-          } else {
-            return isolate.get(objectId);
-          }
-        });
+        if (isolate == null) {
+          // The isolate does not exist.  Return the VM object instead.
+          //
+          // TODO(turnidge): Generate a service error?
+          return this;
+        }
+        if (objectId == null) {
+          return isolate.reload();
+        } else {
+          return isolate.get(objectId);
+        }
+      });
     }
 
     var obj = _cache[id];
     if (obj != null) {
       return obj.reload();
     }
 
     // Cache miss.  Get the object from the vm directly.
     return getAsMap(id).then((ObservableMap map) {
       var obj = new ServiceObject._fromMap(this, map);
@@ skipping 829 matching lines @@
   }
 
   void _addToChildren(Class cls) {
     if (children.contains(cls)) {
       return;
     }
     children.add(cls);
   }
 }
 
-class ScriptLine {
-  @reflectable final int line;
-  @reflectable final String text;
+class ScriptLine extends Observable {
+  final int line;
+  final String text;
+  @observable int hits;
   ScriptLine(this.line, this.text);
 }
 
 class Script extends ServiceObject {
-  @reflectable final lines = new ObservableList<ScriptLine>();
-  @reflectable final hits = new ObservableMap<int, int>();
+  final lines = new ObservableList<ScriptLine>();
+  final _hits = new Map<int, int>();
   @observable String kind;
   @observable int firstTokenPos;
   @observable int lastTokenPos;
   bool get canCache => true;
   bool get immutable => true;
 
   String _shortUrl;
   String _url;
 
   Script._empty(ServiceObjectOwner owner) : super._empty(owner);
@@ skipping 48 matching lines @@
               lastTokenPos : tokenOffset;
         }
         _tokenToLine[tokenOffset] = lineNumber;
         _tokenToCol[tokenOffset] = colNumber;
       }
     }
   }
 
   void _processHits(List scriptHits) {
     // Update hits table.
+    _hits.clear();
     for (var i = 0; i < scriptHits.length; i += 2) {
       var line = scriptHits[i];
       var hit = scriptHits[i + 1]; // hit status.
       assert(line >= 1); // Lines start at 1.
-      hits[line] = hit;
+      _hits[line] = hit;
     }
+    _applyHitsToLines();
   }
 
   void _processSource(String source) {
     // Preemptyively mark that this is not loaded.
     _loaded = false;
     if (source == null) {
       return;
     }
     var sourceLines = source.split('\n');
     if (sourceLines.length == 0) {
       return;
     }
     // We have the source to the script. This is now loaded.
     _loaded = true;
     lines.clear();
     Logger.root.info('Adding ${sourceLines.length} source lines for ${_url}');
     for (var i = 0; i < sourceLines.length; i++) {
       lines.add(new ScriptLine(i + 1, sourceLines[i]));
     }
+    _applyHitsToLines();
+  }
+
+  void _applyHitsToLines() {
+    if (lines.length == 0) {
+      return;
+    }
+    for (var line in lines) {
+      var hits = _hits[line.line];
+      line.hits = hits;
+    }
   }
 }
 
 class CodeTick {
   final int address;
   final int exclusiveTicks;
   final int inclusiveTicks;
   CodeTick(this.address, this.exclusiveTicks, this.inclusiveTicks);
 }
 
@@ skipping 566 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);
     }
   }
 }