Implement type arguments in redirecting factories.

pkg/front_end/lib/src/fasta/builder/constructor_reference_builder.dart

 // Copyright (c) 2016, 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 fasta.constructor_reference_builder;
 
 import 'builder.dart'
     show
         Builder,
         ClassBuilder,
         LibraryBuilder,
         PrefixBuilder,
         Scope,
         TypeBuilder;
 
-import '../messages.dart' show templateConstructorNotFound, warning;
+import '../messages.dart'
+    show
+        templateClassNotFound,
+        templateConstructorNotFound,
+        templateNotAConstructor,
+        warning;
 
 class ConstructorReferenceBuilder extends Builder {
   final String name;
 
   final List<TypeBuilder> typeArguments;
 
   /// This is the name of a named constructor. As `bar` in `new Foo<T>.bar()`.
   final String suffix;
 
   Builder target;
 
+  ClassBuilder classBuilder;
+
   ConstructorReferenceBuilder(this.name, this.typeArguments, this.suffix,
       Builder parent, int charOffset)
       : super(parent, charOffset, parent.fileUri);
 
   String get fullNameForErrors => "$name${suffix == null ? '' : '.$suffix'}";
 
   void resolveIn(Scope scope, LibraryBuilder accessingLibrary) {
+    List<String> identifiers;
     int index = name.indexOf(".");
+    if (index == -1) {
+      if (suffix == null) {
+        identifiers = <String>[name];
+      } else {
+        identifiers = <String>[name, suffix];
+      }
+    } else {
+      String first = name.substring(0, index);
+      String second = name.substring(index + 1);
+      if (suffix == null) {
+        identifiers = <String>[first, second];
+      } else {
+        identifiers = <String>[first, second, suffix];
+      }
+    }
+
     Builder builder;
-    if (index == -1) {
-      builder = scope.lookup(name, charOffset, fileUri);
-    } else {
-      String prefix = name.substring(0, index);
-      String middle = name.substring(index + 1);
-      builder = scope.lookup(prefix, charOffset, fileUri);
-      if (builder is PrefixBuilder) {
-        PrefixBuilder prefix = builder;
-        builder = prefix.lookup(middle, charOffset, fileUri);
-      } else if (builder is ClassBuilder) {
-        ClassBuilder cls = builder;
-        builder = cls.findConstructorOrFactory(
-            middle, charOffset, fileUri, accessingLibrary);
-        if (suffix == null) {
-          target = builder;
+    bool isConstructor = false;
+    ClassBuilder cls;
+    for (String identifier in identifiers) {
+      isConstructor = false;
+      if (builder == null) {
+        builder = scope.lookup(identifier, charOffset, fileUri);
+        if (builder == null) {
+          warning(templateClassNotFound.withArguments(identifier), charOffset,
+              fileUri);
           return;
         }
+      } else if (builder is PrefixBuilder) {
+        PrefixBuilder prefix = builder;
+        builder = prefix.lookup(identifier, charOffset, fileUri);
+        if (builder == null) {
+          warning(templateClassNotFound.withArguments(identifier), charOffset,
+              fileUri);
+          return;
+        }
+      } else if (builder is ClassBuilder) {
+        cls = builder;
+        builder = cls.findConstructorOrFactory(
+            identifier, charOffset, fileUri, accessingLibrary);
+        if (builder == null) {
+          warning(templateConstructorNotFound.withArguments(identifier),
+              charOffset, fileUri);
+          return;
+        }
+        isConstructor = true;
+      } else {
+        warning(templateNotAConstructor.withArguments(fullNameForErrors),
+            charOffset, fileUri);
+        return;
       }
     }
+
     if (builder is ClassBuilder) {
-      target = builder.findConstructorOrFactory(
-          suffix ?? "", charOffset, fileUri, accessingLibrary);
+      cls = builder;
+      builder = cls.findConstructorOrFactory(
+          "", charOffset, fileUri, accessingLibrary);
+      if (builder == null) {
+        warning(templateConstructorNotFound.withArguments(fullNameForErrors),
+            charOffset, fileUri);
+        return;
+      }
+      isConstructor = true;
     }
-    if (target == null) {
-      warning(templateConstructorNotFound.withArguments(fullNameForErrors),
+
+    if (isConstructor) {
+      target = builder;
+      classBuilder = cls;
+    } else {
+      warning(templateNotAConstructor.withArguments(fullNameForErrors),
           charOffset, fileUri);
     }
   }
 }