Merge branch 'master' of github.com:dart-lang/dartdoc into sl-find-as-you-type

Author: sethladd

lib/markdown_processor.dart

@@ -110,28 +110,29 @@ NodeList<CommentReference> _getCommentRefs(ModelElement modelElement) {
   if (modelElement.documentation == null && modelElement.canOverride()) {
     var melement = modelElement.overriddenElement;
     if (melement != null &&
-        melement.element.node != null &&
-        melement.element.node is AnnotatedNode) {
-      var docComment =
-          (melement.element.node as AnnotatedNode).documentationComment;
+        melement.element.computeNode() != null &&
+        melement.element.computeNode() is AnnotatedNode) {
+      var docComment = (melement.element.computeNode() as AnnotatedNode)
+          .documentationComment;
       if (docComment != null) return docComment.references;
       return null;
     }
   }
-  if (modelElement.element.node is AnnotatedNode) {
-    if ((modelElement.element.node as AnnotatedNode).documentationComment !=
+  if (modelElement.element.computeNode() is AnnotatedNode) {
+    if ((modelElement.element.computeNode() as AnnotatedNode)
+            .documentationComment !=
         null) {
-      return (modelElement.element.node as AnnotatedNode)
+      return (modelElement.element.computeNode() as AnnotatedNode)
           .documentationComment
           .references;
     }
   } else if (modelElement.element is LibraryElement) {
     // handle anonymous libraries
-    if (modelElement.element.node == null ||
-        modelElement.element.node.parent == null) {
+    if (modelElement.element.computeNode() == null ||
+        modelElement.element.computeNode().parent == null) {
       return null;
     }
-    var node = modelElement.element.node.parent.parent;
+    var node = modelElement.element.computeNode().parent.parent;
     if (node is AnnotatedNode) {
       if ((node as AnnotatedNode).documentationComment != null) {
         return (node as AnnotatedNode).documentationComment.references;

lib/resources/styles.css

@@ -214,6 +214,9 @@ dd.callable, dd.constant, dd.property {
 
 dd p {
   margin-top: 4px;
+  white-space: nowrap;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
 }
 
 section.summary h2 {
@@ -513,6 +516,7 @@ span.top-level-variable-type {
   padding: 16px;
 }
 
+.sidebar h5,
 .sidebar ol li {
   text-overflow: ellipsis;
   overflow: hidden;
@@ -563,7 +567,7 @@ button {
   }
 
   #overlay-under-drawer.active {
-    opacity: 0.7;
+    opacity: 0.4;
     height: 100%;
     z-index: 1999;
     position: fixed;

lib/src/model.dart

@@ -172,8 +172,11 @@ abstract class ModelElement implements Comparable, Nameable {
   List<String> get annotations {
     // Check https://code.google.com/p/dart/issues/detail?id=23181
     // If that is fixed, this code might get a lot easier
-    if (element.node != null && element.node is AnnotatedNode) {
-      return (element.node as AnnotatedNode).metadata.map((Annotation a) {
+    if (element.computeNode() != null &&
+        element.computeNode() is AnnotatedNode) {
+      return (element.computeNode() as AnnotatedNode)
+          .metadata
+          .map((Annotation a) {
         var annotationString = a.toSource().substring(1); // remove the @
         var e = a.element;
         if (e != null && (e is ConstructorElement)) {
@@ -1277,7 +1280,7 @@ class Enum extends Class {
 abstract class SourceCodeMixin {
   String get sourceCode {
     String contents = element.source.contents.data;
-    var node = element.node; // TODO: computeNode once we go to 0.25.2
+    var node = element.computeNode(); // TODO: computeNode once we go to 0.25.2
     // find the start of the line, so that we can line up all the indents
     int i = node.offset;
     while (i > 0) {
@@ -1423,8 +1426,8 @@ class Field extends ModelElement implements EnclosedElement {
   String get constantValue {
     if (_constantValue != null) return _constantValue;
 
-    if (_field.node == null) return null;
-    var v = _field.node.toSource();
+    if (_field.computeNode() == null) return null;
+    var v = _field.computeNode().toSource();
     if (v == null) return null;
     var string = v.substring(v.indexOf('=') + 1, v.length).trim();
     _constantValue = string.replaceAll(modelType.name, modelType.linkedName);
@@ -1700,7 +1703,9 @@ class TopLevelVariable extends ModelElement implements EnclosedElement {
   }
 
   String get constantValue {
-    var v = (_variable as ConstTopLevelVariableElementImpl).node.toSource();
+    var v = (_variable as ConstTopLevelVariableElementImpl)
+        .computeNode()
+        .toSource();
     if (v == null) return '';
     var string = v.substring(v.indexOf('=') + 1, v.length).trim();
     return string.replaceAll(modelType.name, modelType.linkedName);

lib/templates/index.html

@@ -1,5 +1,16 @@
 {{>head}}
 
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>{{self.name}}</h5>
+
+    <ol>
+      <li class="section-title"><a href="{{package.href}}#libraries">Libraries</a></li>
+      {{#package.libraries}}
+      <li><a href="{{href}}">{{name}}</a></li>
+      {{/package.libraries}}
+    </ol>
+  </div>
+
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     {{#package}}
@@ -25,15 +36,6 @@ <h2>Libraries</h2>
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
 
-    <h5>{{self.name}}</h5>
-
-    <ol>
-      <li class="section-title"><a href="{{package.href}}#libraries">Libraries</a></li>
-      {{#package.libraries}}
-      <li><a href="{{href}}">{{name}}</a></li>
-      {{/package.libraries}}
-    </ol>
-
   </div><!--/.sidebar-offcanvas-right-->
 
 {{>footer}}