Omnibus Observatory UI fixes:

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:svg';
 import 'package:observatory/app.dart';
 import 'package:observatory/models.dart' as M;
 import 'package:observatory/service.dart' as S;
 import 'package:observatory/src/elements/helpers/any_ref.dart';
 import 'package:observatory/src/elements/helpers/rendering_scheduler.dart';
 import 'package:observatory/src/elements/helpers/tag.dart';
 import 'package:observatory/src/elements/helpers/uris.dart';
 import 'package:observatory/utils.dart';
 
 class ScriptInsetElement extends HtmlElement implements Renderable {
   static const tag = const Tag<ScriptInsetElement>('script-inset');
 
   RenderingScheduler _r;
 
   Stream<RenderedEvent<ScriptInsetElement>> get onRendered => _r.onRendered;
 
   M.IsolateRef _isolate;
   M.ScriptRef _script;
   M.Script _loadedScript;
   M.ScriptRepository _scripts;
-  M.InstanceRepository _instances;
+  M.ObjectRepository _objects;
   M.EventRepository _events;
   StreamSubscription _subscription;
   int _startPos;
   int _endPos;
   int _currentPos;
   bool _inDebuggerContext;
   Iterable _variables;
 
   M.IsolateRef get isolate => _isolate;
   M.ScriptRef get script => _script;
 
   factory ScriptInsetElement(
       M.IsolateRef isolate,
       M.ScriptRef script,
       M.ScriptRepository scripts,
-      M.InstanceRepository instances,
+      M.ObjectRepository objects,
       M.EventRepository events,
       {int startPos,
       int endPos,
       int currentPos,
       bool inDebuggerContext: false,
       Iterable variables: const [],
       RenderingQueue queue}) {
     assert(isolate != null);
     assert(script != null);
     assert(scripts != null);
-    assert(instances != null);
+    assert(objects != null);
     assert(events != null);
     assert(inDebuggerContext != null);
     assert(variables != null);
     ScriptInsetElement e = document.createElement(tag.name);
     e._r = new RenderingScheduler(e, queue: queue);
     e._isolate = isolate;
     e._script = script;
     e._scripts = scripts;
-    e._instances = instances;
+    e._objects = objects;
     e._events = events;
     e._startPos = startPos;
     e._endPos = endPos;
     e._currentPos = currentPos;
     e._inDebuggerContext = inDebuggerContext;
     e._variables = new List.unmodifiable(variables);
     return e;
   }
 
   ScriptInsetElement.created() : super.created();
@@ skipping 242 matching lines @@
       addCallSiteAnnotations();
     }
 
     addLocalVariableAnnotations();
 
     _annotations.sort();
   }
 
   void addCurrentExecutionAnnotation() {
     if (_currentLine != null) {
-      var a = new CurrentExecutionAnnotation(_isolate, _instances, _r.queue);
+      var a = new CurrentExecutionAnnotation(_isolate, _objects, _r.queue);
       a.line = _currentLine;
       a.columnStart = _currentCol;
       S.Script script = _loadedScript as S.Script;
       var length = script.guessTokenLength(_currentLine, _currentCol);
       if (length == null) {
         length = 1;
       }
       a.columnStop = _currentCol + length;
       _annotations.add(a);
     }
   }
 
   void addBreakpointAnnotations() {
     S.Script script = _loadedScript as S.Script;
     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(_isolate, _instances, _r.queue, bpt));
+                new BreakpointAnnotation(_isolate, _objects, _r.queue, bpt));
           }
         }
       }
     }
   }
 
   Future loadDeclarationsOfLibrary(S.Library lib) {
     return lib.load().then((lib) {
       var loads = [];
       for (var func in lib.functions) {
@@ skipping 24 matching lines @@
 
   void addLibraryAnnotations() {
     S.Script script = _loadedScript as S.Script;
     for (S.ScriptLine line in script.lines) {
       // TODO(rmacnak): Use a real scanner.
       var pattern = new RegExp("library ${script.library.name}");
       var match = pattern.firstMatch(line.text);
       if (match != null) {
         var anno = new LibraryAnnotation(
             _isolate,
-            _instances,
+            _objects,
             _r.queue,
             _loadedScript.library,
             Uris.inspect(isolate, object: _loadedScript.library));
         anno.line = line.line;
         anno.columnStart = match.start + 8;
         anno.columnStop = match.end;
         _annotations.add(anno);
       }
       // TODO(rmacnak): Use a real scanner.
       pattern = new RegExp("part of ${script.library.name}");
       match = pattern.firstMatch(line.text);
       if (match != null) {
         var anno = new LibraryAnnotation(
             _isolate,
-            _instances,
+            _objects,
             _r.queue,
             _loadedScript.library,
             Uris.inspect(isolate, object: _loadedScript.library));
         anno.line = line.line;
         anno.columnStart = match.start + 8;
         anno.columnStop = match.end;
         _annotations.add(anno);
       }
     }
   }
@@ skipping 30 matching lines @@
       new RegExp('import "(.*)"'),
       new RegExp("export '(.*)'"),
       new RegExp('export "(.*)"'),
     ];
     for (S.ScriptLine line in script.lines) {
       for (var pattern in patterns) {
         var match = pattern.firstMatch(line.text);
         if (match != null) {
           M.Library target = resolveDependency(match[1]);
           if (target != null) {
-            var anno = new LibraryAnnotation(_isolate, _instances, _r.queue,
+            var anno = new LibraryAnnotation(_isolate, _objects, _r.queue,
                 target, Uris.inspect(isolate, object: target));
             anno.line = line.line;
             anno.columnStart = match.start + 8;
             anno.columnStop = match.end - 1;
             _annotations.add(anno);
           }
         }
       }
     }
   }
@@ skipping 21 matching lines @@
     var patterns = [
       new RegExp("part '(.*)'"),
       new RegExp('part "(.*)"'),
     ];
     for (S.ScriptLine line in script.lines) {
       for (var pattern in patterns) {
         var match = pattern.firstMatch(line.text);
         if (match != null) {
           S.Script part = resolvePart(match[1]);
           if (part != null) {
-            var anno = new PartAnnotation(_isolate, _instances, _r.queue, part,
+            var anno = new PartAnnotation(_isolate, _objects, _r.queue, part,
                 Uris.inspect(isolate, object: part));
             anno.line = line.line;
             anno.columnStart = match.start + 6;
             anno.columnStop = match.end - 1;
             _annotations.add(anno);
           }
         }
       }
     }
   }
 
   void addClassAnnotations() {
     S.Script script = _loadedScript as S.Script;
     for (var cls in script.library.classes) {
       if ((cls.location != null) && (cls.location.script == script)) {
-        var a = new ClassDeclarationAnnotation(_isolate, _instances, _r.queue,
+        var a = new ClassDeclarationAnnotation(_isolate, _objects, _r.queue,
             cls, Uris.inspect(isolate, object: cls));
         _annotations.add(a);
       }
     }
   }
 
   void addFieldAnnotations() {
     S.Script script = _loadedScript as S.Script;
     for (var field in script.library.variables) {
       if ((field.location != null) && (field.location.script == script)) {
-        var a = new FieldDeclarationAnnotation(_isolate, _instances, _r.queue,
+        var a = new FieldDeclarationAnnotation(_isolate, _objects, _r.queue,
             field, Uris.inspect(isolate, object: field));
         _annotations.add(a);
       }
     }
     for (var cls in script.library.classes) {
       for (var field in cls.fields) {
         if ((field.location != null) && (field.location.script == script)) {
-          var a = new FieldDeclarationAnnotation(_isolate, _instances, _r.queue,
+          var a = new FieldDeclarationAnnotation(_isolate, _objects, _r.queue,
               field, Uris.inspect(isolate, object: field));
           _annotations.add(a);
         }
       }
     }
   }
 
   void addFunctionAnnotations() {
     S.Script script = _loadedScript as S.Script;
     for (var func in script.library.functions) {
       if ((func.location != null) &&
           (func.location.script == script) &&
           (func.kind != M.FunctionKind.implicitGetter) &&
           (func.kind != M.FunctionKind.implicitSetter)) {
         // We annotate a field declaration with the field instead of the
         // implicit getter or setter.
-        var a = new FunctionDeclarationAnnotation(_isolate, _instances,
-            _r.queue, func, Uris.inspect(isolate, object: func));
+        var a = new FunctionDeclarationAnnotation(_isolate, _objects, _r.queue,
+            func, Uris.inspect(isolate, object: func));
         _annotations.add(a);
       }
     }
     for (var cls in script.library.classes) {
       S.Script script = _loadedScript as S.Script;
       for (var func in cls.functions) {
         if ((func.location != null) &&
             (func.location.script == script) &&
             (func.kind != M.FunctionKind.implicitGetter) &&
             (func.kind != M.FunctionKind.implicitSetter)) {
           // We annotate a field declaration with the field instead of the
           // implicit getter or setter.
-          var a = new FunctionDeclarationAnnotation(_isolate, _instances,
+          var a = new FunctionDeclarationAnnotation(_isolate, _objects,
               _r.queue, func, Uris.inspect(isolate, object: func));
           _annotations.add(a);
         }
       }
     }
   }
 
   void addCallSiteAnnotations() {
     for (var callSite in _callSites) {
-      _annotations.add(
-          new CallSiteAnnotation(_isolate, _instances, _r.queue, callSite));
+      _annotations
+          .add(new CallSiteAnnotation(_isolate, _objects, _r.queue, callSite));
     }
   }
 
   void addLocalVariableAnnotations() {
     S.Script script = _loadedScript as S.Script;
     // We have local variable information.
     if (_variables != null) {
       // For each variable.
       for (var variable in _variables) {
         // Find variable usage locations.
         var locations = script.scanForLocalVariableLocations(
             variable['name'], variable['_tokenPos'], variable['_endTokenPos']);
 
         // Annotate locations.
         for (var location in locations) {
           _annotations.add(new LocalVariableAnnotation(
-              _isolate, _instances, _r.queue, location, variable['value']));
+              _isolate, _objects, _r.queue, location, variable['value']));
         }
       }
     }
   }
 
   ButtonElement _newRefreshButton() {
     var button = new ButtonElement();
     button.classes = ['refresh'];
     button.onClick.listen((_) async {
       button.disabled = true;
@@ skipping 376 matching lines @@
 void addLink(Element content, String target) {
   // Ick, destructive but still compatible with also adding an info box.
   var a = new AnchorElement(href: target);
   a.text = content.text;
   content.text = '';
   content.append(a);
 }
 
 abstract class Annotation implements Comparable<Annotation> {
   M.IsolateRef _isolate;
-  M.InstanceRepository _instances;
+  M.ObjectRepository _objects;
   RenderingQueue queue;
   int line;
   int columnStart;
   int columnStop;
   int get priority;
 
-  Annotation(this._isolate, this._instances, this.queue);
+  Annotation(this._isolate, this._objects, this.queue);
 
   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);
     }
@@ skipping 19 matching lines @@
   Element cell(content) {
     var e = new DivElement();
     e.style.display = "table-cell";
     e.style.padding = "3px";
     if (content is String) e.text = content;
     if (content is Element) e.children.add(content);
     return e;
   }
 
   Element serviceRef(object) {
-    return anyRef(_isolate, object, _instances, queue: queue);
+    return anyRef(_isolate, object, _objects, queue: queue);
   }
 }
 
 class CurrentExecutionAnnotation extends Annotation {
   int priority = 0; // highest priority.
 
-  CurrentExecutionAnnotation(M.IsolateRef isolate,
-      M.InstanceRepository instances, RenderingQueue queue)
-      : super(isolate, instances, queue);
+  CurrentExecutionAnnotation(
+      M.IsolateRef isolate, M.ObjectRepository objects, RenderingQueue queue)
+      : super(isolate, objects, queue);
 
   void applyStyleTo(element) {
     if (element == null) {
       return; // TODO(rmacnak): Handling overlapping annotations.
     }
     element.classes.add("currentCol");
     element.title = "Current execution";
   }
 }
 
 class BreakpointAnnotation extends Annotation {
   M.Breakpoint bpt;
   int priority = 1;
 
-  BreakpointAnnotation(M.IsolateRef isolate, M.InstanceRepository instances,
+  BreakpointAnnotation(M.IsolateRef isolate, M.ObjectRepository objects,
       RenderingQueue queue, this.bpt)
-      : super(isolate, instances, queue) {
+      : super(isolate, objects, queue) {
     var script = bpt.location.script;
     var location = bpt.location;
     if (location.tokenPos != null) {
       var pos = location.tokenPos;
       line = script.tokenToLine(pos);
       columnStart = script.tokenToCol(pos) - 1; // tokenToCol is 1-origin.
     } else if (location is M.UnresolvedSourceLocation) {
       line = location.line;
       columnStart = location.column;
       if (columnStart == null) {
@@ skipping 22 matching lines @@
     }
     element.title = "Breakpoint ${bpt.number} at ${line}:${column}";
   }
 }
 
 class LibraryAnnotation extends Annotation {
   S.Library target;
   String url;
   int priority = 2;
 
-  LibraryAnnotation(M.IsolateRef isolate, M.InstanceRepository instances,
+  LibraryAnnotation(M.IsolateRef isolate, M.ObjectRepository objects,
       RenderingQueue queue, this.target, this.url)
-      : super(isolate, instances, queue);
+      : super(isolate, objects, queue);
 
   void applyStyleTo(element) {
     if (element == null) {
       return; // TODO(rmacnak): Handling overlapping annotations.
     }
     element.title = "library ${target.uri}";
     addLink(element, url);
   }
 }
 
 class PartAnnotation extends Annotation {
   S.Script part;
   String url;
   int priority = 2;
 
-  PartAnnotation(M.IsolateRef isolate, M.InstanceRepository instances,
+  PartAnnotation(M.IsolateRef isolate, M.ObjectRepository objects,
       RenderingQueue queue, this.part, this.url)
-      : super(isolate, instances, queue);
+      : super(isolate, objects, queue);
 
   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(M.IsolateRef isolate, M.InstanceRepository instances,
+  LocalVariableAnnotation(M.IsolateRef isolate, M.ObjectRepository objects,
       RenderingQueue queue, S.LocalVarLocation location, this.value)
-      : super(isolate, instances, queue) {
+      : super(isolate, objects, queue) {
     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 {
   S.CallSite callSite;
   int priority = 2;
 
-  CallSiteAnnotation(M.IsolateRef isolate, M.InstanceRepository instances,
+  CallSiteAnnotation(M.IsolateRef isolate, M.ObjectRepository objects,
       RenderingQueue queue, this.callSite)
-      : super(isolate, instances, queue) {
+      : super(isolate, objects, queue) {
     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;
     }
     columnStop = columnStart + tokenLength;
   }
@@ skipping 30 matching lines @@
       }
       return details;
     });
   }
 }
 
 abstract class DeclarationAnnotation extends Annotation {
   String url;
   int priority = 2;
 
-  DeclarationAnnotation(M.IsolateRef isolate, M.InstanceRepository instances,
+  DeclarationAnnotation(M.IsolateRef isolate, M.ObjectRepository objects,
       RenderingQueue queue, decl, this.url)
-      : super(isolate, instances, queue) {
+      : super(isolate, objects, queue) {
     assert(decl.loaded);
     S.SourceLocation location = decl.location;
     if (location == null) {
       line = 0;
       columnStart = 0;
       columnStop = 0;
       return;
     }
 
     S.Script script = location.script;
@@ skipping 16 matching lines @@
         columnStart = betterStart;
       }
       columnStop = columnStart + decl.name.length;
     }
   }
 }
 
 class ClassDeclarationAnnotation extends DeclarationAnnotation {
   S.Class klass;
 
-  ClassDeclarationAnnotation(
-      M.IsolateRef isolate,
-      M.InstanceRepository instances,
-      RenderingQueue queue,
-      S.Class cls,
-      String url)
+  ClassDeclarationAnnotation(M.IsolateRef isolate, M.ObjectRepository objects,
+      RenderingQueue queue, S.Class cls, String url)
       : klass = cls,
-        super(isolate, instances, queue, cls, url);
+        super(isolate, objects, queue, cls, url);
 
   void applyStyleTo(element) {
     if (element == null) {
       return; // TODO(rmacnak): Handling overlapping annotations.
     }
     element.title = "class ${klass.name}";
     addLink(element, url);
   }
 }
 
 class FieldDeclarationAnnotation extends DeclarationAnnotation {
   S.Field field;
 
-  FieldDeclarationAnnotation(
-      M.IsolateRef isolate,
-      M.InstanceRepository instances,
-      RenderingQueue queue,
-      S.Field fld,
-      String url)
+  FieldDeclarationAnnotation(M.IsolateRef isolate, M.ObjectRepository objects,
+      RenderingQueue queue, S.Field fld, String url)
       : field = fld,
-        super(isolate, instances, queue, fld, url);
+        super(isolate, objects, queue, fld, url);
 
   void applyStyleTo(element) {
     if (element == null) {
       return; // TODO(rmacnak): Handling overlapping annotations.
     }
     var tooltip = "field ${field.name}";
     element.title = tooltip;
     addLink(element, url);
   }
 }
 
 class FunctionDeclarationAnnotation extends DeclarationAnnotation {
   S.ServiceFunction function;
 
   FunctionDeclarationAnnotation(
       M.IsolateRef isolate,
-      M.InstanceRepository instances,
+      M.ObjectRepository objects,
       RenderingQueue queue,
       S.ServiceFunction func,
       String url)
       : function = func,
-        super(isolate, instances, queue, func, url);
+        super(isolate, objects, queue, func, url);
 
   void applyStyleTo(element) {
     if (element == null) {
       return; // TODO(rmacnak): Handling overlapping annotations.
     }
     var tooltip = "method ${function.name}";
     if (function.isOptimizable == false) {
       tooltip += "\nUnoptimizable!";
     }
     if (function.isInlinable == false) {
@@ skipping 76 matching lines @@
       ..setAttribute(
           'd',
           'M13.5.67s.74 2.65.74 4.8c0 2.06-1.35 3.73-3.41 '
           '3.73-2.07 0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 '
           '4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58 8-8C20 8.61 '
           '17.41 3.8 13.5.67zM11.71 19c-1.78 '
           '0-3.22-1.4-3.22-3.14 0-1.62 1.05-2.76 2.81-3.12 '
           '1.77-.36 3.6-1.21 4.62-2.58.39 1.29.59 2.65.59 '
           '4.04 0 2.65-2.15 4.8-4.8 4.8z')
   ];