Issue 29432. Instantiate the redirect constructor with the in-scope type arguments.

pkg/analyzer/test/src/dart/constant/evaluation_test.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 analyzer.test.constant_test;
 
 import 'dart:async';
 
 import 'package:analyzer/context/declared_variables.dart';
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 706 matching lines @@
   }
 
   test_fromEnvironment_string_undeclared() async {
     _assertValidUnknown(await _check_fromEnvironment_string(null, null));
   }
 
   test_fromEnvironment_string_undeclared_nullDefault() async {
     _assertValidNull(await _check_fromEnvironment_string(null, "null"));
   }
 
+  test_getConstructor_redirectingFactory() async {
+    CompilationUnit compilationUnit = await resolveSource(r'''
+class A {
+  factory const A() = B;
+}
+
+class B implements A {
+  const B();
+}
+
+class C {
+  @A()
+  f() {}
+}
+''');
+    EvaluationResultImpl result =
+        _evaluateAnnotation(compilationUnit, "C", "f");
+    expect(result.value.getInvocation().constructor.isFactory, isTrue);
+  }
+
+  test_getConstructor_withArgs() async {
+    CompilationUnit compilationUnit = await resolveSource(r'''
+class A {
+  final int i;
+  const A(this.i);
+}
+
+class C {
+  @A(5)
+  f() {}
+}
+''');
+    EvaluationResultImpl result =
+        _evaluateAnnotation(compilationUnit, "C", "f");
+    ConstructorInvocation invocation = result.value.getInvocation();
+    expect(invocation.constructor, isNotNull);
+    expect(invocation.positionalArguments, hasLength(1));
+    expect(invocation.positionalArguments.single.toIntValue(), 5);
+    expect(invocation.namedArguments, isEmpty);
+  }
+
+  test_getConstructor_withNamedArgs() async {
+    CompilationUnit compilationUnit = await resolveSource(r'''
+class A {
+  final int i;
+  const A({this.i});
+}
+
+class C {
+  @A(i: 5)
+  f() {}
+}
+''');
+    EvaluationResultImpl result =
+        _evaluateAnnotation(compilationUnit, "C", "f");
+    ConstructorInvocation invocation = result.value.getInvocation();
+    expect(invocation.constructor, isNotNull);
+    expect(invocation.positionalArguments, isEmpty);
+    expect(invocation.namedArguments, isNotEmpty);
+    expect(invocation.namedArguments['i'].toIntValue(), 5);
+  }
+
   test_instanceCreationExpression_computedField() async {
     CompilationUnit compilationUnit = await resolveSource(r'''
 const foo = const A(4, 5);
 class A {
   const A(int i, int j) : k = 2 * i + j;
   final int k;
 }''');
     EvaluationResultImpl result =
         _evaluateTopLevelVariable(compilationUnit, "foo");
     Map<String, DartObjectImpl> fields = _assertType(result, "A");
@@ skipping 261 matching lines @@
 
   test_instanceCreationExpression_redirect_external() async {
     CompilationUnit compilationUnit = await resolveSource(r'''
 const foo = const A();
 class A {
   external const factory A();
 }''');
     _assertValidUnknown(_evaluateTopLevelVariable(compilationUnit, "foo"));
   }
 
+  test_instanceCreationExpression_redirect_generic() async {
+    CompilationUnit compilationUnit = await resolveSource(r'''
+const foo = const A<int>();
+class A<T> {
+  const A() : this._();
+  const A._();
+}
+''');
+    _assertType(_evaluateTopLevelVariable(compilationUnit, 'foo'), 'A<int>');
+  }
+
   test_instanceCreationExpression_redirect_nonConst() async {
     // It is an error for a const factory constructor redirect to a non-const
     // constructor; however, we need to make sure that even if the error
     // attempting to evaluate the constant won't cause a crash.
     CompilationUnit compilationUnit = await resolveSource(r'''
 const foo = const A();
 class A {
   const factory A() = A.b;
   A.b();
 }''');
@@ skipping 156 matching lines @@
         await resolveSource("const voidSymbol = #void;");
     VariableDeclaration voidSymbol =
         findTopLevelDeclaration(compilationUnit, "voidSymbol");
     EvaluationResultImpl voidSymbolResult =
         (voidSymbol.element as VariableElementImpl).evaluationResult;
     DartObjectImpl value = voidSymbolResult.value;
     expect(value.type, typeProvider.symbolType);
     expect(value.toSymbolValue(), "void");
   }
 
-  test_getConstructor_withArgs() async {
-    CompilationUnit compilationUnit = await resolveSource(r'''
-class A {
-  final int i;
-  const A(this.i);
-}
-
-class C {
-  @A(5)
-  f() {}
-}
-''');
-    EvaluationResultImpl result =
-        _evaluateAnnotation(compilationUnit, "C", "f");
-    ConstructorInvocation invocation = result.value.getInvocation();
-    expect(invocation.constructor, isNotNull);
-    expect(invocation.positionalArguments, hasLength(1));
-    expect(invocation.positionalArguments.single.toIntValue(), 5);
-    expect(invocation.namedArguments, isEmpty);
-  }
-
-  test_getConstructor_withNamedArgs() async {
-    CompilationUnit compilationUnit = await resolveSource(r'''
-class A {
-  final int i;
-  const A({this.i});
-}
-
-class C {
-  @A(i: 5)
-  f() {}
-}
-''');
-    EvaluationResultImpl result =
-        _evaluateAnnotation(compilationUnit, "C", "f");
-    ConstructorInvocation invocation = result.value.getInvocation();
-    expect(invocation.constructor, isNotNull);
-    expect(invocation.positionalArguments, isEmpty);
-    expect(invocation.namedArguments, isNotEmpty);
-    expect(invocation.namedArguments['i'].toIntValue(), 5);
-  }
-
-  test_getConstructor_redirectingFactory() async {
-    CompilationUnit compilationUnit = await resolveSource(r'''
-class A {
-  factory const A() = B;
-}
-
-class B implements A {
-  const B();
-}
-
-class C {
-  @A()
-  f() {}
-}
-''');
-    EvaluationResultImpl result =
-        _evaluateAnnotation(compilationUnit, "C", "f");
-    expect(result.value.getInvocation().constructor.isFactory, isTrue);
-  }
-
   Map<String, DartObjectImpl> _assertFieldType(
       Map<String, DartObjectImpl> fields,
       String fieldName,
       String expectedType) {
     DartObjectImpl field = fields[fieldName];
     expect(field.type.displayName, expectedType);
     return field.fields;
   }
 
   void _assertIntField(
@@ skipping 435 matching lines @@
   }
 }
 
 @reflectiveTest
 class StrongConstantValueComputerTest extends ConstantValueComputerTest {
   void setUp() {
     super.setUp();
     resetWith(options: new AnalysisOptionsImpl()..strongMode = true);
   }
 }