Make declaration annotations direct links; update annotations after the library's declarations are …

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 'observatory_element.dart';
 import 'service_ref.dart';
@@ skipping 25 matching lines @@
     if (infoBox == null) buildInfoBox();  // Created lazily on the first click.
     infoBox.style.display = show ? 'block' : 'none';
     content.style.backgroundColor = show ? 'white' : originalBackground;
   });
 
   // Causes infoBox to be positioned relative to the bottom-left of content.
   content.style.display = 'inline-block';
   content.style.cursor = 'pointer';
 }
 
+
+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> {
   int line;
   int columnStart;
   int columnStop;
 
   void applyStyleTo(element);
 
   int compareTo(Annotation other) {
     if (line == other.line) {
       return columnStart.compareTo(other.columnStart);
@@ skipping 38 matching lines @@
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
     element.classes.add("currentCol");
     element.title = "Current execution";
   }
 }
 
 class LibraryAnnotation extends Annotation {
   Library target;
-  LibraryAnnotation(this.target);
+  String url;
+  LibraryAnnotation(this.target, this.url);
 
   void applyStyleTo(element) {
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
-    element.style.fontWeight = "bold";
     element.title = "library ${target.uri}";
-
-    addInfoBox(element, () {
-      var details = table();
-      var r = row();
-      r.append(cell("Library"));
-      r.append(cell(serviceRef(target)));
-      details.append(r);
-
-      return details;
-    });
+    addLink(element, url);
   }
 }
 
 class PartAnnotation extends Annotation {
   Script part;
-  PartAnnotation(this.part);
+  String url;
+  PartAnnotation(this.part, this.url);
 
   void applyStyleTo(element) {
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
-    element.style.fontWeight = "bold";
     element.title = "script ${part.uri}";
-
-    addInfoBox(element, () {
-      var details = table();
-      var r = row();
-      r.append(cell("Script"));
-      r.append(cell(serviceRef(part)));
-      details.append(r);
-
-      return details;
-    });
+    addLink(element, url);
   }
 }
 
 class LocalVariableAnnotation extends Annotation {
   final value;
 
   LocalVariableAnnotation(LocalVarLocation location, this.value) {
     line = location.line;
     columnStart = location.column;
     columnStop = location.endColumn;
@@ skipping 45 matching lines @@
           r.append(cell(serviceRef(entry.target)));
           details.append(r);
         }
       }
       return details;
     });
   }
 }
 
 abstract class DeclarationAnnotation extends Annotation {
-  DeclarationAnnotation(decl) {
+  String url;
+  DeclarationAnnotation(decl, this.url) {
     assert(decl.loaded);
     SourceLocation location = decl.location;
     if (location == null) {
       line = 0;
       columnStart = 0;
       columnStop = 0;
       return;
     }
 
     Script script = location.script;
@@ skipping 16 matching lines @@
         columnStart = betterStart;
       }
       columnStop = columnStart + decl.name.length;
     }
   }
 }
 
 class ClassDeclarationAnnotation extends DeclarationAnnotation {
   Class klass;
 
-  ClassDeclarationAnnotation(Class cls) : klass = cls, super(cls);
+  ClassDeclarationAnnotation(Class cls, String url)
+    : klass = cls,
+      super(cls, url);
 
   void applyStyleTo(element) {
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
-    element.style.fontWeight = "bold";
     element.title = "class ${klass.name}";
-
-    addInfoBox(element, () {
-      var details = table();
-      var r = row();
-      r.append(cell("Class"));
-      r.append(cell(serviceRef(klass)));
-      details.append(r);
-
-      return details;
-    });
+    addLink(element, url);
   }
 }
 
 class FieldDeclarationAnnotation extends DeclarationAnnotation {
   Field field;
 
-  FieldDeclarationAnnotation(Field fld) : field = fld, super(fld);
+  FieldDeclarationAnnotation(Field fld, String url)
+    : field = fld,
+      super(fld, url);
 
   void applyStyleTo(element) {
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
-    element.style.fontWeight = "bold";
-    element.title = "field ${field.name}";
-
-    addInfoBox(element, () {
-      var details = table();
-      var r = row();
-      r.append(cell("Field"));
-      r.append(cell(serviceRef(field)));
-      details.append(r);
-
-      if (field.isStatic) {
-        if (field.loaded) {
-          r = row();
-          r.append(cell("Value"));
-          r.append(cell(serviceRef(field.staticValue)));
-          details.append(r);
-        }
-      } else {
-        r = row();
-        r.append(cell("Nullable"));
-        r.append(cell(field.guardNullable ? "null observed"
-                                          : "null not observed"));
-        details.append(r);
-
-        r = row();
-        r.append(cell("Types"));
-        if (field.guardClass == "dynamic") {
-          r.append(cell("various"));
-        } else if (field.guardClass == "unknown") {
-          r.append(cell("none"));
-        } else {
-          r.append(cell(serviceRef(field.guardClass)));
-        }
-        details.append(r);
-      }
-
-      return details;
-    });
+    var tooltip = "field ${field.name}";
+    element.title = tooltip;
+    addLink(element, url);
   }
 }
 
 class FunctionDeclarationAnnotation extends DeclarationAnnotation {
   ServiceFunction function;
 
-  FunctionDeclarationAnnotation(ServiceFunction func)
-    : function = func, super(func);
+  FunctionDeclarationAnnotation(ServiceFunction func, String url)
+    : function = func,
+      super(func, url);
 
   void applyStyleTo(element) {
     if (element == null) {
       return;  // TODO(rmacnak): Handling overlapping annotations.
     }
-    element.style.fontWeight = "bold";
-    element.title = "method ${function.name}";
+    var tooltip = "method ${function.name}";
+    if (function.isOptimizable == false) {
+      tooltip += "\nUnoptimizable!";
+    }
+    if (function.isInlinable == false) {
+      tooltip += "\nNot inlinable!";
+    }
+    if (function.deoptimizations > 0) {
+      tooltip += "\nDeoptimized ${function.deoptimizations} times!";
+    }
+    element.title = tooltip;
 
     if (function.isOptimizable == false ||
         function.isInlinable == false ||
         function.deoptimizations >0) {
       element.style.backgroundColor = "red";
     }
 
-    addInfoBox(element, () {
-      var details = table();
-      var r = row();
-      r.append(cell("Function"));
-      r.append(cell(serviceRef(function)));
-      details.append(r);
-
-      r = row();
-      r.append(cell("Usage Count"));
-      r.append(cell("${function.usageCounter}"));
-      details.append(r);
-
-      if (function.isOptimizable == false) {
-        details.append(row(cell("Unoptimizable!")));
-      }
-      if (function.isInlinable == false) {
-        details.append(row(cell("Not inlinable!")));
-      }
-      if (function.deoptimizations > 0) {
-        details.append(row("Deoptimized ${function.deoptimizations} times!"));
-      }
-      return details;
-    });
+    addLink(element, url);
   }
 }
 
 /// Box with script source code in it.
 @CustomTag('script-inset')
 class ScriptInsetElement extends ObservatoryElement {
   @published Script script;
   @published int startPos;
   @published int endPos;
 
   /// Set the height to make the script inset scroll.  Otherwise it
   /// will show from startPos to endPos.
   @published String height = null;
 
   @published int currentPos;
   @published bool inDebuggerContext = false;
   @published ObservableList variables;
 
   int _currentLine;
   int _currentCol;
   int _startLine;
   int _endLine;
 
   var annotations = [];
   var annotationsCursor;
 
   StreamSubscription scriptChangeSubscription;
 
+  bool hasLoadedLibraryDeclarations = false;
+
   String makeLineId(int line) {
     return 'line-$line';
   }
 
   void _scrollToCurrentPos() {
     var line = querySelector('#${makeLineId(_currentLine)}');
     if (line != null) {
       line.scrollIntoView();
     }
   }
@@ skipping 97 matching lines @@
 
     _endLine = (endPos != null
                 ? script.tokenToLine(endPos)
                 : script.lines.length + script.lineOffset);
 
     annotations.clear();
 
     addCurrentExecutionAnnotation();
 
     if (!inDebuggerContext && script.library != null) {
-      loadDeclarationsOfLibrary(script.library);
-      addLibraryAnnotations();
-      addDependencyAnnotations();
-      addPartAnnotations();
-      addClassAnnotations();
-      addFieldAnnotations();
-      addFunctionAnnotations();
-      addCallSiteAnnotations();
+      if (hasLoadedLibraryDeclarations) {
+        addLibraryAnnotations();
+        addDependencyAnnotations();
+        addPartAnnotations();
+        addClassAnnotations();
+        addFieldAnnotations();
+        addFunctionAnnotations();
+        addCallSiteAnnotations();
+      } else {
+        loadDeclarationsOfLibrary(script.library).then((_) {
+          hasLoadedLibraryDeclarations = true;
+          update();
+        });
+      }
     }
 
     addLocalVariableAnnotations();
 
     annotations.sort();
   }
 
   void addCurrentExecutionAnnotation() {
     if (_currentLine != null) {
       var a = new CurrentExecutionAnnotation();
       a.line = _currentLine;
       a.columnStart = _currentCol;
       a.columnStop = _currentCol + 1;
       annotations.add(a);
     }
   }
 
-  void loadDeclarationsOfLibrary(Library lib) {
-    lib.load().then((lib) {
+  Future loadDeclarationsOfLibrary(Library lib) {
+    return lib.load().then((lib) {
+      var loads = [];
       for (var func in lib.functions) {
-        func.load();
+        loads.add(func.load());
       }
       for (var field in lib.variables) {
-        field.load();
+        loads.add(field.load());
       }
       for (var cls in lib.classes) {
-        cls.load().then((cls) {
-          for (var func in cls.functions) {
-            func.load();
-          }
-          for (var field in cls.fields) {
-            field.load();
-          }
-        });
+        loads.add(loadDeclarationsOfClass(cls));
       }
+      return Future.wait(loads);
     });
   }
 
+  Future loadDeclarationsOfClass(Class cls) {
+    return cls.load().then((cls) {
+      var loads = [];
+      for (var func in cls.functions) {
+        loads.add(func.load());
+      }
+      for (var field in cls.fields) {
+        loads.add(field.load());
+      }
+      return Future.wait(loads);
+    });
+  }
+
+  String inspectLink(ServiceObject ref) {
+    return gotoLink('/inspect', ref);
+  }
+
   void addLibraryAnnotations() {
     for (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(script.library);
+        var anno = new LibraryAnnotation(script.library,
+                                         inspectLink(script.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(script.library);
+        var anno = new LibraryAnnotation(script.library,
+                                         inspectLink(script.library));
         anno.line = line.line;
         anno.columnStart = match.start + 8;
         anno.columnStop = match.end;
         annotations.add(anno);
       }
     }
   }
 
   Library resolveDependency(String relativeUri) {
     var targetUri = Uri.parse(script.library.uri).resolve(relativeUri);
@@ skipping 13 matching lines @@
       new RegExp('import "(.*)"'),
       new RegExp("export '(.*)'"),
       new RegExp('export "(.*)"'),
     ];
     for (ScriptLine line in script.lines) {
       for (var pattern in patterns) {
         var match = pattern.firstMatch(line.text);
         if (match != null) {
           Library target = resolveDependency(match[1]);
           if (target != null) {
-            var anno = new LibraryAnnotation(target);
+            var anno = new LibraryAnnotation(target, inspectLink(target));
             anno.line = line.line;
             anno.columnStart = match.start + 8;
             anno.columnStop = match.end - 1;
             annotations.add(anno);
           }
         }
       }
     }
   }
 
@@ skipping 18 matching lines @@
     var patterns = [
       new RegExp("part '(.*)'"),
       new RegExp('part "(.*)"'),
     ];
     for (ScriptLine line in script.lines) {
       for (var pattern in patterns) {
         var match = pattern.firstMatch(line.text);
         if (match != null) {
           Script part = resolvePart(match[1]);
           if (part != null) {
-            var anno = new PartAnnotation(part);
+            var anno = new PartAnnotation(part, inspectLink(part));
             anno.line = line.line;
             anno.columnStart = match.start + 6;
             anno.columnStop = match.end - 1;
             annotations.add(anno);
           }
         }
       }
     }
   }
 
   void addClassAnnotations() {
     for (var cls in script.library.classes) {
       if ((cls.location != null) && (cls.location.script == script)) {
-        annotations.add(new ClassDeclarationAnnotation(cls));
+        var a = new ClassDeclarationAnnotation(cls, inspectLink(cls));
+        annotations.add(a);
       }
     }
   }
 
   void addFieldAnnotations() {
     for (var field in script.library.variables) {
       if ((field.location != null) && (field.location.script == script)) {
-        annotations.add(new FieldDeclarationAnnotation(field));
+        var a = new FieldDeclarationAnnotation(field, inspectLink(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)) {
-          annotations.add(new FieldDeclarationAnnotation(field));
+          var a = new FieldDeclarationAnnotation(field, inspectLink(field));
+          annotations.add(a);
         }
       }
     }
   }
 
   void addFunctionAnnotations() {
     for (var func in script.library.functions) {
       if ((func.location != null) &&
           (func.location.script == script) &&
           (func.kind != FunctionKind.kImplicitGetterFunction) &&
           (func.kind != FunctionKind.kImplicitSetterFunction)) {
         // We annotate a field declaration with the field instead of the
         // implicit getter or setter.
-        annotations.add(new FunctionDeclarationAnnotation(func));
+        var a = new FunctionDeclarationAnnotation(func, inspectLink(func));
+        annotations.add(a);
       }
     }
     for (var cls in script.library.classes) {
       for (var func in cls.functions) {
         if ((func.location != null) &&
             (func.location.script == script) &&
             (func.kind != FunctionKind.kImplicitGetterFunction) &&
             (func.kind != FunctionKind.kImplicitSetterFunction)) {
           // We annotate a field declaration with the field instead of the
           // implicit getter or setter.
-          annotations.add(new FunctionDeclarationAnnotation(func));
+          var a = new FunctionDeclarationAnnotation(func, inspectLink(func));
+          annotations.add(a);
         }
       }
     }
   }
 
   void addCallSiteAnnotations() {
     for (var callSite in script.callSites) {
       annotations.add(new CallSiteAnnotation(callSite));
     }
   }
@@ skipping 223 matching lines @@
 class SourceInsetElement extends PolymerElement {
   SourceInsetElement.created() : super.created();
 
   @published SourceLocation location;
   @published String height = null;
   @published int currentPos;
   @published bool inDebuggerContext = false;
   @published ObservableList variables;
 }