Migration: don't forget to visit variable initializers in NodeBuilder.

stereotype441 · commit-bot@chromium.org · commit f7ddfdf6caf6 · 2019-06-30T10:43:45.000Z
Also visit any annotations present in a variable declaration (we can't yet test this part well but we might as well add the proper code now). Change-Id: I1c8f19c9516d1e0f17f024fa136bd7d331ed8ae1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107643 Reviewed-by: Dan Rubel <danrubel@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/nnbd_migration/lib/src/node_builder.dart b/pkg/nnbd_migration/lib/src/node_builder.dart
@@ -341,9 +341,12 @@ $stackTrace''');
 
   @override
   DecoratedType visitVariableDeclarationList(VariableDeclarationList node) {
+    node.metadata.accept(this);
     var type = decorateType(node.type, node);
     for (var variable in node.variables) {
+      variable.metadata.accept(this);
       _variables.recordDecoratedElementType(variable.declaredElement, type);
+      variable.initializer?.accept(this);
     }
     return null;
   }
diff --git a/pkg/nnbd_migration/test/node_builder_test.dart b/pkg/nnbd_migration/test/node_builder_test.dart
@@ -694,6 +694,17 @@ main() {
     expect(decoratedType.node, TypeMatcher<NullabilityNodeMutable>());
   }
 
+  test_variableDeclaration_visit_initializer() async {
+    await analyze('''
+class C<T> {}
+void f(C<dynamic> c) {
+  var x = c as C<int>;
+}
+''');
+    var decoratedType = decoratedTypeAnnotation('int');
+    expect(decoratedType.node, TypeMatcher<NullabilityNodeMutable>());
+  }
+
   test_void_type() async {
     await analyze('''
 void f() {}

Original file line number	Diff line number	Diff line change
`@@ -341,9 +341,12 @@ $stackTrace''');`
`341`	`341`
`342`	`342`	`@override`
`343`	`343`	`DecoratedType visitVariableDeclarationList(VariableDeclarationList node) {`
	`344`	`+ node.metadata.accept(this);`
`344`	`345`	`var type = decorateType(node.type, node);`
`345`	`346`	`for (var variable in node.variables) {`
	`347`	`+ variable.metadata.accept(this);`
`346`	`348`	`_variables.recordDecoratedElementType(variable.declaredElement, type);`
	`349`	`+ variable.initializer?.accept(this);`
`347`	`350`	`}`
`348`	`351`	`return null;`
`349`	`352`	`}`