Resynthesize factoring constructor redirects from Kernel.

pkg/analyzer/lib/src/dart/element/element.dart

 // Copyright (c) 2014, 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 analyzer.src.dart.element.element;
 
 import 'dart:collection';
 import 'dart:math' show min;
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 553 matching lines @@
     }
     if (_kernel != null && _constructors == null) {
       var constructors = _kernel.constructors
           .map((k) => new ConstructorElementImpl.forKernel(this, k, null));
       var factories = _kernel.procedures
           .where((k) => k.isFactory)
           .map((k) => new ConstructorElementImpl.forKernel(this, null, k));
       _constructors = <ConstructorElement>[]
         ..addAll(constructors)
         ..addAll(factories);
+      _constructors.sort((a, b) => a.nameOffset - b.nameOffset);
     }
     if (_unlinkedClass != null && _constructors == null) {
       _constructors = _unlinkedClass.executables
           .where((e) => e.kind == UnlinkedExecutableKind.constructor)
           .map((e) => new ConstructorElementImpl.forSerialized(e, this))
           .toList(growable: false);
       // Ensure at least implicit default constructor.
       if (_constructors.isEmpty) {
         ConstructorElementImpl constructor = new ConstructorElementImpl('', -1);
         constructor.isSynthetic = true;
@@ skipping 703 matching lines @@
   void _resynthesizeFieldsAndPropertyAccessors() {
     assert(_fields == null);
     assert(_accessors == null);
     var explicitFields = <FieldElement>[];
     var implicitAccessors = <PropertyAccessorElement>[];
     var explicitAccessors = <PropertyAccessorElement>[];
     var implicitFields = <String, FieldElementImpl>{};
     if (_kernel != null) {
       // Build explicit fields and implicit property accessors.
       for (var k in _kernel.fields) {
+        if (k.name.name.startsWith('_redirecting#')) {
+          continue;
+        }
         var field = new FieldElementImpl.forKernelFactory(this, k);
         explicitFields.add(field);
         implicitAccessors.add(
             new PropertyAccessorElementImpl_ImplicitGetter(field)
               ..enclosingElement = this);
         if (!field.isConst && !field.isFinal) {
           implicitAccessors.add(
               new PropertyAccessorElementImpl_ImplicitSetter(field)
                 ..enclosingElement = this);
         }
@@ skipping 903 matching lines @@
         _kernelFactory = null,
         super.forSerialized(serializedExecutable, enclosingClass);
 
   /**
    * Return the constant initializers for this element, which will be empty if
    * there are no initializers, or `null` if there was an error in the source.
    */
   List<ConstructorInitializer> get constantInitializers {
     if (_constantInitializers == null) {
       if (_kernelConstructor != null) {
-        var context = enclosingUnit._kernelContext;
-        _constantInitializers = _kernelConstructor.initializers
-            .map((k) => context.getConstructorInitializer(this, k))
-            .where((i) => i != null)
-            .toList();
+        if (_kernelConstructor.isConst) {
+          var context = enclosingUnit._kernelContext;
+          _constantInitializers = _kernelConstructor.initializers
+              .map((k) => context.getConstructorInitializer(this, k))
+              .where((i) => i != null)
+              .toList();
+        } else {
+          _constantInitializers = const <ConstructorInitializer>[];
+        }
       }
       if (serializedExecutable != null) {
         _constantInitializers = serializedExecutable.constantInitializers
             .map((i) => _buildConstructorInitializer(i))
             .toList(growable: false);
       }
     }
     return _constantInitializers;
   }
 
@@ skipping 117 matching lines @@
   }
 
   void set periodOffset(int periodOffset) {
     _assertNotResynthesized(serializedExecutable);
     _periodOffset = periodOffset;
   }
 
   @override
   ConstructorElement get redirectedConstructor {
     if (_redirectedConstructor == null) {
-      if (_kernelConstructor != null) {
-        for (var initializer in _kernelConstructor.initializers) {
-          if (initializer is kernel.RedirectingInitializer) {
-            return _redirectedConstructor = enclosingUnit._kernelContext
-                    .getElement(initializer.targetReference)
-                as ConstructorElementImpl;
-          }
-        }
+      if (_kernelConstructor != null || _kernelFactory != null) {
+        _redirectedConstructor = enclosingUnit._kernelContext
+            .getRedirectedConstructor(_kernelConstructor, _kernelFactory);
       }
       if (serializedExecutable != null) {
         if (serializedExecutable.isRedirectedConstructor) {
           if (serializedExecutable.isFactory) {
             _redirectedConstructor = enclosingUnit.resynthesizerContext
                 .resolveConstructorRef(enclosingElement,
                     serializedExecutable.redirectedConstructor);
           } else {
             _redirectedConstructor = enclosingElement.getNamedConstructor(
                 serializedExecutable.redirectedConstructorName);
@@ skipping 1711 matching lines @@
     }
     if (serializedExecutable != null) {
       return serializedExecutable.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
     int offset = super.nameOffset;
+    if (_kernel != null) {
+      return _kernel.fileOffset;
+    }
     if (offset == 0 && serializedExecutable != null) {
       return serializedExecutable.nameOffset;
     }
     return offset;
   }
 
   @override
   List<ParameterElement> get parameters {
     if (_parameters == null) {
       if (_kernel != null) {
@@ skipping 1780 matching lines @@
   kernel.Library get library;
 
   /**
    * Return the resynthesized [ConstructorInitializer] for the given Kernel
    * [initializer], or `null` if synthetic.
    */
   ConstructorInitializer getConstructorInitializer(
       ConstructorElementImpl constructor, kernel.Initializer initializer);
 
   /**
-   * Return the [Element] referenced by the given [reference].
-   */
-  ElementImpl getElement(kernel.Reference reference);
-
-  /**
    * Return the [Expression] for the given kernel.
    */
   Expression getExpression(kernel.Expression expression);
 
   /**
    * Return the [InterfaceType] for the given Kernel [type], or `null` if the
    * [type] does not correspond to an [InterfaceType].
    */
   InterfaceType getInterfaceType(ElementImpl context, kernel.Supertype type);
 
   /**
    * Return the [LibraryElement] for the given absolute [uriStr].
    */
   LibraryElement getLibrary(String uriStr);
 
   /**
+   * Return the [ConstructorElementImpl] to which the given [kernelConstructor]
+   * or [kernelFactory] redirects.
+   */
+  ConstructorElementImpl getRedirectedConstructor(
+      kernel.Constructor kernelConstructor, kernel.Procedure kernelFactory);
+
+  /**
    * Return the [DartType] for the given Kernel [type], or `null` if the [type]
    * does not correspond to a [DartType].
    */
   DartType getType(ElementImpl context, kernel.DartType type);
 }
 
 /**
  * A concrete implementation of a [LabelElement].
  */
 class LabelElementImpl extends ElementImpl implements LabelElement {
@@ skipping 2414 matching lines @@
   /**
    * Initialize a newly created method element to have the given [name] and
    * [nameOffset].
    */
   PrefixElementImpl(String name, int nameOffset)
       : _unlinkedImport = null,
         _kernel = null,
         super(name, nameOffset);
 
   /**
+   * Initialize using the given kernel.
+   */
+  PrefixElementImpl.forKernel(LibraryElementImpl enclosingLibrary, this._kernel)
+      : _unlinkedImport = null,
+        super.forSerialized(enclosingLibrary);
+
+  /**
    * Initialize a newly created prefix element to have the given [name].
    */
   PrefixElementImpl.forNode(Identifier name)
       : _unlinkedImport = null,
         _kernel = null,
         super.forNode(name);
 
   /**
    * Initialize using the given serialized information.
    */
   PrefixElementImpl.forSerialized(
       this._unlinkedImport, LibraryElementImpl enclosingLibrary)
       : _kernel = null,
         super.forSerialized(enclosingLibrary);
 
-  /**
-   * Initialize using the given kernel.
-   */
-  PrefixElementImpl.forKernel(LibraryElementImpl enclosingLibrary, this._kernel)
-      : _unlinkedImport = null,
-        super.forSerialized(enclosingLibrary);
-
   @override
   String get displayName => name;
 
   @override
   LibraryElement get enclosingElement =>
       super.enclosingElement as LibraryElement;
 
   @override
   String get identifier => "_${super.identifier}";
 
@@ skipping 1236 matching lines @@
 
   @override
   DartObject computeConstantValue() => null;
 
   @override
   void visitChildren(ElementVisitor visitor) {
     super.visitChildren(visitor);
     _initializer?.accept(visitor);
   }
 }