Parameters with function types supported + Added features in mirrors implementation

lib/dartdoc/mirrors/dart2js_mirror.dart

 // Copyright (c) 2012, 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('mirrors.dart2js');
 
 #import('../../compiler/compiler.dart', prefix: 'diagnostics');
 #import('../../compiler/implementation/elements/elements.dart');
 #import('../../compiler/implementation/apiimpl.dart', prefix: 'api');
 #import('../../compiler/implementation/scanner/scannerlib.dart');
@@ skipping 18 matching lines @@
   return name.startsWith('_');
 }
 
 List<ParameterMirror> _parametersFromFunctionSignature(
     Dart2JsMirrorSystem system,
     Dart2JsMethodMirror method,
     FunctionSignature signature) {
   var parameters = <ParameterMirror>[];
   Link<Element> link = signature.requiredParameters;
   while (!link.isEmpty()) {
-    parameters.add(new Dart2JsParameterMirror(system, method,
-                                              link.head, false));
+    parameters.add(_convertVariableElementToParameterMirror(
+        system, method, link.head, false));
     link = link.tail;
   }
   link = signature.optionalParameters;
   while (!link.isEmpty()) {
-    parameters.add(new Dart2JsParameterMirror(system, method,
-                                              link.head, true));
+    parameters.add(_convertVariableElementToParameterMirror(
+      system, method, link.head, true));

[floitsch, 2012/07/17 18:53:04]

indent by 4.

[Johnni Winther, 2012/07/18 13:32:50]

Done.

     link = link.tail;
   }
   return parameters;
 }
 
+Dart2JsParameterMirror _convertVariableElementToParameterMirror(

[floitsch, 2012/07/17 18:53:04]

alternatively you could make the unnamed Dart2JsParameterMirror constructor to
be a factory that specializes if it sees a FieldParameterElement.

[Johnni Winther, 2012/07/18 13:32:50]

Done.

+    Dart2JsMirrorSystem system,
+    MethodMirror method,
+    VariableElement element,
+    bool isOptional) {
+  if (element is FieldParameterElement) {
+    return new Dart2JsFieldParameterMirror(system, method, element, isOptional);
+  }
+  return new Dart2JsParameterMirror(system, method, element, isOptional);
+}
+
+
 Dart2JsTypeMirror _convertTypeToTypeMirror(
     Dart2JsMirrorSystem system,
     Type type,
     InterfaceType defaultType,
     [FunctionSignature functionSignature]) {
   if (type === null) {
     return new Dart2JsInterfaceTypeMirror(system, defaultType);
   } else if (type is InterfaceType) {
     return new Dart2JsInterfaceTypeMirror(system, type);
   } else if (type is TypeVariableType) {
@@ skipping 508 matching lines @@
                          VariableElement element,
                          this._isOptional)
     : super(system, element);
 
   VariableElement get _variableElement() => _element;
 
   String get canonicalName() => simpleName();
 
   String qualifiedName() => '${_method.qualifiedName()}#${simpleName()}';
 
-  // TODO(johnniwinther): Provide
-  // [:_variableElement.variables.functionSignature:] instead of [:null:].
   TypeMirror type() => _convertTypeToTypeMirror(system,
       _variableElement.computeType(system.compiler),
       system.compiler.dynamicClass.computeType(system.compiler),
-      null);
+      _variableElement.variables.functionSignature);
 
-  String defaultValue() => null; // TODO(johnniwinther): How to compute this?
-
-  bool hasDefaultValue() => false; // TODO(johnniwinther): How to compute this?
+  String defaultValue() {
+    if (hasDefaultValue()) {
+      SendSet expression = _variableElement.cachedNode.asSendSet();
+      return expression.arguments.head.unparse();
+    }
+    return null;
+  }
+  bool hasDefaultValue() {
+    return _variableElement.cachedNode !== null &&
+        _variableElement.cachedNode is SendSet;
+  }
 
   bool isOptional() => _isOptional;
+
+  bool isInitializingFormal() => false;
+
+  FieldMirror initializedField() => null;
+}
+
+class Dart2JsFieldParameterMirror extends Dart2JsParameterMirror {
+
+  Dart2JsFieldParameterMirror(Dart2JsMirrorSystem system,
+                              MethodMirror method,
+                              FieldParameterElement element,
+                              bool isOptional)
+      : super(system, method, element, isOptional);
+
+  FieldParameterElement get _fieldParameterElement() => _element;
+
+  TypeMirror type() {
+    if (_fieldParameterElement.variables.cachedNode.type !== null) {
+      return super.type();
+    }
+    return _convertTypeToTypeMirror(system,
+      _fieldParameterElement.fieldElement.computeType(system.compiler),
+      system.compiler.dynamicClass.computeType(system.compiler),
+      _variableElement.variables.functionSignature);
+  }
+
+  bool isInitializingFormal() => true;
+
+  FieldMirror initializedField() => new Dart2JsFieldMirror(
+      _method.surroundingDeclaration(), _fieldParameterElement.fieldElement);
 }
 
 //------------------------------------------------------------------------------
 // Declarations
 //------------------------------------------------------------------------------
 class Dart2JsInterfaceMirror extends Dart2JsObjectMirror
     implements Dart2JsTypeMirror, InterfaceMirror {
   final Dart2JsLibraryMirror _library;
   Map<String, Dart2JsMemberMirror> _members;
   List<TypeVariableMirror> _typeVariables;
@@ skipping 709 matching lines @@
     if (node !== null) {
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     } else {
       var span = system.compiler.spanFromElement(_variable);
       return new Dart2JsLocation(script, span);
     }
   }
 }