[nnbd_migration] Add edge origin for explicit instantiation params

MichaelRFairhurst · commit-bot@chromium.org · commit 42d0c8245d3c · 2020-02-28T23:26:22.000Z
Change-Id: I9feebb693d8e97027019b5ff2e936ce0fd69bd3c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/137655 Reviewed-by: Paul Berry <paulberry@google.com>
diff --git a/pkg/analysis_server/test/src/edit/nnbd_migration/info_builder_test.dart b/pkg/analysis_server/test/src/edit/nnbd_migration/info_builder_test.dart
@@ -298,6 +298,28 @@ C<int?/*?*/>? c;
         details: ['This type parameter is instantiated with a nullable type']);
   }
 
+  Future<void> test_bound_instantiation_explicit() async {
+    UnitInfo unit = await buildInfoForSingleTestFile('''
+class C<T extends Object> {}
+
+void main() {
+  C<int/*?*/>();
+}
+''', migratedContent: '''
+class C<T extends Object?> {}
+
+void main() {
+  C<int?/*?*/>();
+}
+''');
+    List<RegionInfo> regions = unit.regions;
+    expect(regions, hasLength(2));
+    assertRegion(
+        region: regions[0],
+        offset: 24,
+        details: ['This type parameter is instantiated with a nullable type']);
+  }
+
   Future<void> test_bound_method_explicit() async {
     UnitInfo unit = await buildInfoForSingleTestFile('''
 f<T extends Object> {}
diff --git a/pkg/nnbd_migration/lib/src/edge_builder.dart b/pkg/nnbd_migration/lib/src/edge_builder.dart
@@ -889,12 +889,16 @@ class EdgeBuilder extends GeneralizingAstVisitor<DecoratedType>
     Iterable<DartType> typeArgumentTypes;
     List<DecoratedType> decoratedTypeArguments;
     var typeArguments = node.constructorName.type.typeArguments;
+    List<EdgeOrigin> parameterEdgeOrigins;
     if (typeArguments != null) {
       typeArguments.accept(this);
       typeArgumentTypes = typeArguments.arguments.map((t) => t.type);
       decoratedTypeArguments = typeArguments.arguments
           .map((t) => _variables.decoratedTypeAnnotation(source, t))
           .toList();
+      parameterEdgeOrigins = typeArguments.arguments
+          .map((typeAnn) => TypeParameterInstantiationOrigin(source, typeAnn))
+          .toList();
     } else {
       var staticType = node.staticType;
       if (staticType is InterfaceType) {
@@ -926,7 +930,7 @@ class EdgeBuilder extends GeneralizingAstVisitor<DecoratedType>
         typeArguments: decoratedTypeArguments);
     var calleeType = getOrComputeElementType(callee, targetType: createdType);
     for (var i = 0; i < decoratedTypeArguments.length; ++i) {
-      _checkAssignment(null,
+      _checkAssignment(parameterEdgeOrigins?.elementAt(i),
           source: decoratedTypeArguments[i],
           destination:
               _variables.decoratedTypeParameterBound(typeParameters[i]),
