[cfe] Add test for extension member parameters

johnniwinther · commit-bot@chromium.org · commit 948b60f8dcbb · 2019-07-22T16:00:28.000Z
Change-Id: I6ceb66bbef561b0c86e6f529e9d90a35dd82f628 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109705 Reviewed-by: Dan Rubel <danrubel@google.com>
diff --git a/pkg/front_end/test/extensions/data/instance_members.dart b/pkg/front_end/test/extensions/data/instance_members.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// TODO(johnniwinther): Expand instance methods with parameter for `this`.
+
 class A1 {}
 
 /*class: A2:
@@ -16,15 +18,24 @@ extension A2 on A1 {
      builder-name=method1,
      member-name=method1
   */
-  void method1() {}
+  A1 method1() {
+    // TODO(johnniwinther): Use `this` here instead.
+    return null;
+  }
 
   /*member: A2.method2:
      builder-name=method2,
+     builder-params=[o],
      builder-type-params=[T],
      member-name=method2,
+     member-params=[o],
      member-type-params=[T]
   */
-  void method2<T>() {}
+  A1 method2<T>(T o) {
+    print(o);
+    // TODO(johnniwinther): Use `this` here instead.
+    return null;
+  }
 }
 
 class B1<T> {}
@@ -43,15 +54,24 @@ extension B2<T> on B1<T> {
      builder-name=method1,
      member-name=method1
   */
-  void method1() {}
+  B2<T> method1() {
+    // TODO(johnniwinther): Use `this` here instead.
+    return null;
+  }
 
   /*member: B2.method2:
      builder-name=method2,
+     builder-params=[o],
      builder-type-params=[S],
      member-name=method2,
+     member-params=[o],
      member-type-params=[S]
   */
-  void method2<S>() {}
+  B2<T> method2<S>(S o) {
+    print(o);
+    // TODO(johnniwinther): Use `this` here instead.
+    return null;
+  }
 }
 
 main() {}
diff --git a/pkg/front_end/test/extensions/data/static_members.dart b/pkg/front_end/test/extensions/data/static_members.dart
@@ -14,17 +14,21 @@ class A1 {}
 extension A2 on A1 {
   /*member: A2.method1:
      builder-name=method1,
-     member-name=method1
+     builder-params=[o],
+     member-name=method1,
+     member-params=[o]
   */
-  static void method1() {}
+  static A1 method1(A1 o) => o;
 
   /*member: A2.method2:
      builder-name=method2,
+     builder-params=[o],
      builder-type-params=[T],
      member-name=method2,
+     member-params=[o],
      member-type-params=[T]
   */
-  static void method2<T>() {}
+  static T method2<T>(T o) => o;
 }
 
 class B1<T> {}
@@ -41,17 +45,21 @@ class B1<T> {}
 extension B2<T> on B1<T> {
   /*member: B2.method1:
      builder-name=method1,
-     member-name=method1
+     builder-params=[o],
+     member-name=method1,
+     member-params=[o]
   */
-  static void method1() {}
+  static B1 method1(B1 o) => o;
 
   /*member: B2.method2:
      builder-name=method2,
+     builder-params=[o],
      builder-type-params=[S],
      member-name=method2,
+     member-params=[o],
      member-type-params=[S]
   */
-  static void method2<S>() {}
+  static S method2<S>(S o) => o;
 }
 
 main() {}
diff --git a/pkg/front_end/test/extensions/extensions_test.dart b/pkg/front_end/test/extensions/extensions_test.dart
@@ -62,6 +62,7 @@ class Tags {
   static const String builderSupertype = 'builder-supertype';
   static const String builderInterfaces = 'builder-interfaces';
   static const String builderOnTypes = 'builder-onTypes';
+  static const String builderParameters = 'builder-params';
 
   static const String clsName = 'cls-name';
   static const String clsTypeParameters = 'cls-type-params';
@@ -70,6 +71,7 @@ class Tags {
 
   static const String memberName = 'member-name';
   static const String memberTypeParameters = 'member-type-params';
+  static const String memberParameters = 'member-params';
 }
 
 class ExtensionsDataExtractor extends CfeDataExtractor<Features> {
@@ -134,15 +136,25 @@ class ExtensionsDataExtractor extends CfeDataExtractor<Features> {
     MemberBuilder memberBuilder = lookupMemberBuilder(compilerResult, member);
     Features features = new Features();
     features[Tags.builderName] = memberBuilder.name;
-    if (memberBuilder is ProcedureBuilder &&
-        memberBuilder.typeVariables != null) {
-      for (TypeVariableBuilder typeVariable in memberBuilder.typeVariables) {
-        features.addElement(Tags.builderTypeParameters,
-            typeVariableBuilderToText(typeVariable));
+    if (memberBuilder is ProcedureBuilder) {
+      if (memberBuilder.formals != null) {
+        for (FormalParameterBuilder parameter in memberBuilder.formals) {
+          features.addElement(Tags.builderParameters, parameter.name);
+        }
+      }
+      if (memberBuilder.typeVariables != null) {
+        for (TypeVariableBuilder typeVariable in memberBuilder.typeVariables) {
+          features.addElement(Tags.builderTypeParameters,
+              typeVariableBuilderToText(typeVariable));
+        }
       }
     }
     features[Tags.memberName] = getMemberName(member);
     if (member.function != null) {
+      for (VariableDeclaration parameter
+          in member.function.positionalParameters) {
+        features.addElement(Tags.memberParameters, parameter.name);
+      }
       for (TypeParameter typeParameter in member.function.typeParameters) {
         features.addElement(
             Tags.memberTypeParameters, typeParameterToText(typeParameter));
