Omnibus Observatory UI fixes:

runtime/observatory/lib/src/elements/instance_view.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 instance_view_element;
 
 import 'dart:async';
 import 'dart:html';
 import 'package:observatory/models.dart' as M;
 import 'package:observatory/src/elements/class_ref.dart';
@@ skipping 46 matching lines @@
   RenderingScheduler<InstanceViewElement> _r;
 
   Stream<RenderedEvent<InstanceViewElement>> get onRendered => _r.onRendered;
 
   M.VM _vm;
   M.IsolateRef _isolate;
   M.EventRepository _events;
   M.NotificationRepository _notifications;
   M.Instance _instance;
   M.LibraryRef _library;
-  M.InstanceRepository _instances;
+  M.ObjectRepository _objects;
   M.ClassRepository _classes;
   M.RetainedSizeRepository _retainedSizes;
   M.ReachableSizeRepository _reachableSizes;
   M.InboundReferencesRepository _references;
   M.RetainingPathRepository _retainingPaths;
   M.ScriptRepository _scripts;
   M.EvalRepository _eval;
   M.TypeArguments _typeArguments;
   M.TypeArgumentsRepository _arguments;
   M.BreakpointRepository _breakpoints;
   M.FunctionRepository _functions;
   M.SourceLocation _location;
 
   M.VMRef get vm => _vm;
   M.IsolateRef get isolate => _isolate;
   M.NotificationRepository get notifications => _notifications;
   M.Instance get instance => _instance;
 
   factory InstanceViewElement(
       M.VM vm,
       M.IsolateRef isolate,
       M.Instance instance,
       M.EventRepository events,
       M.NotificationRepository notifications,
-      M.InstanceRepository instances,
+      M.ObjectRepository objects,
       M.ClassRepository classes,
       M.RetainedSizeRepository retainedSizes,
       M.ReachableSizeRepository reachableSizes,
       M.InboundReferencesRepository references,
       M.RetainingPathRepository retainingPaths,
       M.ScriptRepository scripts,
       M.EvalRepository eval,
       M.TypeArgumentsRepository arguments,
       M.BreakpointRepository breakpoints,
       M.FunctionRepository functions,
       {RenderingQueue queue}) {
     assert(vm != null);
     assert(isolate != null);
     assert(events != null);
     assert(notifications != null);
     assert(instance != null);
-    assert(instances != null);
+    assert(objects != null);
     assert(classes != null);
     assert(retainedSizes != null);
     assert(reachableSizes != null);
     assert(references != null);
     assert(retainingPaths != null);
     assert(scripts != null);
     assert(eval != null);
     assert(arguments != null);
     assert(breakpoints != null);
     assert(functions != null);
     InstanceViewElement e = document.createElement(tag.name);
     e._r = new RenderingScheduler(e, queue: queue);
     e._vm = vm;
     e._isolate = isolate;
     e._events = events;
     e._notifications = notifications;
     e._instance = instance;
-    e._instances = instances;
+    e._objects = objects;
     e._classes = classes;
     e._retainedSizes = retainedSizes;
     e._reachableSizes = reachableSizes;
     e._references = references;
     e._retainingPaths = retainingPaths;
     e._scripts = scripts;
     e._eval = eval;
     e._arguments = arguments;
     e._breakpoints = breakpoints;
     e._functions = functions;
@@ skipping 17 matching lines @@
   }
 
   void render() {
     final content = [
       new HeadingElement.h2()
         ..text = M.isAbstractType(_instance.kind)
             ? 'type ${_instance.name}'
             : 'instance of ${_instance.clazz.name}',
       new HRElement(),
       new ObjectCommonElement(_isolate, _instance, _retainedSizes,
-          _reachableSizes, _references, _retainingPaths, _instances,
+          _reachableSizes, _references, _retainingPaths, _objects,
           queue: _r.queue),
       new BRElement(),
       new DivElement()
         ..classes = ['memberList']
         ..children = _createMembers(),
       new HRElement(),
-      new EvalBoxElement(_isolate, _instance, _instances, _eval,
+      new EvalBoxElement(_isolate, _instance, _objects, _eval,
           quickExpressions: const ['toString()', 'runtimeType'],
           queue: _r.queue)
     ];
     if (_location != null) {
       content.addAll([
         new HRElement(),
-        new SourceInsetElement(
-            _isolate, _location, _scripts, _instances, _events,
+        new SourceInsetElement(_isolate, _location, _scripts, _objects, _events,
             queue: _r.queue)
       ]);
     }
     content.addAll([new HRElement(), new ViewFooterElement(queue: _r.queue)]);
     children = [
       navBar(_createMenu()),
       new DivElement()
         ..classes = ['content-centered-big']
         ..children = content
     ];
@@ skipping 59 matching lines @@
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
             ..classes = ['memberName']
             ..text = 'type arguments',
           new DivElement()
             ..classes = ['memberValue']
             ..children = ([new SpanElement()..text = '< ']
               ..addAll(_typeArguments.types.expand((type) => [
-                    new InstanceRefElement(_isolate, type, _instances,
+                    new InstanceRefElement(_isolate, type, _objects,
                         queue: _r.queue),
                     new SpanElement()..text = ', '
                   ]))
               ..removeLast()
               ..add(new SpanElement()..text = ' >'))
         ]);
     }
     if (_instance.parameterizedClass != null) {
       members.add(new DivElement()
         ..classes = ['memberItem']
@@ skipping 24 matching lines @@
     if (_instance.targetType != null) {
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
             ..classes = ['memberName']
             ..text = 'target type',
           new DivElement()
             ..classes = ['memberValue']
             ..children = [
-              new InstanceRefElement(_isolate, _instance.targetType, _instances,
+              new InstanceRefElement(_isolate, _instance.targetType, _objects,
                   queue: _r.queue)
             ]
         ]);
     }
     if (_instance.bound != null) {
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
             ..classes = ['memberName']
             ..text = 'bound',
           new DivElement()
             ..classes = ['memberValue']
             ..children = [
-              new InstanceRefElement(_isolate, _instance.bound, _instances,
+              new InstanceRefElement(_isolate, _instance.bound, _objects,
                   queue: _r.queue)
             ]
         ]);
     }
     if (_instance.closureFunction != null) {
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
             ..classes = ['memberName']
             ..text = 'closure function',
           new DivElement()
             ..classes = ['memberValue']
             ..children = [
               new FunctionRefElement(_isolate, _instance.closureFunction,
                   queue: _r.queue)
             ]
         ]);
     }
     if (_instance.closureContext != null) {
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
             ..classes = ['memberName']
             ..text = 'closure context',
           new DivElement()
             ..classes = ['memberValue']
             ..children = [
-              new ContextRefElement(_isolate, _instance.closureContext,
+              new ContextRefElement(
+                  _isolate, _instance.closureContext, _objects,
                   queue: _r.queue)
             ]
         ]);
     }
     if (_instance.kind == M.InstanceKind.closure) {
       ButtonElement btn;
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
@@ skipping 64 matching lines @@
                 ..content = [
                   new DivElement()
                     ..classes = ['memberList']
                     ..children = fields
                         .map((f) => new DivElement()
                           ..classes = ['memberItem']
                           ..children = [
                             new DivElement()
                               ..classes = ['memberName']
                               ..children = [
-                                new FieldRefElement(
-                                    _isolate, f.decl, _instances,
+                                new FieldRefElement(_isolate, f.decl, _objects,
                                     queue: _r.queue)
                               ],
                             new DivElement()
                               ..classes = ['memberValue']
                               ..children = [
                                 new SpanElement()..text = ' = ',
-                                anyRef(_isolate, f.value, _instances,
+                                anyRef(_isolate, f.value, _objects,
                                     queue: _r.queue)
                               ]
                           ])
                         .toList()
                 ]
             ]
         ]);
     }
 
     if (_instance.elements != null && _instance.elements.isNotEmpty) {
@@ skipping 16 matching lines @@
                     ..children = elements
                         .map((element) => new DivElement()
                           ..classes = ['memberItem']
                           ..children = [
                             new DivElement()
                               ..classes = ['memberName']
                               ..text = '[ ${i++} ]',
                             new DivElement()
                               ..classes = ['memberValue']
                               ..children = [
-                                anyRef(_isolate, element, _instances,
+                                anyRef(_isolate, element, _objects,
                                     queue: _r.queue)
                               ]
                           ])
                         .toList()
                 ]
             ]
         ]);
       if (_instance.length != elements.length) {
         members.add(new DivElement()
           ..classes = ['memberItem']
@@ skipping 25 matching lines @@
                   new DivElement()
                     ..classes = ['memberList']
                     ..children = associations
                         .map((a) => new DivElement()
                           ..classes = ['memberItem']
                           ..children = [
                             new DivElement()
                               ..classes = ['memberName']
                               ..children = [
                                 new SpanElement()..text = '[ ',
-                                anyRef(_isolate, a.key, _instances,
+                                anyRef(_isolate, a.key, _objects,
                                     queue: _r.queue),
                                 new SpanElement()..text = ' ]',
                               ],
                             new DivElement()
                               ..classes = ['memberValue']
                               ..children = [
-                                anyRef(_isolate, a.value, _instances,
+                                anyRef(_isolate, a.value, _objects,
                                     queue: _r.queue)
                               ]
                           ])
                         .toList()
                 ]
             ]
         ]);
       if (_instance.length != associations.length) {
         members.add(new DivElement()
           ..classes = ['memberItem']
@@ skipping 60 matching lines @@
       members.addAll([
         new DivElement()
           ..classes = ['memberItem']
           ..children = [
             new DivElement()
               ..classes = ['memberName']
               ..text = 'pattern',
             new DivElement()
               ..classes = ['memberValue']
               ..children = [
-                anyRef(_isolate, _instance.pattern, _instances, queue: _r.queue)
+                anyRef(_isolate, _instance.pattern, _objects, queue: _r.queue)
               ]
           ],
         new DivElement()
           ..classes = ['memberItem']
           ..children = [
             new DivElement()
               ..classes = ['memberName']
               ..text = 'isCaseSensitive',
             new DivElement()
               ..classes = ['memberValue']
@@ skipping 66 matching lines @@
         new DivElement()
           ..classes = ['memberItem']
           ..children = [
             new DivElement()
               ..classes = ['memberName']
               ..text = 'oneByteBytecode',
             new DivElement()
               ..classes = ['memberValue']
               ..children = [
                 new InstanceRefElement(
-                    _isolate, _instance.oneByteBytecode, _instances,
+                    _isolate, _instance.oneByteBytecode, _objects,
                     queue: _r.queue)
               ]
           ],
         new DivElement()
           ..classes = ['memberItem']
           ..children = [
             new DivElement()
               ..classes = ['memberName']
               ..text = 'twoByteBytecode',
             new DivElement()
               ..classes = ['memberValue']
               ..children = [
                 new InstanceRefElement(
-                    _isolate, _instance.twoByteBytecode, _instances,
+                    _isolate, _instance.twoByteBytecode, _objects,
                     queue: _r.queue)
               ]
           ]
       ]);
     }
 
     if (_instance.kind == M.InstanceKind.mirrorReference) {
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
             ..classes = ['memberName']
             ..text = 'referent',
           new DivElement()
             ..classes = ['memberValue']
             ..children = [
-              new ContextRefElement(_isolate, _instance.referent,
-                  queue: _r.queue)
+              anyRef(_isolate, _instance.referent, _objects, queue: _r.queue)
             ]
         ]);
     }
     if (_instance.kind == M.InstanceKind.weakProperty) {
       members.addAll([
         new DivElement()
           ..classes = ['memberItem']
           ..children = [
             new DivElement()
               ..classes = ['memberName']
               ..text = 'key',
             new DivElement()
               ..classes = ['memberValue']
               ..children = [
-                new InstanceRefElement(_isolate, _instance.key, _instances,
+                new InstanceRefElement(_isolate, _instance.key, _objects,
                     queue: _r.queue),
               ]
           ],
         new DivElement()
           ..classes = ['memberItem']
           ..children = [
             new DivElement()
               ..classes = ['memberName']
               ..text = 'value',
             new DivElement()
               ..classes = ['memberValue']
               ..children = [
-                new InstanceRefElement(_isolate, _instance.value, _instances,
+                new InstanceRefElement(_isolate, _instance.value, _objects,
                     queue: _r.queue),
               ]
           ]
       ]);
     }
     return members;
   }
 
   Future _refresh() async {
-    _instance = await _instances.get(_isolate, _instance.id);
+    _instance = await _objects.get(_isolate, _instance.id);
     await _loadExtraData();
     _r.dirty();
   }
 
   Future _loadExtraData() async {
     _library = (await _classes.get(_isolate, _instance.clazz.id)).library;
     if (_instance.typeArguments != null) {
       _typeArguments =
           await _arguments.get(_isolate, _instance.typeArguments.id);
     } else {
@@ skipping 11 matching lines @@
 
   Future _toggleBreakpoint() async {
     if (_instance.activationBreakpoint == null) {
       await _breakpoints.addOnActivation(_isolate, _instance);
     } else {
       await _breakpoints.remove(_isolate, _instance.activationBreakpoint);
     }
     await _refresh();
   }
 }