Wrapping leaf nodes in non polymer elements

runtime/observatory/lib/src/elements/script_ref.dart

Index: runtime/observatory/lib/src/elements/script_ref.dart
diff --git a/runtime/observatory/lib/src/elements/script_ref.dart b/runtime/observatory/lib/src/elements/script_ref.dart
index c11f26d7f3146d37d8f88e430b59fef6812a7657..abb161c8649565b38825ed16910451dd9b31ba8a 100644
--- a/runtime/observatory/lib/src/elements/script_ref.dart
+++ b/runtime/observatory/lib/src/elements/script_ref.dart
@@ -4,69 +4,88 @@
 
 library script_ref_element;
 
-import 'package:polymer/polymer.dart';
-import 'package:observatory/service.dart';
-import 'service_ref.dart';
+import 'dart:html';
+import 'dart:async';
+import 'package:observatory/models.dart'
+  show IsolateRef, ScriptRef, Script, ScriptRepository;
+import 'package:observatory/src/elements/helpers/tag.dart';
+import 'package:observatory/src/elements/helpers/rendering_scheduler.dart';
 
-@CustomTag('script-ref')
-class ScriptRefElement extends ServiceRefElement {
-  @published int pos;
+class ScriptRefElement extends HtmlElement implements AsyncRenderable{
+  static const tag = const Tag<ScriptRefElement>('script-ref-wrapped');
 
-  String get hoverText {
-    if (ref == null) {
-      return super.hoverText;
-    }
-    return ref.vmName;
-  }
+  RenderingScheduler _r;
+
+  Stream<RenderedEvent<ScriptRefElement>> get onRendered => _r.onRendered;
 
-  void posChanged(oldValue) {
-    _updateProperties(null);
-  }
 
-  void _updateProperties(_) {
-    if (ref != null && ref.loaded) {
-      notifyPropertyChange(#name, 0, 1);
-      notifyPropertyChange(#url, 0, 1);
+  IsolateRef _isolate;
+  ScriptRef _script;
+  ScriptRepository _repository;
+  int _token;
+
+
+  IsolateRef get isolate => _isolate;
+  ScriptRef get script => _script;
+  int get token => _token;
+
+  set token(int token) {
+    if (_token != token) {
+      _token = token;
+      _r.dirty();
+    } else {
+      _r.scheduleNotification();
     }
   }
 
-  String get name {
-    if (ref == null) {
-      return super.name;
-    }
-    if ((pos != null) && (pos >= 0)) {
-      if (ref.loaded) {
-        // Script is loaded, get the line number.
-        Script script = ref;
-        return '${super.name}:${script.tokenToLine(pos)}:'
-            '${script.tokenToCol(pos)}';
-      } else {
-        ref.load().then(_updateProperties);
-      }
-    }
-    return super.name;
+  factory ScriptRefElement(IsolateRef isolate, ScriptRef script,
+                           ScriptRepository repository, {int token: null}) {
+    assert(isolate != null);
+    assert(script != null);
+    ScriptRefElement e = document.createElement(tag.name);

[Cutch, 2016/07/12 16:24:36]

script.load().then((_) => markAsDirty());

script.load().then((_) async {
  await otherThing.load();
  markAsDirty();
});

+    e._isolate = isolate;
+    e._script = script;
+    e._repository = repository;
+    e._token = token;
+    return e;
   }
 
-  String get url {
-    if (ref == null) {
-      return super.url;
-    }
-    if ((pos != null) && (pos >= 0)) {
-      if (ref.loaded) {
-        return '${super.url}---pos=${pos}';
-      } else {
-        ref.load().then(_updateProperties);
-      }
-    }
-    return super.url;
+  ScriptRefElement.created() : super.created() {
+    _r = new RenderingScheduler<ScriptRefElement>(this);
   }
 
-  ScriptRefElement.created() : super.created();
-}
+  @override
+  void attached() {
+    super.attached();
+    assert(script != null);
+    _r.scheduleRendering();
+  }
 
-@CustomTag('source-link')
-class SourceLinkElement extends PolymerElement {
-  SourceLinkElement.created() : super.created();
+  @override
+  void detached() {
+    super.detached();
+    children = [];
+    _r.scheduleNotification();
+  }
 
-  @published SourceLocation location;
+  Future<RenderingCallback> render() async {
+    String href = '#/inspect?'
+                    'isolateId=${Uri.encodeComponent(isolate.id)}&'
+                    'objectId=${Uri.encodeComponent(script.id)}';
+    String text = script.uri.split('/').last;
+    if (token != null) {
+      final Script script = await _repository.get(_script.id);
+      int line = script.tokenToLine(token);
+      int column = script.tokenToCol(token);
+      text = '${text}:${line}:${column}';
+      href = '${href}---pos=${token}';
+    }
+    return () {
+      children = [
+        new AnchorElement(href: href)
+          ..title = script.uri
+          ..text = text
+      ];
+    };
+  }
 }