Omnibus Observatory UI fixes:

runtime/observatory/lib/src/elements/instance_ref.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.
 
 import 'dart:html';
 import 'dart:async';
 import 'package:observatory/models.dart' as M;
 import 'package:observatory/src/elements/curly_block.dart';
 import 'package:observatory/src/elements/field_ref.dart';
 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 InstanceRefElement extends HtmlElement implements Renderable {
-  static const tag = const Tag<InstanceRefElement>('instance-ref');
+  static const tag = const Tag<InstanceRefElement>('instance-ref',
+      dependencies: const [CurlyBlockElement.tag]);
 
   RenderingScheduler<InstanceRefElement> _r;
 
   Stream<RenderedEvent<InstanceRefElement>> get onRendered => _r.onRendered;
 
   M.IsolateRef _isolate;
   M.InstanceRef _instance;
-  M.InstanceRepository _instances;
+  M.ObjectRepository _objects;
   M.Instance _loadedInstance;
   bool _expanded = false;
 
   M.IsolateRef get isolate => _isolate;
   M.InstanceRef get instance => _instance;
 
-  factory InstanceRefElement(M.IsolateRef isolate, M.InstanceRef instance,
-      M.InstanceRepository instances,
+  factory InstanceRefElement(
+      M.IsolateRef isolate, M.InstanceRef instance, M.ObjectRepository objects,
       {RenderingQueue queue}) {
     assert(isolate != null);
     assert(instance != null);
-    assert(instances != null);
+    assert(objects != null);
     InstanceRefElement e = document.createElement(tag.name);
     e._r = new RenderingScheduler(e, queue: queue);
     e._isolate = isolate;
     e._instance = instance;
-    e._instances = instances;
+    e._objects = objects;
     return e;
   }
 
   InstanceRefElement.created() : super.created();
 
   @override
   void attached() {
     super.attached();
     _r.enable();
   }
@@ skipping 25 matching lines @@
               e.control.disabled = false;
             }
           })
       ]);
     }
 
     children = content;
   }
 
   Future _refresh() async {
-    _loadedInstance = await _instances.get(_isolate, _instance.id);
+    _loadedInstance = await _objects.get(_isolate, _instance.id);
     _r.dirty();
   }
 
   List<Element> _createShowMoreButton() {
     if (_loadedInstance.count == null) {
       return [];
     }
     final count = _loadedInstance.count;
     final button = new ButtonElement()..text = 'show next ${count}';
     button.onClick.listen((_) async {
       button.disabled = true;
       _loadedInstance =
-          await _instances.get(_isolate, _instance.id, count: count * 2);
+          await _objects.get(_isolate, _instance.id, count: count * 2);
       _r.dirty();
     });
     return [button];
   }
 
   List<Element> _createLink() {
     switch (_instance.kind) {
       case M.InstanceKind.vNull:
       case M.InstanceKind.bool:
       case M.InstanceKind.int:
@@ skipping 90 matching lines @@
           new AnchorElement(href: Uris.inspect(_isolate, object: _instance))
             ..classes = ['emphasize']
             ..text = _instance.clazz.name
         ];
     }
     throw new Exception('Unknown InstanceKind: ${_instance.kind}');
   }
 
   bool _hasValue() {
     switch (_instance.kind) {
+      case M.InstanceKind.closure:
       case M.InstanceKind.plainInstance:
       case M.InstanceKind.mirrorReference:
       case M.InstanceKind.stackTrace:
       case M.InstanceKind.weakProperty:
         return true;
       case M.InstanceKind.list:
       case M.InstanceKind.map:
       case M.InstanceKind.uint8ClampedList:
       case M.InstanceKind.uint8List:
       case M.InstanceKind.uint16List:
@@ skipping 12 matching lines @@
       default:
         return false;
     }
   }
 
   List<Element> _createValue() {
     if (_loadedInstance == null) {
       return [new SpanElement()..text = 'Loading...'];
     }
     switch (_instance.kind) {
+      case M.InstanceKind.closure:
+        return [
+          new DivElement()
+            ..children = [
+              new SpanElement()..text = 'function = ',
+              anyRef(_isolate, _loadedInstance.closureFunction, _objects,
+                  queue: _r.queue)
+            ],
+          new DivElement()
+            ..children = [
+              new SpanElement()..text = 'context = ',
+              anyRef(_isolate, _loadedInstance.closureContext, _objects,
+                  queue: _r.queue)
+            ],
+        ];
       case M.InstanceKind.plainInstance:
         return _loadedInstance.fields
             .map((f) => new DivElement()
               ..children = [
-                new FieldRefElement(_isolate, f.decl, _instances,
+                new FieldRefElement(_isolate, f.decl, _objects,
                     queue: _r.queue),
                 new SpanElement()..text = ' = ',
-                anyRef(_isolate, f.value, _instances, queue: _r.queue)
+                anyRef(_isolate, f.value, _objects, queue: _r.queue)
               ])
             .toList();
       case M.InstanceKind.list:
         var index = 0;
         return _loadedInstance.elements
             .map((element) => new DivElement()
               ..children = [
                 new SpanElement()..text = '[ ${index++} ] : ',
-                anyRef(_isolate, element, _instances, queue: _r.queue)
+                anyRef(_isolate, element, _objects, queue: _r.queue)
               ])
             .toList()
               ..addAll(_createShowMoreButton());
       case M.InstanceKind.map:
         return _loadedInstance.associations
             .map((association) => new DivElement()
               ..children = [
                 new SpanElement()..text = '[ ',
-                anyRef(_isolate, association.key, _instances, queue: _r.queue),
+                anyRef(_isolate, association.key, _objects, queue: _r.queue),
                 new SpanElement()..text = ' ] : ',
-                anyRef(_isolate, association.value, _instances, queue: _r.queue)
+                anyRef(_isolate, association.value, _objects, queue: _r.queue)
               ])
             .toList()
               ..addAll(_createShowMoreButton());
       case M.InstanceKind.uint8ClampedList:
       case M.InstanceKind.uint8List:
       case M.InstanceKind.uint16List:
       case M.InstanceKind.uint32List:
       case M.InstanceKind.uint64List:
       case M.InstanceKind.int8List:
       case M.InstanceKind.int16List:
       case M.InstanceKind.int32List:
       case M.InstanceKind.int64List:
       case M.InstanceKind.float32List:
       case M.InstanceKind.float64List:
       case M.InstanceKind.int32x4List:
       case M.InstanceKind.float32x4List:
       case M.InstanceKind.float64x2List:
         var index = 0;
         return _loadedInstance.typedElements
             .map((e) => new DivElement()..text = '[ ${index++} ] : $e')
             .toList()
               ..addAll(_createShowMoreButton());
       case M.InstanceKind.mirrorReference:
         return [
           new SpanElement()..text = '<referent> : ',
-          new InstanceRefElement(_isolate, _loadedInstance.referent, _instances,
-              queue: _r.queue)
+          anyRef(_isolate, _loadedInstance.referent, _objects, queue: _r.queue)
         ];
       case M.InstanceKind.stackTrace:
         return [
           new DivElement()
             ..classes = ['stackTraceBox']
             ..text = _instance.valueAsString
         ];
       case M.InstanceKind.weakProperty:
         return [
           new SpanElement()..text = '<key> : ',
-          new InstanceRefElement(_isolate, _loadedInstance.key, _instances,
+          new InstanceRefElement(_isolate, _loadedInstance.key, _objects,
               queue: _r.queue),
           new BRElement(),
           new SpanElement()..text = '<value> : ',
-          new InstanceRefElement(_isolate, _loadedInstance.value, _instances,
+          new InstanceRefElement(_isolate, _loadedInstance.value, _objects,
               queue: _r.queue),
         ];
       default:
         return [];
     }
   }
 }