Properties added to MethodMirror

pkg/dartdoc/lib/src/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 'dart:io';
 import 'dart:uri';
 
 import '../../../../../lib/compiler/compiler.dart' as diagnostics;
@@ skipping 94 matching lines @@
 MethodMirror _convertElementMethodToMethodMirror(Dart2JsContainerMirror library,
                                                  Element element) {
   if (element is FunctionElement) {
     return new Dart2JsMethodMirror(library, element);
   } else {
     return null;
   }
 }
 
 class Dart2JsMethodKind {
-  static const Dart2JsMethodKind NORMAL = const Dart2JsMethodKind("normal");
-  static const Dart2JsMethodKind CONSTRUCTOR
-      = const Dart2JsMethodKind("constructor");
+  static const Dart2JsMethodKind REGULAR = const Dart2JsMethodKind("regular");
+  static const Dart2JsMethodKind GENERATIVE
+      = const Dart2JsMethodKind("generative");

[kasperl, 2012/10/31 13:35:47]

Nit: I'd prefer keeping = on the previous line -- and I'd go for consistently
breaking after = for all these (even the ones that do fit on one line) for
consistency. To me, it makes it faster to scan that way.

[Johnni Winther, 2012/10/31 13:49:02]

Done.

+  static const Dart2JsMethodKind REDIRECTING
+      = const Dart2JsMethodKind("redirecting");
   static const Dart2JsMethodKind CONST = const Dart2JsMethodKind("const");
   static const Dart2JsMethodKind FACTORY = const Dart2JsMethodKind("factory");
   static const Dart2JsMethodKind GETTER = const Dart2JsMethodKind("getter");
   static const Dart2JsMethodKind SETTER = const Dart2JsMethodKind("setter");
   static const Dart2JsMethodKind OPERATOR = const Dart2JsMethodKind("operator");
 
   final String text;
 
   const Dart2JsMethodKind(this.text);
 
@@ skipping 1187 matching lines @@
         super(objectMirror.mirrors, function) {
     _simpleName = _element.name.slowToString();
     if (_function.kind == ElementKind.GETTER) {
       _kind = Dart2JsMethodKind.GETTER;
       _displayName = _simpleName;
     } else if (_function.kind == ElementKind.SETTER) {
       _kind = Dart2JsMethodKind.SETTER;
       _displayName = _simpleName;
       _simpleName = '$_simpleName=';
     } else if (_function.kind == ElementKind.GENERATIVE_CONSTRUCTOR) {
+      // TODO(johnniwinther): Support detection of redirecting constructors.
       _constructorName = '';
       int dollarPos = _simpleName.indexOf('\$');
       if (dollarPos != -1) {
         _constructorName = _simpleName.substring(dollarPos + 1);
         _simpleName = _simpleName.substring(0, dollarPos);
         // Simple name is TypeName.constructorName.
         _simpleName = '$_simpleName.$_constructorName';
       } else {
         // Simple name is TypeName.
       }
       if (_function.modifiers.isConst()) {
         _kind = Dart2JsMethodKind.CONST;
       } else {
-        _kind = Dart2JsMethodKind.CONSTRUCTOR;
+        _kind = Dart2JsMethodKind.GENERATIVE;
       }
       _displayName = _simpleName;
     } else if (_function.modifiers.isFactory()) {
       _kind = Dart2JsMethodKind.FACTORY;
       _constructorName = '';
       int dollarPos = _simpleName.indexOf('\$');
       if (dollarPos != -1) {
         _constructorName = _simpleName.substring(dollarPos+1);
         _simpleName = _simpleName.substring(0, dollarPos);
         _simpleName = '$_simpleName.$_constructorName';
@@ skipping 10 matching lines @@
     } else if (_simpleName.startsWith('operator\$')) {
       String str = _simpleName.substring(9);
       _simpleName = 'operator';
       _kind = Dart2JsMethodKind.OPERATOR;
       _operatorName = _getOperatorFromOperatorName(str);
       // Simple name is 'operator operatorName'.
       _simpleName = _operatorName;
       // Display name is 'operator operatorName'.
       _displayName = 'operator $_operatorName';
     } else {
-      _kind = Dart2JsMethodKind.NORMAL;
+      _kind = Dart2JsMethodKind.REGULAR;
       _displayName = _simpleName;
     }
   }
 
   FunctionElement get _function => _element;
 
   String get simpleName => _simpleName;
 
   String get displayName => _displayName;
 
   String get qualifiedName
       => '${owner.qualifiedName}.$simpleName';
 
   DeclarationMirror get owner => _objectMirror;
 
   bool get isTopLevel => _objectMirror is LibraryMirror;
 
   bool get isConstructor
-      => _kind == Dart2JsMethodKind.CONSTRUCTOR || isConst || isFactory;
+      => isGenerativeConstructor || isConstConstructor ||
+         isFactoryConstructor || isRedirectingConstructor;
 
   bool get isMethod => !isConstructor;
 
   bool get isPrivate =>
       isConstructor ? _isPrivate(constructorName) : _isPrivate(simpleName);
 
   bool get isStatic => _function.modifiers.isStatic();
 
   List<ParameterMirror> get parameters {
     return _parametersFromFunctionSignature(mirrors, this,
         _function.computeSignature(mirrors.compiler));
   }
 
   TypeMirror get returnType => _convertTypeToTypeMirror(
       mirrors, _function.computeSignature(mirrors.compiler).returnType,
       mirrors.compiler.types.dynamicType);
 
-  bool get isAbstract => _function.modifiers.isAbstract();
+  bool get isAbstract => _function.isAbstract(mirrors.compiler);
 
-  bool get isConst => _kind == Dart2JsMethodKind.CONST;
+  bool get isRegularMethod => !(isGetter || isSetter || isConstructor);
 
-  bool get isFactory => _kind == Dart2JsMethodKind.FACTORY;
+  bool get isConstConstructor => _kind == Dart2JsMethodKind.CONST;
+
+  bool get isGenerativeConstructor => _kind == Dart2JsMethodKind.GENERATIVE;
+
+  bool get isRedirectingConstructor => _kind == Dart2JsMethodKind.REDIRECTING;
+
+  bool get isFactoryConstructor => _kind == Dart2JsMethodKind.FACTORY;
 
   String get constructorName => _constructorName;
 
   bool get isGetter => _kind == Dart2JsMethodKind.GETTER;
 
   bool get isSetter => _kind == Dart2JsMethodKind.SETTER;
 
   bool get isOperator => _kind == Dart2JsMethodKind.OPERATOR;
 
   String get operatorName => _operatorName;
@@ skipping 45 matching lines @@
     if (node !== null) {
       var span = mirrors.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     } else {
       var span = mirrors.compiler.spanFromElement(_variable);
       return new Dart2JsLocation(script, span);
     }
   }
 }