commit f77e9ba17d8600a091772001ba29fa964bc80d6a
author pq <pquitslund@google.com> Wed Jan 22 11:53:52 2025 -0800
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 22 11:53:52 2025 -0800
tree 9fc713c2fb26706316f7e6a44bfc3aa30532e20d
parent e78459bf90f0b7239b1ffad37cf741ead7598d3b

[element model] migrate `function_type_test`

Change-Id: Ic76f440bbdf30261e153d377462de88ab54b9437
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/405401
Commit-Queue: Phil Quitslund <pquitslund@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Auto-Submit: Phil Quitslund <pquitslund@google.com>

pkg/analyzer/test/src/dart/element/function_type_test.dart

diff --git a/pkg/analyzer/test/src/dart/element/function_type_test.dart b/pkg/analyzer/test/src/dart/element/function_type_test.dart
index 164ddc0..d457eb3 100644
--- a/pkg/analyzer/test/src/dart/element/function_type_test.dart
+++ b/pkg/analyzer/test/src/dart/element/function_type_test.dart
@@ -2,9 +2,7 @@
 // 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.
 
-// ignore_for_file: analyzer_use_new_elements
-
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -26,9 +24,9 @@
 class FunctionTypeTest extends AbstractTypeSystemTest {
   InterfaceType get intType => typeProvider.intType;
 
-  ClassElement get listElement => typeProvider.listElement;
+  ClassElement2 get listElement => typeProvider.listElement2;
 
-  ClassElement get mapElement => typeProvider.mapElement;
+  ClassElement2 get mapElement => typeProvider.mapElement2;
 
   InterfaceTypeImpl get objectType => typeProvider.objectType;
 
@@ -56,9 +54,9 @@
         reason: 'normalParameterTypes');
     expect(f.optionalParameterTypes, optionalParameterTypes,
         reason: 'optionalParameterTypes');
-    expect(f.parameters, parameters, reason: 'parameters');
+    expect(f.formalParameters, parameters, reason: 'parameters');
     expect(f.returnType, returnType ?? same(dynamicType), reason: 'returnType');
-    expect(f.typeFormals, typeFormals, reason: 'typeFormals');
+    expect(f.typeParameters, typeFormals, reason: 'typeFormals');
   }
 
   DartType listOf(DartType elementType) => listElement.instantiate(
@@ -416,11 +414,11 @@
         namedParameter(name: 'b', type: typeProvider.intType),
       ],
     );
-    var parameters = f.parameters;
+    var parameters = f.formalParameters;
     expect(parameters, hasLength(3));
-    expect(parameters[0].name, 'a');
-    expect(parameters[1].name, 'b');
-    expect(parameters[2].name, 'c');
+    expect(parameters[0].name3, 'a');
+    expect(parameters[1].name3, 'b');
+    expect(parameters[2].name3, 'c');
   }
 
   test_synthetic() {
@@ -486,9 +484,9 @@
         displayName: 'dynamic Function({Object x})',
         namedParameterTypes: {'x': same(objectType)},
         parameters: hasLength(1));
-    expect(f.parameters[0].isNamed, isTrue);
-    expect(f.parameters[0].name, 'x');
-    expect(f.parameters[0].type, same(objectType));
+    expect(f.formalParameters[0].isNamed, isTrue);
+    expect(f.formalParameters[0].name3, 'x');
+    expect(f.formalParameters[0].type, same(objectType));
   }
 
   test_synthetic_normalParameter() {
@@ -504,9 +502,9 @@
         normalParameterNames: ['x'],
         normalParameterTypes: [same(objectType)],
         parameters: hasLength(1));
-    expect(f.parameters[0].isRequiredPositional, isTrue);
-    expect(f.parameters[0].name, 'x');
-    expect(f.parameters[0].type, same(objectType));
+    expect(f.formalParameters[0].isRequiredPositional, isTrue);
+    expect(f.formalParameters[0].name3, 'x');
+    expect(f.formalParameters[0].type, same(objectType));
   }
 
   test_synthetic_optionalParameter() {
@@ -522,9 +520,9 @@
         optionalParameterNames: ['x'],
         optionalParameterTypes: [same(objectType)],
         parameters: hasLength(1));
-    expect(f.parameters[0].isOptionalPositional, isTrue);
-    expect(f.parameters[0].name, 'x');
-    expect(f.parameters[0].type, same(objectType));
+    expect(f.formalParameters[0].isOptionalPositional, isTrue);
+    expect(f.formalParameters[0].name3, 'x');
+    expect(f.formalParameters[0].type, same(objectType));
   }
 
   test_synthetic_returnType() {
@@ -539,16 +537,16 @@
   }
 
   test_synthetic_typeFormals() {
-    var t = typeParameter('T');
-    FunctionType f = FunctionTypeImpl(
-      typeFormals: [t],
-      parameters: const [],
-      returnType: typeParameterTypeNone(t),
+    var t = typeParameter2('T');
+    FunctionType f = FunctionTypeImpl.v2(
+      typeParameters: [t],
+      formalParameters: const [],
+      returnType: typeParameterTypeNone2(t),
       nullabilitySuffix: NullabilitySuffix.none,
     );
     basicChecks(f,
         displayName: 'T Function<T>()',
-        returnType: typeParameterTypeNone(t),
+        returnType: typeParameterTypeNone2(t),
         typeFormals: [same(t)]);
   }