Access parameter data in Annotations, as well as fixed export visibility

pkg/docgen/lib/src/models/annotation.dart

Index: pkg/docgen/lib/src/models/annotation.dart
diff --git a/pkg/docgen/lib/src/models/annotation.dart b/pkg/docgen/lib/src/models/annotation.dart
index 86cd274e8cae8ec96d7908b4112180e82cd436fe..b62e4d21b47d7d11c1ef4b6e3c1df7e50204ef66 100644
--- a/pkg/docgen/lib/src/models/annotation.dart
+++ b/pkg/docgen/lib/src/models/annotation.dart
@@ -4,24 +4,38 @@
 
 library docgen.models.annotation;
 
-import '../exports/mirrors_util.dart' as dart2js_util;
 import '../exports/source_mirrors.dart';
 
+import '../exports/dart2js_mirrors.dart' show ResolvedNode;
+
 import '../library_helpers.dart';
 
 import 'library.dart';
 import 'mirror_based.dart';
 
+import 'dart:mirrors';
+import '../../../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart';
+
 /// Holds the name of the annotation, and its parameters.
 class Annotation extends MirrorBased<ClassMirror> {
   /// The class of this annotation.
-  final ClassMirror mirror;
+  Mirror mirror;
   final Library owningLibrary;
-  final List<String> parameters;
+  List<String> parameters;
+
+  Annotation(ResolvedNode resolvedNode, this.owningLibrary) {
+    parameters = [];
+    getMirrorForResolvedNode(resolvedNode, (m) => mirror = m,
+        (String param) => parameters.add(param));
+  }
 
-  Annotation(InstanceMirror originalMirror, this.owningLibrary)
-      : mirror = originalMirror.type,
-        parameters = _createParamaters(originalMirror);
+  String getMirrorForResolvedNode(ResolvedNode node, callbackFunc,
+      paramCallbackFunc) {
+    ResolvedNodeMirrorFinder finder = new ResolvedNodeMirrorFinder(node,
+        callbackFunc, paramCallbackFunc);
+    finder.unparse(node.node);
+    return finder.result;
+  }
 
   Map toMap() => {
     'name': getDocgenObject(mirror, owningLibrary).docName,
@@ -29,28 +43,49 @@ class Annotation extends MirrorBased<ClassMirror> {
   };
 }
 
-List<String> _createParamaters(InstanceMirror originalMirror) {
-  var curMirror = originalMirror.type;
-  Map<Symbol, DeclarationMirror> allDeclarations =
-      new Map.from(curMirror.declarations);
-  // This method assumes that our users aren't creating deep inheritance
-  // chains of custom annotation inheritance. If this is not the case,
-  // re-write this section for performance.
-  while (curMirror.superclass !=  null &&
-      curMirror.superclass.simpleName.toString() != 'Object') {
-    allDeclarations.addAll(curMirror.superclass.declarations);
-    curMirror = curMirror.superclass;
+class ResolvedNodeMirrorFinder extends Unparser {
+  final ResolvedNode resolvedNode;
+  final Function annotationMirrorCallback;
+  final Function parameterValueCallback;
+  int recursionLevel;
+
+  ResolvedNodeMirrorFinder(this.resolvedNode, this.annotationMirrorCallback,
+      this.parameterValueCallback) : recursionLevel = 0;
+
+  visitSend(Send node) {
+    var m = resolvedNode.resolvedMirror(node);
+    annotationMirrorCallback(m);
+    recursionLevel++;
+    visit(node.argumentsNode);
+    recursionLevel--;
+  }
+
+  unparseNodeListFrom(NodeList node, var from) {
+    if (from.isEmpty) return;
+
+    visit(from.head);
+
+    for (var link = from.tail; !link.isEmpty; link = link.tail) {
+      if (recursionLevel == 2) {
+        parameterValueCallback(sb.toString());
+        sb.clear();
+      }
+      visit(link.head);
+    }
+    if (recursionLevel == 2) {
+      parameterValueCallback(sb.toString());
+      sb.clear();
+    }
   }
 
-  // TODO(efortuna): Some originalMirrors, such as the
-  // Dart2JsMapConstantMirror and Dart2JsListConstantMirror don't have a
-  // reflectee field, but we want the value of the parameter from them.
-  // Gross workaround is to assemble the object manually.
-  // See issue 18346.
-  return dart2js_util.variablesOf(allDeclarations)
-      .where((e) => e.isFinal &&
-      originalMirror.getField(e.simpleName).hasReflectee)
-        .map((e) => originalMirror.getField(e.simpleName).reflectee)
-        .where((e) => e != null)
-        .toList();
+  visitNodeList(NodeList node) {
+    addToken(node.beginToken);
+    if (recursionLevel == 1) sb.clear();
+    if (node.nodes != null) {
+      recursionLevel++;
+      unparseNodeListFrom(node, node.nodes);
+      recursionLevel--;
+    }
+    if (node.endToken != null) add(node.endToken.value);
+  }
 }