update NodeBuilder parameter tracking when visiting executable declarations

danrubel · commit-bot@chromium.org · commit e0eeffaf9b67 · 2019-07-02T17:39:33.000Z
This updates NodeBuilder so that when it visits a method declaration, it does not count any parameters defined in body statements as part of the parameters defined in the method signature. Change-Id: I4da3989eb2bc65c422d94fa264885910850b0ed2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107921 Reviewed-by: Paul Berry <paulberry@google.com> Commit-Queue: Dan Rubel <danrubel@google.com>
diff --git a/pkg/nnbd_migration/lib/src/node_builder.dart b/pkg/nnbd_migration/lib/src/node_builder.dart
@@ -372,12 +372,12 @@ $stackTrace''');
     DecoratedType decoratedFunctionType;
     try {
       parameters?.accept(this);
-      body?.accept(this);
       redirectedConstructor?.accept(this);
       decoratedFunctionType = DecoratedType(functionType, _graph.never,
           returnType: decoratedReturnType,
           positionalParameters: _positionalParameters,
           namedParameters: _namedParameters);
+      body?.accept(this);
     } finally {
       _positionalParameters = previousPositionalParameters;
       _namedParameters = previousNamedParameters;
diff --git a/pkg/nnbd_migration/test/node_builder_test.dart b/pkg/nnbd_migration/test/node_builder_test.dart
@@ -955,6 +955,15 @@ class C extends B {
     expect(decoratedType.node, same(always));
   }
 
+  test_parameters() async {
+    await analyze('''
+void foo({List<int> values})  {
+  values.where((i) => true);
+}
+''');
+    // No assertions; just checking that it doesn't crash.
+  }
+
   test_topLevelFunction_parameterType_implicit_dynamic() async {
     await analyze('''
 void f(x) {}
