diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart index aeac08d4d07b..5327afe31b3b 100644 --- a/pkg/analyzer/lib/src/dart/element/element.dart +++ b/pkg/analyzer/lib/src/dart/element/element.dart @@ -11456,7 +11456,6 @@ class TypeParameterElementImpl extends ElementImpl return TypeParameterElementImpl2( firstFragment: firstFragment, name3: firstFragment.name.nullIfEmpty, - bound: firstFragment.bound, ); } @@ -11577,13 +11576,9 @@ class TypeParameterElementImpl2 extends TypeDefiningElementImpl2 @override final String? name3; - @override - TypeImpl? bound; - TypeParameterElementImpl2({ required this.firstFragment, required this.name3, - required this.bound, }) { TypeParameterElementImpl? fragment = firstFragment; while (fragment != null) { @@ -11595,6 +11590,13 @@ class TypeParameterElementImpl2 extends TypeDefiningElementImpl2 @override TypeParameterElement2 get baseElement => this; + @override + TypeImpl? get bound => firstFragment.bound; + + set bound(TypeImpl? value) { + firstFragment.bound = value; + } + @override TypeImpl? get boundShared => bound; @@ -11623,7 +11625,7 @@ class TypeParameterElementImpl2 extends TypeDefiningElementImpl2 shared.Variance get variance => firstFragment.variance; - set variance(shared.Variance value) { + set variance(shared.Variance? value) { firstFragment.variance = value; } diff --git a/pkg/analyzer/lib/src/dart/element/type_system.dart b/pkg/analyzer/lib/src/dart/element/type_system.dart index 3c49ca3b9854..1ea20c1f0fd3 100644 --- a/pkg/analyzer/lib/src/dart/element/type_system.dart +++ b/pkg/analyzer/lib/src/dart/element/type_system.dart @@ -818,10 +818,10 @@ class TypeSystemImpl implements TypeSystem { /// /// https://github.com/dart-lang/sdk/issues/27526#issuecomment-260021397 List instantiateTypeFormalsToBounds2( - List typeFormals, + List typeParameters, {List? hasError, Map? knownTypes}) { - int count = typeFormals.length; + int count = typeParameters.length; if (count == 0) { return const []; } @@ -832,7 +832,7 @@ class TypeSystemImpl implements TypeSystem { // not ground Map partials = {}; - for (var typeParameter in typeFormals) { + for (var typeParameter in typeParameters) { all.add(typeParameter); if (!defaults.containsKey(typeParameter)) { var bound = typeParameter.bound ?? DynamicTypeImpl.instance; @@ -886,7 +886,7 @@ class TypeSystemImpl implements TypeSystem { } List orderedArguments = - typeFormals.map((p) => defaults[p]!).toFixedList(); + typeParameters.map((p) => defaults[p]!).toFixedList(); return orderedArguments; } diff --git a/pkg/analyzer/lib/src/utilities/extensions/element.dart b/pkg/analyzer/lib/src/utilities/extensions/element.dart index f776afcc8d04..1fb4fd3d70fc 100644 --- a/pkg/analyzer/lib/src/utilities/extensions/element.dart +++ b/pkg/analyzer/lib/src/utilities/extensions/element.dart @@ -11,7 +11,6 @@ import 'package:analyzer/dart/element/type.dart'; import 'package:analyzer/src/dart/ast/ast.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/dart/element/member.dart'; -import 'package:analyzer/src/dart/element/type.dart'; import 'package:meta/meta.dart'; class MockLibraryImportElement implements Element2, PrefixFragment { @@ -685,9 +684,6 @@ extension TypeParameterElement2Extension on TypeParameterElement2 { return TypeParameterElementImpl2( firstFragment: fragment, name3: name3, - // TODO(paulberry): eliminate this cast by changing this extension to - // apply to `TypeParameterElementImpl2`. - bound: bound as TypeImpl?, ); } } @@ -698,6 +694,12 @@ extension TypeParameterElementExtension on TypeParameterElement { } } +extension TypeParameterElementImpl2Extension on TypeParameterElementImpl2 { + TypeParameterElementImpl get asElement { + return firstFragment; + } +} + extension TypeParameterElementImplExtension on TypeParameterElementImpl { TypeParameterElementImpl2 get asElement2 { return element; diff --git a/pkg/analyzer/test/generated/elements_types_mixin.dart b/pkg/analyzer/test/generated/elements_types_mixin.dart index 22f1ab5c7aec..98fca5bae829 100644 --- a/pkg/analyzer/test/generated/elements_types_mixin.dart +++ b/pkg/analyzer/test/generated/elements_types_mixin.dart @@ -127,7 +127,7 @@ mixin ElementsTypesMixin { bool isAugmentation = false, bool isSealed = false, InterfaceType? superType, - List typeParameters = const [], + List typeParameters = const [], List interfaces = const [], List mixins = const [], List methods = const [], @@ -137,7 +137,7 @@ mixin ElementsTypesMixin { fragment.isAugmentation = isAugmentation; fragment.isSealed = isSealed; fragment.enclosingElement3 = testLibrary.definingCompilationUnit; - fragment.typeParameters = typeParameters; + fragment.typeParameters = typeParameters.map((e) => e.asElement).toList(); fragment.supertype = superType ?? typeProvider.objectType; fragment.interfaces = interfaces; fragment.mixins = mixins; @@ -151,34 +151,40 @@ mixin ElementsTypesMixin { return fragment; } - ClassElementImpl class_2({ + ClassElementImpl2 class_2({ required String name, bool isAbstract = false, bool isAugmentation = false, bool isSealed = false, InterfaceType? superType, - List typeParameters = const [], + List typeParameters = const [], List interfaces = const [], List mixins = const [], - List methods = const [], + List methods = const [], }) { - return class_( - name: name, - isAbstract: isAbstract, - isAugmentation: isAugmentation, - isSealed: isSealed, - superType: superType, - typeParameters: typeParameters - .map((e) => e.asElement as TypeParameterElementImpl) - .toList(), - interfaces: interfaces, - mixins: mixins, - methods: methods); + var fragment = ClassElementImpl(name, 0); + fragment.isAbstract = isAbstract; + fragment.isAugmentation = isAugmentation; + fragment.isSealed = isSealed; + fragment.enclosingElement3 = testLibrary.definingCompilationUnit; + fragment.typeParameters = + typeParameters.map((e) => e.firstFragment).toList(); + fragment.supertype = superType ?? typeProvider.objectType; + fragment.interfaces = interfaces; + fragment.mixins = mixins; + fragment.methods = methods.map((e) => e.firstFragment).toList(); + + var element = ClassElementImpl2(Reference.root(), fragment); + element.mixins = fragment.mixins; + element.interfaces = fragment.interfaces; + element.methods = fragment.methods; + + return element; } InterfaceTypeImpl comparableNone(DartType type) { - var coreLibrary = typeProvider.intElement.library; - var element = coreLibrary.getClass('Comparable')!; + var coreLibrary = typeProvider.intElement2.library2; + var element = coreLibrary.getClass2('Comparable')!; return element.instantiate( typeArguments: [type], nullabilitySuffix: NullabilitySuffix.none, @@ -186,8 +192,8 @@ mixin ElementsTypesMixin { } InterfaceTypeImpl comparableQuestion(DartType type) { - var coreLibrary = typeProvider.intElement.library; - var element = coreLibrary.getClass('Comparable')!; + var coreLibrary = typeProvider.intElement2.library2; + var element = coreLibrary.getClass2('Comparable')!; return element.instantiate( typeArguments: [type], nullabilitySuffix: NullabilitySuffix.question, @@ -232,12 +238,12 @@ mixin ElementsTypesMixin { String name, { String representationName = 'it', required TypeImpl representationType, - List typeParameters = const [], + List typeParameters = const [], List interfaces = const [], }) { var fragment = ExtensionTypeElementImpl(name, -1); fragment.enclosingElement3 = testLibrary.definingCompilationUnit; - fragment.typeParameters = typeParameters; + fragment.typeParameters = typeParameters.map((e) => e.asElement).toList(); fragment.interfaces = interfaces; var field = FieldElementImpl(representationName, -1); @@ -255,13 +261,13 @@ mixin ElementsTypesMixin { } FunctionTypeImpl functionType({ - required List typeFormals, + required List typeParameters, required List parameters, required DartType returnType, required NullabilitySuffix nullabilitySuffix, }) { return FunctionTypeImpl( - typeFormals: typeFormals, + typeFormals: typeParameters.map((e) => e.asElement).toList(), parameters: parameters, returnType: returnType, nullabilitySuffix: nullabilitySuffix, @@ -269,12 +275,12 @@ mixin ElementsTypesMixin { } FunctionTypeImpl functionTypeNone({ - List typeFormals = const [], + List typeParameters = const [], List parameters = const [], required DartType returnType, }) { return functionType( - typeFormals: typeFormals, + typeParameters: typeParameters, parameters: parameters, returnType: returnType, nullabilitySuffix: NullabilitySuffix.none, @@ -282,23 +288,24 @@ mixin ElementsTypesMixin { } FunctionTypeImpl functionTypeNone2({ - List typeFormals = const [], + List typeParameters = const [], List parameters = const [], required DartType returnType, }) { return functionTypeNone( - parameters: parameters.map((e) => e.asElement).toList(), - typeFormals: typeFormals.map((e) => e.asElement).toList(), - returnType: returnType); + parameters: parameters.map((e) => e.asElement).toList(), + typeParameters: typeParameters, + returnType: returnType, + ); } FunctionTypeImpl functionTypeQuestion({ - List typeFormals = const [], + List typeParameters = const [], List parameters = const [], required DartType returnType, }) { return functionType( - typeFormals: typeFormals, + typeParameters: typeParameters, parameters: parameters, returnType: returnType, nullabilitySuffix: NullabilitySuffix.question, @@ -461,27 +468,27 @@ mixin ElementsTypesMixin { String name, DartType returnType, { bool isStatic = false, - List typeFormals = const [], + List typeParameters = const [], List parameters = const [], }) { return MethodElementImpl(name, 0) ..isStatic = isStatic ..parameters = parameters ..returnType = returnType - ..typeParameters = typeFormals; + ..typeParameters = typeParameters.map((e) => e.asElement).toList(); } MixinElementImpl mixin_({ required String name, bool isAugmentation = false, - List typeParameters = const [], + List typeParameters = const [], List? constraints, List interfaces = const [], }) { var fragment = MixinElementImpl(name, 0); fragment.isAugmentation = isAugmentation; fragment.enclosingElement3 = testLibrary.definingCompilationUnit; - fragment.typeParameters = typeParameters; + fragment.typeParameters = typeParameters.map((e) => e.asElement).toList(); fragment.superclassConstraints = constraints ?? [typeProvider.objectType]; fragment.interfaces = interfaces; fragment.constructors = const []; @@ -581,11 +588,11 @@ mixin ElementsTypesMixin { } TypeParameterTypeImpl promotedTypeParameterType({ - required TypeParameterElement element, + required TypeParameterElementImpl2 element, required NullabilitySuffix nullabilitySuffix, required DartType promotedBound, }) { - return TypeParameterTypeImpl( + return TypeParameterTypeImpl.v2( element: element, nullabilitySuffix: nullabilitySuffix, promotedBound: promotedBound, @@ -593,7 +600,7 @@ mixin ElementsTypesMixin { } TypeParameterTypeImpl promotedTypeParameterTypeNone( - TypeParameterElement element, + TypeParameterElementImpl2 element, DartType promotedBound, ) { return promotedTypeParameterType( @@ -603,18 +610,8 @@ mixin ElementsTypesMixin { ); } - TypeParameterTypeImpl promotedTypeParameterTypeNone2( - TypeParameterElement2 element, - DartType promotedBound, - ) { - return promotedTypeParameterTypeNone( - element.asElement, - promotedBound, - ); - } - TypeParameterTypeImpl promotedTypeParameterTypeQuestion( - TypeParameterElement element, + TypeParameterElementImpl2 element, DartType promotedBound, ) { return promotedTypeParameterType( @@ -624,13 +621,6 @@ mixin ElementsTypesMixin { ); } - TypeParameterTypeImpl promotedTypeParameterTypeQuestion2( - TypeParameterElement2 element, - DartType promotedBound, - ) { - return promotedTypeParameterTypeQuestion(element.asElement, promotedBound); - } - RecordTypeImpl recordType({ List positionalTypes = const [], Map namedTypes = const {}, @@ -700,21 +690,6 @@ mixin ElementsTypesMixin { .asElement2; } - TypeAliasElementImpl typeAlias({ - required String name, - required List typeParameters, - required DartType aliasedType, - }) { - var fragment = TypeAliasElementImpl(name, 0); - fragment.enclosingElement3 = testLibrary.definingCompilationUnit; - fragment.typeParameters = typeParameters; - fragment.aliasedType = aliasedType; - - TypeAliasElementImpl2(Reference.root(), fragment); - - return fragment; - } - TypeAliasElementImpl2 typeAlias2({ required String name, required List typeParameters, @@ -723,24 +698,12 @@ mixin ElementsTypesMixin { var fragment = TypeAliasElementImpl(name, 0); fragment.name2 = name; fragment.enclosingElement3 = testLibrary.definingCompilationUnit; - fragment.typeParameters = typeParameters - .map((e) => e.asElement as TypeParameterElementImpl) - .toList(); + fragment.typeParameters = typeParameters.map((e) => e.asElement).toList(); fragment.aliasedType = aliasedType; return TypeAliasElementImpl2(Reference.root(), fragment); } - TypeImpl typeAliasTypeNone( - TypeAliasElementImpl element, { - List typeArguments = const [], - }) { - return element.instantiate( - typeArguments: typeArguments, - nullabilitySuffix: NullabilitySuffix.none, - ); - } - TypeImpl typeAliasTypeNone2( TypeAliasElementImpl2 element, { List typeArguments = const [], @@ -751,25 +714,25 @@ mixin ElementsTypesMixin { ); } - TypeParameterElementImpl typeParameter(String name, - {DartType? bound, Variance? variance}) { - var element = TypeParameterElementImpl.synthetic(name); - element.bound = bound; + TypeParameterElementImpl2 typeParameter(String name, + {TypeImpl? bound, Variance? variance}) { + var fragment = TypeParameterElementImpl(name, -1); + fragment.bound = bound; + + var element = TypeParameterElementImpl2( + firstFragment: fragment, + name3: name, + ); element.variance = variance; return element; } - TypeParameterElementImpl2 typeParameter2(String name, - {DartType? bound, Variance? variance}) { - return typeParameter(name, bound: bound, variance: variance).asElement2; - } - TypeParameterTypeImpl typeParameterType( - TypeParameterElement element, { + TypeParameterElementImpl2 element, { required NullabilitySuffix nullabilitySuffix, DartType? promotedBound, }) { - return TypeParameterTypeImpl( + return TypeParameterTypeImpl.v2( element: element, nullabilitySuffix: nullabilitySuffix, promotedBound: promotedBound, @@ -777,7 +740,7 @@ mixin ElementsTypesMixin { } TypeParameterTypeImpl typeParameterTypeNone( - TypeParameterElement element, { + TypeParameterElementImpl2 element, { DartType? promotedBound, }) { return typeParameterType( @@ -787,18 +750,8 @@ mixin ElementsTypesMixin { ); } - TypeParameterTypeImpl typeParameterTypeNone2( - TypeParameterElement2 element, { - DartType? promotedBound, - }) { - return typeParameterTypeNone( - element.asElement, - promotedBound: promotedBound, - ); - } - TypeParameterTypeImpl typeParameterTypeQuestion( - TypeParameterElement element, { + TypeParameterElementImpl2 element, { DartType? promotedBound, }) { return typeParameterType( @@ -807,16 +760,6 @@ mixin ElementsTypesMixin { promotedBound: promotedBound, ); } - - TypeParameterTypeImpl typeParameterTypeQuestion2( - TypeParameterElement2 element, { - DartType? promotedBound, - }) { - return typeParameterTypeQuestion( - element.asElement, - promotedBound: promotedBound, - ); - } } class _MockSource implements Source { diff --git a/pkg/analyzer/test/generated/type_system_test.dart b/pkg/analyzer/test/generated/type_system_test.dart index f6672b1822a6..aed505e9859a 100644 --- a/pkg/analyzer/test/generated/type_system_test.dart +++ b/pkg/analyzer/test/generated/type_system_test.dart @@ -76,8 +76,8 @@ class TryPromoteToTest extends AbstractTypeSystemTest { expect(type.promotedBound, promotedBound); } - var T = typeParameter2('T'); - var T_none = typeParameterTypeNone2(T); + var T = typeParameter('T'); + var T_none = typeParameterTypeNone(T); var T1 = tryPromote(numNone, T_none); check(T1, T, NullabilitySuffix.none, numNone); diff --git a/pkg/analyzer/test/src/dart/constant/has_type_parameter_reference_test.dart b/pkg/analyzer/test/src/dart/constant/has_type_parameter_reference_test.dart index 83bf92301e10..7dbb38418372 100644 --- a/pkg/analyzer/test/src/dart/constant/has_type_parameter_reference_test.dart +++ b/pkg/analyzer/test/src/dart/constant/has_type_parameter_reference_test.dart @@ -41,7 +41,7 @@ class HasTypeParameterReferenceTest extends AbstractTypeSystemTest { _checkTrue( functionTypeNone( returnType: voidNone, - typeFormals: [typeParameter('S', bound: T_none)], + typeParameters: [typeParameter('S', bound: T_none)], ), ); } diff --git a/pkg/analyzer/test/src/dart/element/element_test.dart b/pkg/analyzer/test/src/dart/element/element_test.dart index 04d62c985bcc..6006c73ebf87 100644 --- a/pkg/analyzer/test/src/dart/element/element_test.dart +++ b/pkg/analyzer/test/src/dart/element/element_test.dart @@ -965,7 +965,7 @@ class FunctionTypeImplTest extends AbstractTypeSystemTest { void test_getNamedParameterTypes_namedParameters() { var type = functionTypeNone( - typeFormals: [], + typeParameters: [], parameters: [ requiredParameter(name: 'a', type: intNone), namedParameter(name: 'b', type: doubleNone), @@ -981,7 +981,7 @@ class FunctionTypeImplTest extends AbstractTypeSystemTest { void test_getNamedParameterTypes_noNamedParameters() { var type = functionTypeNone( - typeFormals: [], + typeParameters: [], parameters: [ requiredParameter(type: intNone), requiredParameter(type: doubleNone), @@ -995,7 +995,7 @@ class FunctionTypeImplTest extends AbstractTypeSystemTest { void test_getNamedParameterTypes_noParameters() { var type = functionTypeNone( - typeFormals: [], + typeParameters: [], parameters: [], returnType: voidNone, ); @@ -1005,7 +1005,7 @@ class FunctionTypeImplTest extends AbstractTypeSystemTest { void test_getNormalParameterTypes_noNormalParameters() { var type = functionTypeNone( - typeFormals: [], + typeParameters: [], parameters: [ positionalParameter(type: intNone), positionalParameter(type: doubleNone), @@ -1018,7 +1018,7 @@ class FunctionTypeImplTest extends AbstractTypeSystemTest { void test_getNormalParameterTypes_noParameters() { var type = functionTypeNone( - typeFormals: [], + typeParameters: [], parameters: [], returnType: voidNone, ); @@ -1028,7 +1028,7 @@ class FunctionTypeImplTest extends AbstractTypeSystemTest { void test_getNormalParameterTypes_normalParameters() { var type = functionTypeNone( - typeFormals: [], + typeParameters: [], parameters: [ requiredParameter(type: intNone), requiredParameter(type: doubleNone), @@ -1044,7 +1044,7 @@ class FunctionTypeImplTest extends AbstractTypeSystemTest { void test_getOptionalParameterTypes_noOptionalParameters() { var type = functionTypeNone( - typeFormals: [], + typeParameters: [], parameters: [ requiredParameter(name: 'a', type: intNone), namedParameter(name: 'b', type: doubleNone), @@ -1057,7 +1057,7 @@ class FunctionTypeImplTest extends AbstractTypeSystemTest { void test_getOptionalParameterTypes_noParameters() { var type = functionTypeNone( - typeFormals: [], + typeParameters: [], parameters: [], returnType: voidNone, ); @@ -1067,7 +1067,7 @@ class FunctionTypeImplTest extends AbstractTypeSystemTest { void test_getOptionalParameterTypes_optionalParameters() { var type = functionTypeNone( - typeFormals: [], + typeParameters: [], parameters: [ requiredParameter(type: intNone), positionalParameter(type: doubleNone), @@ -2050,13 +2050,14 @@ class TypeParameterTypeImplTest extends AbstractTypeSystemTest { } void test_creation() { - expect(typeParameterTypeNone(TypeParameterElementImpl('E', -1)), isNotNull); + var element = typeParameter('E'); + expect(typeParameterTypeNone(element), isNotNull); } void test_getElement() { - TypeParameterElementImpl element = TypeParameterElementImpl('E', -1); + var element = typeParameter('E'); TypeParameterTypeImpl type = typeParameterTypeNone(element); - expect(type.element, element); + expect(type.element3, element); } void _assert_asInstanceOf( 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 d457eb3441ba..893f00ac96b9 100644 --- a/pkg/analyzer/test/src/dart/element/function_type_test.dart +++ b/pkg/analyzer/test/src/dart/element/function_type_test.dart @@ -7,6 +7,7 @@ import 'package:analyzer/dart/element/nullability_suffix.dart'; import 'package:analyzer/dart/element/type.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/dart/element/type.dart'; +import 'package:analyzer/src/utilities/extensions/element.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; @@ -436,7 +437,7 @@ class FunctionTypeTest extends AbstractTypeSystemTest { var t = typeParameter('T'); var x = requiredParameter(name: 'x', type: typeParameterTypeNone(t)); FunctionType f = FunctionTypeImpl( - typeFormals: [t], + typeFormals: [t.asElement], parameters: [x], returnType: typeParameterTypeNone(t), nullabilitySuffix: NullabilitySuffix.none, @@ -454,7 +455,7 @@ class FunctionTypeTest extends AbstractTypeSystemTest { // dynamic Function() var t = typeParameter('T'); FunctionType f = FunctionTypeImpl( - typeFormals: [t], + typeFormals: [t.asElement], parameters: const [], returnType: dynamicType, nullabilitySuffix: NullabilitySuffix.none, @@ -537,16 +538,16 @@ class FunctionTypeTest extends AbstractTypeSystemTest { } test_synthetic_typeFormals() { - var t = typeParameter2('T'); + var t = typeParameter('T'); FunctionType f = FunctionTypeImpl.v2( typeParameters: [t], formalParameters: const [], - returnType: typeParameterTypeNone2(t), + returnType: typeParameterTypeNone(t), nullabilitySuffix: NullabilitySuffix.none, ); basicChecks(f, displayName: 'T Function()', - returnType: typeParameterTypeNone2(t), + returnType: typeParameterTypeNone(t), typeFormals: [same(t)]); } diff --git a/pkg/analyzer/test/src/dart/element/generic_inferrer_test.dart b/pkg/analyzer/test/src/dart/element/generic_inferrer_test.dart index ca93d120941a..87bd1792a811 100644 --- a/pkg/analyzer/test/src/dart/element/generic_inferrer_test.dart +++ b/pkg/analyzer/test/src/dart/element/generic_inferrer_test.dart @@ -32,7 +32,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { var tTo = typeParameter('TTo', bound: iterableNone(typeParameterTypeNone(tFrom))); var cast = functionTypeNone( - typeFormals: [tFrom, tTo], + typeParameters: [tFrom, tTo], parameters: [ requiredParameter( type: typeParameterTypeNone(tFrom), @@ -69,7 +69,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { var m = method( 'm', typeParameterTypeNone(S), - typeFormals: [S], + typeParameters: [S], parameters: [ requiredParameter( name: '_', @@ -122,7 +122,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { var m = method( 'm', typeParameterTypeNone(S), - typeFormals: [S], + typeParameters: [S], parameters: [ requiredParameter( name: '_', @@ -177,7 +177,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // (S, S) -> S var clone = functionTypeNone( - typeFormals: [S], + typeParameters: [S], parameters: [ requiredParameter(type: typeS), requiredParameter(type: typeS), @@ -198,17 +198,17 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { /// https://github.com/dart-lang/language/issues/1182#issuecomment-702272641 void test_demoteType() { // (T x) -> void - var T = typeParameter2('T'); + var T = typeParameter('T'); var rawType = functionTypeNone2( - typeFormals: [T], + typeParameters: [T], parameters: [ - requiredParameter2(type: typeParameterTypeNone2(T)), + requiredParameter2(type: typeParameterTypeNone(T)), ], returnType: voidNone, ); - var S = typeParameter2('S'); - var S_and_int = typeParameterTypeNone2(S, promotedBound: intNone); + var S = typeParameter('S'); + var S_and_int = typeParameterTypeNone(S, promotedBound: intNone); var inferredTypes = _inferCall(rawType, [S_and_int]); var inferredType = inferredTypes[0] as TypeParameterTypeImpl; @@ -221,7 +221,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { var tFrom = typeParameter('TFrom'); var tTo = typeParameter('TTo'); var cast = functionTypeNone( - typeFormals: [tFrom, tTo], + typeParameters: [tFrom, tTo], parameters: [ requiredParameter( type: typeParameterTypeNone(tFrom), @@ -240,7 +240,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { bound: typeParameterTypeNone(tFrom), ); var cast = functionTypeNone( - typeFormals: [tFrom, tTo], + typeParameters: [tFrom, tTo], parameters: [ requiredParameter( type: typeParameterTypeNone(tFrom), @@ -262,7 +262,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { var numFunction = functionTypeNone( parameters: [requiredParameter(type: numNone)], returnType: voidNone); var function = functionTypeNone( - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter(type: typeParameterTypeNone(T)), requiredParameter(type: tFunction) @@ -284,7 +284,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { var numFunction = functionTypeNone( parameters: [requiredParameter(type: numNone)], returnType: voidNone); var function = functionTypeNone( - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter(type: typeParameterTypeNone(T)), requiredParameter(type: tFunction) @@ -299,7 +299,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // (f(T t)) -> T var T = typeParameter('T'); var cast = functionTypeNone( - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter( type: functionTypeNone( @@ -331,7 +331,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // (T x, T y) -> T var T = typeParameter('T'); var cast = functionTypeNone( - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter(type: typeParameterTypeNone(T)), requiredParameter(type: typeParameterTypeNone(T)), @@ -345,7 +345,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // (T) -> dynamic var T = typeParameter('T', bound: numNone); var f = functionTypeNone( - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter(type: typeParameterTypeNone(T)), ], @@ -358,7 +358,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // (T -> T) -> (T -> void) var T = typeParameter('T'); var f = functionTypeNone( - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter( type: functionTypeNone( @@ -393,7 +393,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // (T -> T) -> (T -> Null) var T = typeParameter('T'); var f = functionTypeNone( - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter( type: functionTypeNone( @@ -430,7 +430,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // (T -> T) -> (T -> T) var T = typeParameter('T'); var f = functionTypeNone( - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter( type: functionTypeNone( @@ -465,7 +465,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // (T -> T) -> (() -> T) var T = typeParameter('T'); var f = functionTypeNone( - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter( type: functionTypeNone( @@ -497,7 +497,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // () -> T var T = typeParameter('T'); var f = functionTypeNone( - typeFormals: [T], + typeParameters: [T], returnType: typeParameterTypeNone(T), ); _assertTypes(_inferCall(f, [], returnType: stringNone), [stringNone]); @@ -507,7 +507,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // () -> T var T = typeParameter('T', bound: numNone); var f = functionTypeNone( - typeFormals: [T], + typeParameters: [T], returnType: typeParameterTypeNone(T), ); _assertTypes(_inferCall(f, [], returnType: doubleNone), [doubleNone]); @@ -517,7 +517,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // () -> T var T = typeParameter('T', bound: numNone); var f = functionTypeNone( - typeFormals: [T], + typeParameters: [T], returnType: typeParameterTypeNone(T), ); _assertTypes(_inferCall(f, [], returnType: stringNone), [neverNone]); @@ -527,7 +527,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // (f(T t), g(T t)) -> T var T = typeParameter('T'); var cast = functionTypeNone( - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter( type: functionTypeNone( @@ -575,7 +575,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // () -> T var T = typeParameter('T'); var f = functionTypeNone( - typeFormals: [T], + typeParameters: [T], returnType: typeParameterTypeNone(T), ); _assertTypes(_inferCall(f, []), [dynamicType]); @@ -585,7 +585,7 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { // () -> T var T = typeParameter('T', bound: numNone); var f = functionTypeNone( - typeFormals: [T], + typeParameters: [T], returnType: typeParameterTypeNone(T), ); _assertTypes(_inferCall(f, []), [numNone]); diff --git a/pkg/analyzer/test/src/dart/element/least_greatest_closure_test.dart b/pkg/analyzer/test/src/dart/element/least_greatest_closure_test.dart index a296df6515d1..141d10958f71 100644 --- a/pkg/analyzer/test/src/dart/element/least_greatest_closure_test.dart +++ b/pkg/analyzer/test/src/dart/element/least_greatest_closure_test.dart @@ -26,9 +26,9 @@ class GreatestClosureTest extends AbstractTypeSystemTest { void setUp() { super.setUp(); - T = typeParameter2('T'); - T_none = typeParameterTypeNone2(T); - T_question = typeParameterTypeQuestion2(T); + T = typeParameter('T'); + T_none = typeParameterTypeNone(T); + T_question = typeParameterTypeQuestion(T); } test_contravariant() { @@ -80,8 +80,8 @@ class GreatestClosureTest extends AbstractTypeSystemTest { // void Function() _check( functionTypeNone2( - typeFormals: [ - typeParameter2('U', bound: T_none), + typeParameters: [ + typeParameter('U', bound: T_none), ], returnType: voidNone, ), @@ -113,8 +113,8 @@ class GreatestClosureTest extends AbstractTypeSystemTest { ); _check1( - typeParameterTypeNone2( - typeParameter2('U'), + typeParameterTypeNone( + typeParameter('U'), ), 'U', ); diff --git a/pkg/analyzer/test/src/dart/element/least_upper_bound_helper_test.dart b/pkg/analyzer/test/src/dart/element/least_upper_bound_helper_test.dart index 9b74119ff2c0..cc36cc86e1e9 100644 --- a/pkg/analyzer/test/src/dart/element/least_upper_bound_helper_test.dart +++ b/pkg/analyzer/test/src/dart/element/least_upper_bound_helper_test.dart @@ -6,6 +6,7 @@ import 'package:analyzer/dart/element/type.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/dart/element/least_upper_bound.dart'; import 'package:analyzer/src/generated/testing/element_factory.dart'; +import 'package:analyzer/src/utilities/extensions/element.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; @@ -456,7 +457,8 @@ class SuperinterfaceSetTest extends AbstractTypeSystemTest { superType: instA, ); - var typeParametersC = ElementFactory.typeParameters(['T']); + var typeParametersC = + ElementFactory.typeParameters(['T']).map((e) => e.asElement2).toList(); var classC = class_( name: 'B', typeParameters: typeParametersC, diff --git a/pkg/analyzer/test/src/dart/element/non_covariant_type_parameter_position_test.dart b/pkg/analyzer/test/src/dart/element/non_covariant_type_parameter_position_test.dart index 7e65d27df1da..e9801f42fbd2 100644 --- a/pkg/analyzer/test/src/dart/element/non_covariant_type_parameter_position_test.dart +++ b/pkg/analyzer/test/src/dart/element/non_covariant_type_parameter_position_test.dart @@ -99,7 +99,7 @@ class NonCovariantTypeParameterPositionVisitorTest // void Function() expectNonCovariant( functionTypeNone( - typeFormals: [ + typeParameters: [ typeParameter('U', bound: T), ], returnType: voidNone, @@ -167,7 +167,7 @@ class NonCovariantTypeParameterPositionVisitorTest bool _compute(DartType type) { return type.accept( NonCovariantTypeParameterPositionVisitor( - [T_element.element], + [T_element], initialVariance: Variance.covariant, ), ); diff --git a/pkg/analyzer/test/src/dart/element/normalize_type_test.dart b/pkg/analyzer/test/src/dart/element/normalize_type_test.dart index 03d033f02734..d787b96aa9bd 100644 --- a/pkg/analyzer/test/src/dart/element/normalize_type_test.dart +++ b/pkg/analyzer/test/src/dart/element/normalize_type_test.dart @@ -2,9 +2,9 @@ // 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. -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'; import 'package:analyzer/src/dart/element/type.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; @@ -100,43 +100,43 @@ class NormalizeTypeTest extends AbstractTypeSystemTest with StringTypes { } test_functionType_parameter_typeParameter() { - TypeParameterElement2 T; - TypeParameterElement2 T2; + TypeParameterElementImpl2 T; + TypeParameterElementImpl2 T2; - T = typeParameter2('T', bound: neverNone); - T2 = typeParameter2('T2', bound: neverNone); + T = typeParameter('T', bound: neverNone); + T2 = typeParameter('T2', bound: neverNone); _check( functionTypeNone2( returnType: voidNone, - typeFormals: [T], + typeParameters: [T], parameters: [ - requiredParameter2(type: typeParameterTypeNone2(T)), + requiredParameter2(type: typeParameterTypeNone(T)), ], ), functionTypeNone2( returnType: voidNone, - typeFormals: [T2], + typeParameters: [T2], parameters: [ requiredParameter2(type: neverNone), ], ), ); - T = typeParameter2('T', bound: iterableNone(futureOrNone(dynamicType))); - T2 = typeParameter2('T2', bound: iterableNone(dynamicType)); + T = typeParameter('T', bound: iterableNone(futureOrNone(dynamicType))); + T2 = typeParameter('T2', bound: iterableNone(dynamicType)); _check( functionTypeNone2( returnType: voidNone, - typeFormals: [T], + typeParameters: [T], parameters: [ - requiredParameter2(type: typeParameterTypeNone2(T)), + requiredParameter2(type: typeParameterTypeNone(T)), ], ), functionTypeNone2( returnType: voidNone, - typeFormals: [T2], + typeParameters: [T2], parameters: [ - requiredParameter2(type: typeParameterTypeNone2(T2)), + requiredParameter2(type: typeParameterTypeNone(T2)), ], ), ); @@ -166,13 +166,13 @@ class NormalizeTypeTest extends AbstractTypeSystemTest with StringTypes { _check( functionTypeNone( returnType: voidNone, - typeFormals: [ + typeParameters: [ typeParameter('T', bound: futureOrNone(objectNone)), ], ), functionTypeNone( returnType: voidNone, - typeFormals: [ + typeParameters: [ typeParameter('T', bound: objectNone), ], ), @@ -183,13 +183,13 @@ class NormalizeTypeTest extends AbstractTypeSystemTest with StringTypes { _check( functionTypeNone( returnType: intNone, - typeFormals: [ + typeParameters: [ typeParameter('T', bound: numNone), ], ), functionTypeNone( returnType: intNone, - typeFormals: [ + typeParameters: [ typeParameter('T', bound: numNone), ], ), @@ -202,7 +202,7 @@ class NormalizeTypeTest extends AbstractTypeSystemTest with StringTypes { _check( functionTypeNone( returnType: typeParameterTypeNone(T), - typeFormals: [T], + typeParameters: [T], parameters: [ requiredParameter( type: typeParameterTypeNone(T), @@ -211,7 +211,7 @@ class NormalizeTypeTest extends AbstractTypeSystemTest with StringTypes { ), functionTypeNone( returnType: typeParameterTypeNone(T2), - typeFormals: [T2], + typeParameters: [T2], parameters: [ requiredParameter( type: typeParameterTypeNone(T2), @@ -229,7 +229,7 @@ class NormalizeTypeTest extends AbstractTypeSystemTest with StringTypes { _check( functionTypeNone( returnType: typeParameterTypeNone(T), - typeFormals: [T, S], + typeParameters: [T, S], parameters: [ requiredParameter( type: typeParameterTypeNone(T), @@ -241,7 +241,7 @@ class NormalizeTypeTest extends AbstractTypeSystemTest with StringTypes { ), functionTypeNone( returnType: typeParameterTypeNone(T2), - typeFormals: [T2, S2], + typeParameters: [T2, S2], parameters: [ requiredParameter( type: typeParameterTypeNone(T2), @@ -379,19 +379,19 @@ class NormalizeTypeTest extends AbstractTypeSystemTest with StringTypes { /// NORM(X & T) /// * let S be NORM(T) test_typeParameter_bound() { - TypeParameterElement2 T; + TypeParameterElementImpl2 T; // * if S is Never then Never - T = typeParameter2('T', bound: neverNone); - _check(typeParameterTypeNone2(T), neverNone); + T = typeParameter('T', bound: neverNone); + _check(typeParameterTypeNone(T), neverNone); // * else X - T = typeParameter2('T'); - _check(typeParameterTypeNone2(T), typeParameterTypeNone2(T)); + T = typeParameter('T'); + _check(typeParameterTypeNone(T), typeParameterTypeNone(T)); // * else X - T = typeParameter2('T', bound: futureOrNone(objectNone)); - _check(typeParameterTypeNone2(T), typeParameterTypeNone2(T)); + T = typeParameter('T', bound: futureOrNone(objectNone)); + _check(typeParameterTypeNone(T), typeParameterTypeNone(T)); } test_typeParameter_bound_recursive() { diff --git a/pkg/analyzer/test/src/dart/element/nullable_test.dart b/pkg/analyzer/test/src/dart/element/nullable_test.dart index 755f17a6ce12..860e3b14a09f 100644 --- a/pkg/analyzer/test/src/dart/element/nullable_test.dart +++ b/pkg/analyzer/test/src/dart/element/nullable_test.dart @@ -582,93 +582,93 @@ class PromoteToNonNullTest extends AbstractTypeSystemTest { } test_typeParameter_bound_dynamic() { - var element = typeParameter2('T', bound: dynamicType); + var element = typeParameter('T', bound: dynamicType); _checkTypeParameter( - typeParameterTypeNone2(element), + typeParameterTypeNone(element), element: element, promotedBound: null, ); } test_typeParameter_bound_invalidType() { - var element = typeParameter2('T', bound: invalidType); + var element = typeParameter('T', bound: invalidType); _checkTypeParameter( - typeParameterTypeNone2(element), + typeParameterTypeNone(element), element: element, promotedBound: null, ); } test_typeParameter_bound_none() { - var element = typeParameter2('T', bound: intNone); + var element = typeParameter('T', bound: intNone); _checkTypeParameter( - typeParameterTypeNone2(element), + typeParameterTypeNone(element), element: element, promotedBound: null, ); _checkTypeParameter( - typeParameterTypeQuestion2(element), + typeParameterTypeQuestion(element), element: element, promotedBound: null, ); } test_typeParameter_bound_null() { - var element = typeParameter2('T'); + var element = typeParameter('T'); _checkTypeParameter( - typeParameterTypeNone2(element), + typeParameterTypeNone(element), element: element, promotedBound: objectNone, ); } test_typeParameter_bound_question() { - var element = typeParameter2('T', bound: intQuestion); + var element = typeParameter('T', bound: intQuestion); _checkTypeParameter( - typeParameterTypeNone2(element), + typeParameterTypeNone(element), element: element, promotedBound: intNone, ); _checkTypeParameter( - typeParameterTypeQuestion2(element), + typeParameterTypeQuestion(element), element: element, promotedBound: intNone, ); } test_typeParameter_promotedBound_none() { - var element = typeParameter2('T', bound: numQuestion); + var element = typeParameter('T', bound: numQuestion); _checkTypeParameter( - promotedTypeParameterTypeNone2(element, intNone), + promotedTypeParameterTypeNone(element, intNone), element: element, promotedBound: intNone, ); _checkTypeParameter( - promotedTypeParameterTypeQuestion2(element, intNone), + promotedTypeParameterTypeQuestion(element, intNone), element: element, promotedBound: intNone, ); } test_typeParameter_promotedBound_question() { - var element = typeParameter2('T', bound: numQuestion); + var element = typeParameter('T', bound: numQuestion); _checkTypeParameter( - promotedTypeParameterTypeNone2(element, intQuestion), + promotedTypeParameterTypeNone(element, intQuestion), element: element, promotedBound: intNone, ); _checkTypeParameter( - promotedTypeParameterTypeQuestion2(element, intQuestion), + promotedTypeParameterTypeQuestion(element, intQuestion), element: element, promotedBound: intNone, ); diff --git a/pkg/analyzer/test/src/dart/element/replace_top_bottom_test.dart b/pkg/analyzer/test/src/dart/element/replace_top_bottom_test.dart index 3a0c68e25f58..e6cc0df6e93e 100644 --- a/pkg/analyzer/test/src/dart/element/replace_top_bottom_test.dart +++ b/pkg/analyzer/test/src/dart/element/replace_top_bottom_test.dart @@ -81,7 +81,7 @@ class ReplaceTopBottomTest extends AbstractTypeSystemTest { // typedef F = T Function(T); var T = typeParameter('T', variance: Variance.invariant); var T_none = typeParameterTypeNone(T); - var F = typeAlias( + var F = typeAlias2( name: 'F', typeParameters: [T], aliasedType: functionTypeNone( diff --git a/pkg/analyzer/test/src/dart/element/runtime_type_equality_test.dart b/pkg/analyzer/test/src/dart/element/runtime_type_equality_test.dart index af91c8c5e2f2..66de3d0ae9d4 100644 --- a/pkg/analyzer/test/src/dart/element/runtime_type_equality_test.dart +++ b/pkg/analyzer/test/src/dart/element/runtime_type_equality_test.dart @@ -173,7 +173,7 @@ class RuntimeTypeEqualityTypeTest extends AbstractTypeSystemTest var T1_T = typeParameter('T', bound: numNone); _check( functionTypeNone( - typeFormals: [T1_T], + typeParameters: [T1_T], returnType: voidNone, ), functionTypeNone( @@ -188,11 +188,11 @@ class RuntimeTypeEqualityTypeTest extends AbstractTypeSystemTest var T2_U = typeParameter('U'); _check( functionTypeNone( - typeFormals: [T1_T], + typeParameters: [T1_T], returnType: voidNone, ), functionTypeNone( - typeFormals: [T2_U], + typeParameters: [T2_U], returnType: voidNone, ), false, @@ -204,7 +204,7 @@ class RuntimeTypeEqualityTypeTest extends AbstractTypeSystemTest var T2_U = typeParameter('U'); _check( functionTypeNone( - typeFormals: [T1_T], + typeParameters: [T1_T], returnType: typeParameterTypeNone(T1_T), parameters: [ requiredParameter( @@ -213,7 +213,7 @@ class RuntimeTypeEqualityTypeTest extends AbstractTypeSystemTest ], ), functionTypeNone( - typeFormals: [T2_U], + typeParameters: [T2_U], returnType: typeParameterTypeNone(T2_U), parameters: [ requiredParameter( diff --git a/pkg/analyzer/test/src/dart/element/subtype_test.dart b/pkg/analyzer/test/src/dart/element/subtype_test.dart index 6f5103cc863d..9975a5c9a982 100644 --- a/pkg/analyzer/test/src/dart/element/subtype_test.dart +++ b/pkg/analyzer/test/src/dart/element/subtype_test.dart @@ -4,9 +4,9 @@ import 'package:_fe_analyzer_shared/src/type_inference/type_analyzer_operations.dart' show Variance; -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'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; @@ -152,7 +152,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), requiredParameter(type: numNone), @@ -160,7 +160,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), requiredParameter(type: typeParameterTypeNone(E1)), @@ -178,14 +178,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], returnType: intNone, ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), ], @@ -202,14 +202,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), ], @@ -226,14 +226,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: intNone), ], returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: intNone), ], @@ -250,14 +250,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), ], @@ -274,14 +274,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), ], @@ -298,14 +298,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), ], @@ -321,7 +321,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: intNone), ], @@ -345,14 +345,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0, F0], + typeParameters: [E0, F0], parameters: [ requiredParameter(type: intNone), ], returnType: intNone, ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: intNone), ], @@ -376,14 +376,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), ], @@ -407,14 +407,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), ], @@ -435,7 +435,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), requiredParameter(type: listNone(objectNone)), @@ -443,7 +443,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), requiredParameter(type: typeParameterTypeNone(E1)), @@ -465,7 +465,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), requiredParameter(type: listNone(objectNone)), @@ -475,7 +475,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { ), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), requiredParameter(type: typeParameterTypeNone(E1)), @@ -497,7 +497,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), requiredParameter(type: listNone(objectNone)), @@ -505,7 +505,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { returnType: intNone, ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), requiredParameter(type: typeParameterTypeNone(E1)), @@ -527,7 +527,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), requiredParameter(type: listNone(objectNone)), @@ -535,7 +535,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), requiredParameter(type: typeParameterTypeNone(E1)), @@ -1527,11 +1527,11 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], returnType: voidNone, ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], returnType: voidNone, ), strT0: 'void Function()', @@ -1562,11 +1562,11 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { // We test that all type parameters replaced at once, not as we go. isSubtype( functionTypeNone( - typeFormals: [R1, T1], + typeParameters: [R1, T1], returnType: voidNone, ), functionTypeNone( - typeFormals: [R2, T2], + typeParameters: [R2, T2], returnType: voidNone, ), strT0: 'void Function()', @@ -1582,7 +1582,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], @@ -1594,7 +1594,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { ), ), functionTypeNone( - typeFormals: [F1], + typeParameters: [F1], parameters: [ requiredParameter(type: typeParameterTypeNone(F1)), ], @@ -1611,7 +1611,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), requiredParameter( @@ -1627,7 +1627,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), requiredParameter( @@ -1648,7 +1648,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0, F0], + typeParameters: [E0, F0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], @@ -1660,12 +1660,12 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { ), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), ], returnType: functionTypeNone( - typeFormals: [F1], + typeParameters: [F1], parameters: [ requiredParameter(type: typeParameterTypeNone(F1)), ], @@ -1678,7 +1678,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0, F0], + typeParameters: [E0, F0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], @@ -1690,7 +1690,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { ), ), functionTypeNone( - typeFormals: [F1, E1], + typeParameters: [F1, E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), ], @@ -1712,14 +1712,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), ], returnType: intNone, ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), ], @@ -1731,14 +1731,14 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: numNone), ], returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: intNone), ], @@ -1750,7 +1750,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), requiredParameter(type: numNone), @@ -1758,7 +1758,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), requiredParameter(type: intNone), @@ -1771,7 +1771,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { isNotSubtype( functionTypeNone( - typeFormals: [E0], + typeParameters: [E0], parameters: [ requiredParameter(type: typeParameterTypeNone(E0)), requiredParameter(type: numNone), @@ -1779,7 +1779,7 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { returnType: typeParameterTypeNone(E0), ), functionTypeNone( - typeFormals: [E1], + typeParameters: [E1], parameters: [ requiredParameter(type: typeParameterTypeNone(E1)), requiredParameter(type: typeParameterTypeNone(E1)), @@ -3076,113 +3076,113 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { } test_multi_futureOr_typeParameter() { - TypeParameterElement2 E; + TypeParameterElementImpl2 E; - E = typeParameter2('E', bound: objectNone); + E = typeParameter('E', bound: objectNone); isSubtype( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), futureOrNone( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), ), strT0: 'E, E extends Object', strT1: 'FutureOr, E extends Object', ); - E = typeParameter2('E', bound: objectNone); + E = typeParameter('E', bound: objectNone); isSubtype( - typeParameterTypeQuestion2(E), + typeParameterTypeQuestion(E), futureOrQuestion( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), ), strT0: 'E?, E extends Object', strT1: 'FutureOr?, E extends Object', ); isSubtype( - typeParameterTypeQuestion2(E), + typeParameterTypeQuestion(E), futureOrNone( - typeParameterTypeQuestion2(E), + typeParameterTypeQuestion(E), ), strT0: 'E?, E extends Object', strT1: 'FutureOr, E extends Object', ); isNotSubtype( - typeParameterTypeQuestion2(E), + typeParameterTypeQuestion(E), futureOrNone( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), ), strT0: 'E?, E extends Object', strT1: 'FutureOr, E extends Object', ); - E = typeParameter2('E', bound: objectQuestion); + E = typeParameter('E', bound: objectQuestion); isSubtype( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), futureOrQuestion( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), ), strT0: 'E, E extends Object?', strT1: 'FutureOr?, E extends Object?', ); isSubtype( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), futureOrNone( - typeParameterTypeQuestion2(E), + typeParameterTypeQuestion(E), ), strT0: 'E, E extends Object?', strT1: 'FutureOr, E extends Object?', ); isSubtype( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), futureOrNone( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), ), strT0: 'E, E extends Object?', strT1: 'FutureOr, E extends Object?', ); - E = typeParameter2('E', bound: objectNone); + E = typeParameter('E', bound: objectNone); isNotSubtype( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), futureOrNone(stringNone), strT0: 'E, E extends Object', strT1: 'FutureOr', ); - E = typeParameter2('E', bound: stringNone); + E = typeParameter('E', bound: stringNone); isSubtype( - typeParameterTypeQuestion2(E), + typeParameterTypeQuestion(E), futureOrQuestion(stringNone), strT0: 'E?, E extends String', strT1: 'FutureOr?', ); isSubtype( - typeParameterTypeQuestion2(E), + typeParameterTypeQuestion(E), futureOrNone(stringQuestion), strT0: 'E?, E extends String', strT1: 'FutureOr', ); isNotSubtype( - typeParameterTypeQuestion2(E), + typeParameterTypeQuestion(E), futureOrNone(stringNone), strT0: 'E?, E extends String', strT1: 'FutureOr', ); - E = typeParameter2('E', bound: stringQuestion); + E = typeParameter('E', bound: stringQuestion); isSubtype( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), futureOrQuestion(stringNone), strT0: 'E, E extends String?', strT1: 'FutureOr?', ); isSubtype( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), futureOrNone(stringQuestion), strT0: 'E, E extends String?', strT1: 'FutureOr', ); isNotSubtype( - typeParameterTypeNone2(E), + typeParameterTypeNone(E), futureOrNone(stringNone), strT0: 'E, E extends String?', strT1: 'FutureOr', @@ -3190,178 +3190,178 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { } test_multi_futureOr_typeParameter_promotion() { - TypeParameterElement2 S; - TypeParameterElement2 T; + TypeParameterElementImpl2 S; + TypeParameterElementImpl2 T; - T = typeParameter2('T', bound: objectNone); + T = typeParameter('T', bound: objectNone); isSubtype( - promotedTypeParameterTypeNone2(T, intNone), + promotedTypeParameterTypeNone(T, intNone), futureOrNone(numNone), strT0: 'T & int, T extends Object', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, intNone), + promotedTypeParameterTypeNone(T, intNone), futureOrNone(numQuestion), strT0: 'T & int, T extends Object', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, intNone), + promotedTypeParameterTypeNone(T, intNone), futureOrQuestion(numNone), strT0: 'T & int, T extends Object', strT1: 'FutureOr?', ); - T = typeParameter2('T', bound: objectQuestion); + T = typeParameter('T', bound: objectQuestion); isSubtype( - promotedTypeParameterTypeNone2(T, intNone), + promotedTypeParameterTypeNone(T, intNone), futureOrNone(numNone), strT0: 'T & int, T extends Object?', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, intNone), + promotedTypeParameterTypeNone(T, intNone), futureOrNone(numQuestion), strT0: 'T & int, T extends Object?', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, intNone), + promotedTypeParameterTypeNone(T, intNone), futureOrQuestion(numNone), strT0: 'T & int, T extends Object?', strT1: 'FutureOr?', ); - T = typeParameter2('T', bound: objectQuestion); + T = typeParameter('T', bound: objectQuestion); isNotSubtype( - promotedTypeParameterTypeNone2(T, intQuestion), + promotedTypeParameterTypeNone(T, intQuestion), futureOrNone(numNone), strT0: 'T & int?, T extends Object?', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, intQuestion), + promotedTypeParameterTypeNone(T, intQuestion), futureOrNone(numQuestion), strT0: 'T & int?, T extends Object?', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, intQuestion), + promotedTypeParameterTypeNone(T, intQuestion), futureOrQuestion(numNone), strT0: 'T & int?, T extends Object?', strT1: 'FutureOr?', ); - T = typeParameter2('T', bound: objectQuestion); - S = typeParameter2('S', bound: typeParameterTypeNone2(T)); + T = typeParameter('T', bound: objectQuestion); + S = typeParameter('S', bound: typeParameterTypeNone(T)); isNotSubtype( - promotedTypeParameterTypeNone2(T, typeParameterTypeNone2(S)), + promotedTypeParameterTypeNone(T, typeParameterTypeNone(S)), futureOrNone(objectNone), strT0: 'T & S, T extends Object?', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, typeParameterTypeNone2(S)), + promotedTypeParameterTypeNone(T, typeParameterTypeNone(S)), futureOrNone(objectQuestion), strT0: 'T & S, T extends Object?', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, typeParameterTypeNone2(S)), + promotedTypeParameterTypeNone(T, typeParameterTypeNone(S)), futureOrQuestion(objectNone), strT0: 'T & S, T extends Object?', strT1: 'FutureOr?', ); - T = typeParameter2('T', bound: objectNone); + T = typeParameter('T', bound: objectNone); isSubtype( - promotedTypeParameterTypeNone2(T, futureNone(numNone)), + promotedTypeParameterTypeNone(T, futureNone(numNone)), futureOrNone(numNone), strT0: 'T & Future, T extends Object', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, futureNone(intNone)), + promotedTypeParameterTypeNone(T, futureNone(intNone)), futureOrNone(numNone), strT0: 'T & Future, T extends Object', strT1: 'FutureOr', ); - T = typeParameter2('T', bound: objectNone); + T = typeParameter('T', bound: objectNone); isSubtype( - promotedTypeParameterTypeNone2(T, futureNone(intNone)), + promotedTypeParameterTypeNone(T, futureNone(intNone)), futureOrNone(numNone), strT0: 'T & Future, T extends Object', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, futureNone(intNone)), + promotedTypeParameterTypeNone(T, futureNone(intNone)), futureOrNone(numQuestion), strT0: 'T & Future, T extends Object', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, futureNone(intNone)), + promotedTypeParameterTypeNone(T, futureNone(intNone)), futureOrQuestion(numNone), strT0: 'T & Future, T extends Object', strT1: 'FutureOr?', ); - T = typeParameter2('T', bound: objectQuestion); + T = typeParameter('T', bound: objectQuestion); isSubtype( - promotedTypeParameterTypeNone2(T, futureNone(intNone)), + promotedTypeParameterTypeNone(T, futureNone(intNone)), futureOrNone(numNone), strT0: 'T & Future, T extends Object?', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, futureNone(intNone)), + promotedTypeParameterTypeNone(T, futureNone(intNone)), futureOrNone(numQuestion), strT0: 'T & Future, T extends Object?', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, futureNone(intNone)), + promotedTypeParameterTypeNone(T, futureNone(intNone)), futureOrQuestion(numNone), strT0: 'T & Future, T extends Object?', strT1: 'FutureOr?', ); isNotSubtype( - promotedTypeParameterTypeNone2(T, futureQuestion(intNone)), + promotedTypeParameterTypeNone(T, futureQuestion(intNone)), futureOrNone(numNone), strT0: 'T & Future?, T extends Object?', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, futureQuestion(intNone)), + promotedTypeParameterTypeNone(T, futureQuestion(intNone)), futureOrNone(numQuestion), strT0: 'T & Future?, T extends Object?', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, futureQuestion(intNone)), + promotedTypeParameterTypeNone(T, futureQuestion(intNone)), futureOrQuestion(numNone), strT0: 'T & Future?, T extends Object?', strT1: 'FutureOr?', ); - T = typeParameter2('T', bound: objectNone); + T = typeParameter('T', bound: objectNone); isNotSubtype( - promotedTypeParameterTypeNone2(T, futureNone(intQuestion)), + promotedTypeParameterTypeNone(T, futureNone(intQuestion)), futureOrNone(numNone), strT0: 'T & Future, T extends Object', strT1: 'FutureOr', ); isSubtype( - promotedTypeParameterTypeNone2(T, futureNone(intQuestion)), + promotedTypeParameterTypeNone(T, futureNone(intQuestion)), futureOrNone(numQuestion), strT0: 'T & Future, T extends Object', strT1: 'FutureOr', ); isNotSubtype( - promotedTypeParameterTypeNone2(T, futureNone(intQuestion)), + promotedTypeParameterTypeNone(T, futureNone(intQuestion)), futureOrQuestion(numNone), strT0: 'T & Future, T extends Object', strT1: 'FutureOr?', @@ -3487,66 +3487,66 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { } test_multi_typeParameter_promotion() { - TypeParameterElement2 T; + TypeParameterElementImpl2 T; - T = typeParameter2('T', bound: intNone); + T = typeParameter('T', bound: intNone); isSubtype( - typeParameterTypeNone2(T), - promotedTypeParameterTypeNone2(T, intNone), + typeParameterTypeNone(T), + promotedTypeParameterTypeNone(T, intNone), strT0: 'T, T extends int', strT1: 'T & int, T extends int', ); isNotSubtype( - typeParameterTypeQuestion2(T), - promotedTypeParameterTypeNone2(T, intNone), + typeParameterTypeQuestion(T), + promotedTypeParameterTypeNone(T, intNone), strT0: 'T?, T extends int', strT1: 'T & int, T extends int', ); - T = typeParameter2('T', bound: intQuestion); + T = typeParameter('T', bound: intQuestion); isNotSubtype( - typeParameterTypeNone2(T), - promotedTypeParameterTypeNone2(T, intNone), + typeParameterTypeNone(T), + promotedTypeParameterTypeNone(T, intNone), strT0: 'T, T extends int?', strT1: 'T & int, T extends int?', ); isSubtype( - typeParameterTypeNone2(T), - promotedTypeParameterTypeNone2(T, intQuestion), + typeParameterTypeNone(T), + promotedTypeParameterTypeNone(T, intQuestion), strT0: 'T, T extends int?', strT1: 'T & int?, T extends int?', ); isNotSubtype( - typeParameterTypeQuestion2(T), - promotedTypeParameterTypeNone2(T, intQuestion), + typeParameterTypeQuestion(T), + promotedTypeParameterTypeNone(T, intQuestion), strT0: 'T?, T extends int?', strT1: 'T & int?, T extends int?', ); - T = typeParameter2('T', bound: numNone); + T = typeParameter('T', bound: numNone); isSubtype( - typeParameterTypeNone2(T), - typeParameterTypeNone2(T), + typeParameterTypeNone(T), + typeParameterTypeNone(T), strT0: 'T, T extends num', strT1: 'T, T extends num', ); isSubtype( - typeParameterTypeQuestion2(T), - typeParameterTypeQuestion2(T), + typeParameterTypeQuestion(T), + typeParameterTypeQuestion(T), strT0: 'T?, T extends num', strT1: 'T?, T extends num', ); - T = typeParameter2('T', bound: numQuestion); + T = typeParameter('T', bound: numQuestion); isSubtype( - typeParameterTypeNone2(T), - typeParameterTypeNone2(T), + typeParameterTypeNone(T), + typeParameterTypeNone(T), strT0: 'T, T extends num?', strT1: 'T, T extends num?', ); isSubtype( - typeParameterTypeQuestion2(T), - typeParameterTypeQuestion2(T), + typeParameterTypeQuestion(T), + typeParameterTypeQuestion(T), strT0: 'T?, T extends num?', strT1: 'T?, T extends num?', ); @@ -4430,12 +4430,12 @@ class SubtypeTest extends _SubtypingTestBase with StringTypes { var T1 = typeParameter('T2', bound: voidNone); var f0 = functionTypeNone( - typeFormals: [T0], + typeParameters: [T0], returnType: typeParameterTypeNone(T0), ); var f1 = functionTypeNone( - typeFormals: [T1], + typeParameters: [T1], returnType: typeParameterTypeNone(T1), ); diff --git a/pkg/analyzer/test/src/dart/element/top_merge_test.dart b/pkg/analyzer/test/src/dart/element/top_merge_test.dart index 3bd899ea49c1..063cc0e59488 100644 --- a/pkg/analyzer/test/src/dart/element/top_merge_test.dart +++ b/pkg/analyzer/test/src/dart/element/top_merge_test.dart @@ -170,15 +170,15 @@ class TopMergeTest extends AbstractTypeSystemTest { var TR = typeParameter('T', bound: objectQuestion); _check( functionTypeNone( - typeFormals: [T1], + typeParameters: [T1], returnType: typeParameterTypeNone(T1), ), functionTypeNone( - typeFormals: [T2], + typeParameters: [T2], returnType: typeParameterTypeNone(T2), ), functionTypeNone( - typeFormals: [TR], + typeParameters: [TR], returnType: typeParameterTypeNone(TR), ), ); @@ -189,11 +189,11 @@ class TopMergeTest extends AbstractTypeSystemTest { var T2 = typeParameter('T'); _checkThrows( functionTypeNone( - typeFormals: [T1], + typeParameters: [T1], returnType: typeParameterTypeNone(T1), ), functionTypeNone( - typeFormals: [T2], + typeParameters: [T2], returnType: typeParameterTypeNone(T2), ), ); diff --git a/pkg/analyzer/test/src/dart/element/type_algebra_test.dart b/pkg/analyzer/test/src/dart/element/type_algebra_test.dart index 268763db5b50..f6c2c4e1b464 100644 --- a/pkg/analyzer/test/src/dart/element/type_algebra_test.dart +++ b/pkg/analyzer/test/src/dart/element/type_algebra_test.dart @@ -27,10 +27,10 @@ main() { class SubstituteEmptyTest extends _Base { test_interface() async { // class A {} - var T = typeParameter2('T'); + var T = typeParameter('T'); var A = class_2(name: 'A', typeParameters: [T]); - var type = interfaceTypeNone(A, typeArguments: [intNone]); + var type = interfaceTypeNone2(A, typeArguments: [intNone]); var result = Substitution.empty.substituteType(type); expect(result, same(type)); @@ -41,18 +41,18 @@ class SubstituteEmptyTest extends _Base { class SubstituteFromInterfaceTypeTest extends _Base { test_interface() async { // class A {} - var T = typeParameter2('T'); + var T = typeParameter('T'); var A = class_2(name: 'A', typeParameters: [T]); // class B {} - var U = typeParameter2('U'); + var U = typeParameter('U'); var B = class_2(name: 'B', typeParameters: [U]); - var BofInt = interfaceTypeNone(B, typeArguments: [intNone]); + var BofInt = interfaceTypeNone2(B, typeArguments: [intNone]); var substitution = Substitution.fromInterfaceType(BofInt); // A - var type = interfaceTypeNone(A, typeArguments: [typeParameterTypeNone2(U)]); + var type = interfaceTypeNone2(A, typeArguments: [typeParameterTypeNone(U)]); assertType(type, 'A'); var result = substitution.substituteType(type); @@ -64,15 +64,15 @@ class SubstituteFromInterfaceTypeTest extends _Base { class SubstituteFromPairsTest extends _Base { test_interface() async { // class A {} - var T = typeParameter2('T'); - var U = typeParameter2('U'); + var T = typeParameter('T'); + var U = typeParameter('U'); var A = class_2(name: 'A', typeParameters: [T, U]); - var type = interfaceTypeNone( + var type = interfaceTypeNone2( A, typeArguments: [ - typeParameterTypeNone2(T), - typeParameterTypeNone2(U), + typeParameterTypeNone(T), + typeParameterTypeNone(U), ], ); @@ -87,18 +87,18 @@ class SubstituteFromPairsTest extends _Base { @reflectiveTest class SubstituteTest extends _Base { test_bottom() async { - var T = typeParameter2('T'); + var T = typeParameter('T'); _assertIdenticalType(typeProvider.bottomType, {T: intNone}); } test_dynamic() async { - var T = typeParameter2('T'); + var T = typeParameter('T'); _assertIdenticalType(typeProvider.dynamicType, {T: intNone}); } test_function_fromAlias_hasRef() async { // typedef Alias = void Function(); - var T = typeParameter2('T'); + var T = typeParameter('T'); var Alias = typeAlias2( name: 'Alias', typeParameters: [T], @@ -107,9 +107,9 @@ class SubstituteTest extends _Base { ), ); - var U = typeParameter2('U'); + var U = typeParameter('U'); var type = typeAliasTypeNone2(Alias, typeArguments: [ - typeParameterTypeNone2(U), + typeParameterTypeNone(U), ]); assertType(type, 'void Function() via Alias'); _assertSubstitution(type, {U: intNone}, 'void Function() via Alias'); @@ -117,7 +117,7 @@ class SubstituteTest extends _Base { test_function_fromAlias_noRef() async { // typedef Alias = void Function(); - var T = typeParameter2('T'); + var T = typeParameter('T'); var Alias = typeAlias2( name: 'Alias', typeParameters: [T], @@ -129,13 +129,13 @@ class SubstituteTest extends _Base { var type = typeAliasTypeNone2(Alias, typeArguments: [doubleNone]); assertType(type, 'void Function() via Alias'); - var U = typeParameter2('U'); + var U = typeParameter('U'); _assertIdenticalType(type, {U: intNone}); } test_function_fromAlias_noTypeParameters() async { // typedef Alias = void Function(); - var T = typeParameter2('T'); + var T = typeParameter('T'); var Alias = typeAlias2( name: 'Alias', typeParameters: [T], @@ -147,7 +147,7 @@ class SubstituteTest extends _Base { var type = typeAliasTypeNone2(Alias, typeArguments: [intNone]); assertType(type, 'void Function() via Alias'); - var U = typeParameter2('U'); + var U = typeParameter('U'); _assertIdenticalType(type, {U: intNone}); } @@ -159,20 +159,20 @@ class SubstituteTest extends _Base { returnType: boolNone, ); - var T = typeParameter2('T'); + var T = typeParameter('T'); _assertIdenticalType(type, {T: intNone}); } test_function_parameters_returnType() async { // typedef F = T Function(U u, bool); - var T = typeParameter2('T'); - var U = typeParameter2('U'); + var T = typeParameter('T'); + var U = typeParameter('U'); var type = functionTypeNone2( parameters: [ - requiredParameter2(type: typeParameterTypeNone2(U)), + requiredParameter2(type: typeParameterTypeNone(U)), requiredParameter2(type: boolNone), ], - returnType: typeParameterTypeNone2(T), + returnType: typeParameterTypeNone(T), ); assertType(type, 'T Function(U, bool)'); @@ -190,14 +190,14 @@ class SubstituteTest extends _Base { test_function_typeFormals() async { // typedef F = T Function(U); - var T = typeParameter2('T'); - var U = typeParameter2('U', bound: typeParameterTypeNone2(T)); + var T = typeParameter('T'); + var U = typeParameter('U', bound: typeParameterTypeNone(T)); var type = functionTypeNone2( - typeFormals: [U], + typeParameters: [U], parameters: [ - requiredParameter2(type: typeParameterTypeNone2(U)), + requiredParameter2(type: typeParameterTypeNone(U)), ], - returnType: typeParameterTypeNone2(T), + returnType: typeParameterTypeNone(T), ); assertType(type, 'T Function(U)'); @@ -212,27 +212,27 @@ class SubstituteTest extends _Base { // class Triple {} // typedef F = bool Function, U>(); var classTriplet = class_2(name: 'Triple', typeParameters: [ - typeParameter2('X'), - typeParameter2('Y'), - typeParameter2('Z'), + typeParameter('X'), + typeParameter('Y'), + typeParameter('Z'), ]); - var T = typeParameter2('T'); - var U = typeParameter2('U'); - var V = typeParameter2('V'); + var T = typeParameter('T'); + var U = typeParameter('U'); + var V = typeParameter('V'); - T.firstFragment.bound = interfaceTypeNone( + T.firstFragment.bound = interfaceTypeNone2( classTriplet, typeArguments: [ - typeParameterTypeNone2(T), - typeParameterTypeNone2(U), - typeParameterTypeNone2(V), + typeParameterTypeNone(T), + typeParameterTypeNone(U), + typeParameterTypeNone(V), ], ); T.bound = T.firstFragment.bound; var type = functionTypeNone2( - typeFormals: [T, U], + typeParameters: [T, U], returnType: boolNone, ); @@ -255,12 +255,12 @@ class SubstituteTest extends _Base { test_interface_arguments() async { // class A {} - var T = typeParameter2('T'); + var T = typeParameter('T'); var A = class_2(name: 'A', typeParameters: [T]); - var U = typeParameter2('U'); - var type = interfaceTypeNone(A, typeArguments: [ - typeParameterTypeNone2(U), + var U = typeParameter('U'); + var type = interfaceTypeNone2(A, typeArguments: [ + typeParameterTypeNone(U), ]); assertType(type, 'A'); @@ -268,15 +268,15 @@ class SubstituteTest extends _Base { } test_interface_arguments_deep() async { - var T = typeParameter2('T'); + var T = typeParameter('T'); var A = class_2(name: 'A', typeParameters: [T]); - var U = typeParameter2('U'); - var type = interfaceTypeNone(A, typeArguments: [ + var U = typeParameter('U'); + var type = interfaceTypeNone2(A, typeArguments: [ interfaceTypeNone( typeProvider.listElement, typeArguments: [ - typeParameterTypeNone2(U), + typeParameterTypeNone(U), ], ) ]); @@ -289,19 +289,19 @@ class SubstituteTest extends _Base { // class A {} var A = class_2(name: 'A'); - var type = interfaceTypeNone(A); - var T = typeParameter2('T'); + var type = interfaceTypeNone2(A); + var T = typeParameter('T'); _assertIdenticalType(type, {T: intNone}); } test_interface_noArguments_inArguments() async { // class A {} - var T = typeParameter2('T'); + var T = typeParameter('T'); var A = class_2(name: 'A', typeParameters: [T]); - var type = interfaceTypeNone(A, typeArguments: [intNone]); + var type = interfaceTypeNone2(A, typeArguments: [intNone]); - var U = typeParameter2('U'); + var U = typeParameter('U'); _assertIdenticalType(type, {U: doubleNone}); } @@ -310,16 +310,16 @@ class SubstituteTest extends _Base { var A = class_2(name: 'A'); // typedef Alias = A; - var T = typeParameter2('T'); + var T = typeParameter('T'); var Alias = typeAlias2( name: 'Alias', typeParameters: [T], - aliasedType: interfaceTypeNone(A), + aliasedType: interfaceTypeNone2(A), ); - var U = typeParameter2('U'); + var U = typeParameter('U'); var type = typeAliasTypeNone2(Alias, typeArguments: [ - typeParameterTypeNone2(U), + typeParameterTypeNone(U), ]); assertType(type, 'A via Alias'); _assertSubstitution(type, {U: intNone}, 'A via Alias'); @@ -330,17 +330,17 @@ class SubstituteTest extends _Base { var A = class_2(name: 'A'); // typedef Alias = A; - var T = typeParameter2('T'); + var T = typeParameter('T'); var Alias = typeAlias2( name: 'Alias', typeParameters: [T], - aliasedType: interfaceTypeNone(A), + aliasedType: interfaceTypeNone2(A), ); var type = typeAliasTypeNone2(Alias, typeArguments: [doubleNone]); assertType(type, 'A via Alias'); - var U = typeParameter2('U'); + var U = typeParameter('U'); _assertIdenticalType(type, {U: intNone}); } @@ -352,23 +352,23 @@ class SubstituteTest extends _Base { var Alias = typeAlias2( name: 'Alias', typeParameters: [], - aliasedType: interfaceTypeNone(A), + aliasedType: interfaceTypeNone2(A), ); var type = typeAliasTypeNone2(Alias); assertType(type, 'A via Alias'); - var T = typeParameter2('T'); + var T = typeParameter('T'); _assertIdenticalType(type, {T: intNone}); } test_invalid() async { - var T = typeParameter2('T'); + var T = typeParameter('T'); _assertIdenticalType(InvalidTypeImpl.instance, {T: intNone}); } test_record_doesNotUseTypeParameter2() async { - var T = typeParameter2('T'); + var T = typeParameter('T'); var type = recordTypeNone( positionalTypes: [intNone], @@ -380,7 +380,7 @@ class SubstituteTest extends _Base { test_record_fromAlias() async { // typedef Alias = (int, String); - var T = typeParameter2('T'); + var T = typeParameter('T'); var Alias = typeAlias2( name: 'Alias', typeParameters: [T], @@ -389,9 +389,9 @@ class SubstituteTest extends _Base { ), ); - var U = typeParameter2('U'); + var U = typeParameter('U'); var type = typeAliasTypeNone2(Alias, typeArguments: [ - typeParameterTypeNone2(U), + typeParameterTypeNone(U), ]); assertType(type, '(int, String) via Alias'); _assertSubstitution(type, {U: intNone}, '(int, String) via Alias'); @@ -399,8 +399,8 @@ class SubstituteTest extends _Base { test_record_fromAlias2() async { // typedef Alias = (T, List); - var T = typeParameter2('T'); - var T_none = typeParameterTypeNone2(T); + var T = typeParameter('T'); + var T_none = typeParameterTypeNone(T); var Alias = typeAlias2( name: 'Alias', typeParameters: [T], @@ -417,8 +417,8 @@ class SubstituteTest extends _Base { } test_record_named() async { - var T = typeParameter2('T'); - var T_none = typeParameterTypeNone2(T); + var T = typeParameter('T'); + var T_none = typeParameterTypeNone(T); var type = recordTypeNone( namedTypes: { @@ -432,8 +432,8 @@ class SubstituteTest extends _Base { } test_record_positional() async { - var T = typeParameter2('T'); - var T_none = typeParameterTypeNone2(T); + var T = typeParameter('T'); + var T_none = typeParameterTypeNone(T); var type = recordTypeNone( positionalTypes: [ @@ -447,7 +447,7 @@ class SubstituteTest extends _Base { } test_typeParameter_nullability() async { - var tElement = typeParameter2('T'); + var tElement = typeParameter('T'); void check( NullabilitySuffix typeParameterNullability, @@ -472,12 +472,12 @@ class SubstituteTest extends _Base { } test_unknownInferredType() async { - var T = typeParameter2('T'); + var T = typeParameter('T'); _assertIdenticalType(UnknownInferredType.instance, {T: intNone}); } test_void() async { - var T = typeParameter2('T'); + var T = typeParameter('T'); _assertIdenticalType(typeProvider.voidType, {T: intNone}); } @@ -498,10 +498,10 @@ class SubstituteWithNullabilityTest extends _Base { test_interface_none() async { // class A {} - var T = typeParameter2('T'); + var T = typeParameter('T'); var A = class_2(name: 'A', typeParameters: [T]); - var U = typeParameter2('U'); + var U = typeParameter('U'); var type = A.instantiate( typeArguments: [ U.instantiate(nullabilitySuffix: NullabilitySuffix.none), @@ -513,10 +513,10 @@ class SubstituteWithNullabilityTest extends _Base { test_interface_question() async { // class A {} - var T = typeParameter2('T'); + var T = typeParameter('T'); var A = class_2(name: 'A', typeParameters: [T]); - var U = typeParameter2('U'); + var U = typeParameter('U'); var type = A.instantiate( typeArguments: [ U.instantiate(nullabilitySuffix: NullabilitySuffix.none), diff --git a/pkg/analyzer/test/src/dart/element/type_constraint_gatherer_test.dart b/pkg/analyzer/test/src/dart/element/type_constraint_gatherer_test.dart index eb6cae49e7ce..7c2962032123 100644 --- a/pkg/analyzer/test/src/dart/element/type_constraint_gatherer_test.dart +++ b/pkg/analyzer/test/src/dart/element/type_constraint_gatherer_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/dart/element/element2.dart'; +import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/dart/element/type.dart'; import 'package:analyzer/src/dart/element/type_constraint_gatherer.dart'; import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart'; @@ -19,16 +20,16 @@ main() { @reflectiveTest class TypeConstraintGathererTest extends AbstractTypeSystemTest { - late final TypeParameterElement2 T; + late final TypeParameterElementImpl2 T; late final TypeParameterTypeImpl T_none; late final TypeParameterTypeImpl T_question; @override void setUp() { super.setUp(); - T = typeParameter2('T'); - T_none = typeParameterTypeNone2(T); - T_question = typeParameterTypeQuestion2(T); + T = typeParameter('T'); + T_none = typeParameterTypeNone(T); + T_question = typeParameterTypeQuestion(T); } /// If `P` and `Q` are identical types, then the subtype match holds @@ -54,17 +55,17 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { ['_ <: T <: _'], ); - var T1 = typeParameter2('T1'); - var T2 = typeParameter2('T2'); + var T1 = typeParameter('T1'); + var T2 = typeParameter('T2'); _checkMatch( [T], functionTypeNone2( - returnType: typeParameterTypeNone2(T1), - typeFormals: [T1], + returnType: typeParameterTypeNone(T1), + typeParameters: [T1], ), functionTypeNone2( - returnType: typeParameterTypeNone2(T2), - typeFormals: [T2], + returnType: typeParameterTypeNone(T2), + typeParameters: [T2], ), true, ['_ <: T <: _'], @@ -72,24 +73,24 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { } test_functionType_hasTypeFormals() { - var T1 = typeParameter2('T1'); - var S1 = typeParameter2('S1'); + var T1 = typeParameter('T1'); + var S1 = typeParameter('S1'); - var T1_none = typeParameterTypeNone2(T1); - var S1_none = typeParameterTypeNone2(S1); + var T1_none = typeParameterTypeNone(T1); + var S1_none = typeParameterTypeNone(S1); _checkMatch( [T], functionTypeNone2( returnType: T_none, - typeFormals: [T1], + typeParameters: [T1], parameters: [ requiredParameter2(type: T1_none), ], ), functionTypeNone2( returnType: intNone, - typeFormals: [S1], + typeParameters: [S1], parameters: [ requiredParameter2(type: S1_none), ], @@ -102,14 +103,14 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { [T], functionTypeNone2( returnType: intNone, - typeFormals: [T1], + typeParameters: [T1], parameters: [ requiredParameter2(type: T1_none), ], ), functionTypeNone2( returnType: T_none, - typeFormals: [S1], + typeParameters: [S1], parameters: [ requiredParameter2(type: S1_none), ], @@ -123,14 +124,14 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { [T], functionTypeNone2( returnType: intNone, - typeFormals: [T1], + typeParameters: [T1], parameters: [ requiredParameter2(type: T1_none), ], ), functionTypeNone2( returnType: stringNone, - typeFormals: [S1], + typeParameters: [S1], parameters: [ requiredParameter2(type: S1_none), ], @@ -140,58 +141,58 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { } test_functionType_hasTypeFormals_bounds_different_subtype() { - var T1 = typeParameter2('T1', bound: intNone); - var S1 = typeParameter2('S1', bound: numNone); + var T1 = typeParameter('T1', bound: intNone); + var S1 = typeParameter('S1', bound: numNone); _checkNotMatch( [T], - functionTypeNone2(returnType: T_none, typeFormals: [T1]), - functionTypeNone2(returnType: intNone, typeFormals: [S1]), + functionTypeNone2(returnType: T_none, typeParameters: [T1]), + functionTypeNone2(returnType: intNone, typeParameters: [S1]), false, ); } test_functionType_hasTypeFormals_bounds_different_top() { - var T1 = typeParameter2('T1', bound: voidNone); - var S1 = typeParameter2('S1', bound: dynamicType); + var T1 = typeParameter('T1', bound: voidNone); + var S1 = typeParameter('S1', bound: dynamicType); _checkMatch( [T], - functionTypeNone2(returnType: T_none, typeFormals: [T1]), - functionTypeNone2(returnType: intNone, typeFormals: [S1]), + functionTypeNone2(returnType: T_none, typeParameters: [T1]), + functionTypeNone2(returnType: intNone, typeParameters: [S1]), false, ['_ <: T <: int'], ); } test_functionType_hasTypeFormals_bounds_different_unrelated() { - var T1 = typeParameter2('T1', bound: intNone); - var S1 = typeParameter2('S1', bound: stringNone); + var T1 = typeParameter('T1', bound: intNone); + var S1 = typeParameter('S1', bound: stringNone); _checkNotMatch( [T], - functionTypeNone2(returnType: T_none, typeFormals: [T1]), - functionTypeNone2(returnType: intNone, typeFormals: [S1]), + functionTypeNone2(returnType: T_none, typeParameters: [T1]), + functionTypeNone2(returnType: intNone, typeParameters: [S1]), false, ); } test_functionType_hasTypeFormals_bounds_same_leftDefault_rightDefault() { - var T1 = typeParameter2('T1'); - var S1 = typeParameter2('S1'); + var T1 = typeParameter('T1'); + var S1 = typeParameter('S1'); _checkMatch( [T], - functionTypeNone2(returnType: T_none, typeFormals: [T1]), - functionTypeNone2(returnType: intNone, typeFormals: [S1]), + functionTypeNone2(returnType: T_none, typeParameters: [T1]), + functionTypeNone2(returnType: intNone, typeParameters: [S1]), false, ['_ <: T <: int'], ); } test_functionType_hasTypeFormals_bounds_same_leftDefault_rightObjectQ() { - var T1 = typeParameter2('T1'); - var S1 = typeParameter2('S1', bound: objectQuestion); + var T1 = typeParameter('T1'); + var S1 = typeParameter('S1', bound: objectQuestion); _checkMatch( [T], - functionTypeNone2(returnType: T_none, typeFormals: [T1]), - functionTypeNone2(returnType: intNone, typeFormals: [S1]), + functionTypeNone2(returnType: T_none, typeParameters: [T1]), + functionTypeNone2(returnType: intNone, typeParameters: [S1]), false, ['_ <: T <: int'], ); @@ -199,25 +200,25 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { @FailingTest(reason: 'Closure of type constraints is not implemented yet') test_functionType_hasTypeFormals_closure() { - var T = typeParameter2('T'); - var X = typeParameter2('X'); - var Y = typeParameter2('Y'); + var T = typeParameter('T'); + var X = typeParameter('X'); + var Y = typeParameter('Y'); - var T_none = typeParameterTypeNone2(T); - var X_none = typeParameterTypeNone2(X); - var Y_none = typeParameterTypeNone2(Y); + var T_none = typeParameterTypeNone(T); + var X_none = typeParameterTypeNone(X); + var Y_none = typeParameterTypeNone(Y); _checkMatch( [T], functionTypeNone2( - typeFormals: [X], + typeParameters: [X], returnType: T_none, parameters: [ requiredParameter2(type: X_none), ], ), functionTypeNone2( - typeFormals: [Y], + typeParameters: [Y], returnType: listNone(Y_none), parameters: [ requiredParameter2(type: Y_none), @@ -229,13 +230,13 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { } test_functionType_hasTypeFormals_differentCount() { - var T1 = typeParameter2('T1'); - var S1 = typeParameter2('S1'); - var S2 = typeParameter2('S2'); + var T1 = typeParameter('T1'); + var S1 = typeParameter('S1'); + var S2 = typeParameter('S2'); _checkNotMatch( [T], - functionTypeNone2(returnType: T_none, typeFormals: [T1]), - functionTypeNone2(returnType: intNone, typeFormals: [S1, S2]), + functionTypeNone2(returnType: T_none, typeParameters: [T1]), + functionTypeNone2(returnType: intNone, typeParameters: [S1, S2]), false, ); } @@ -669,27 +670,27 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { ) { // class A {} var A = class_2(name: 'A', typeParameters: [ - typeParameter2('T'), + typeParameter('T'), ]); // class B extends A {} - var B_T = typeParameter2('T'); - var B_T_none = typeParameterTypeNone2(B_T); + var B_T = typeParameter('T'); + var B_T_none = typeParameterTypeNone(B_T); var B = class_2( name: 'B', typeParameters: [B_T], - superType: interfaceTypeNone(A, typeArguments: [B_T_none]), + superType: interfaceTypeNone2(A, typeArguments: [B_T_none]), ); // class Cx extends A<> implements B<> {} var C = class_( name: 'C${testClassIndex++}', - superType: interfaceTypeNone( + superType: interfaceTypeNone2( A, typeArguments: [extendsTypeArgument], ), interfaces: [ - interfaceTypeNone( + interfaceTypeNone2( B, typeArguments: [implementsTypeArgument], ) @@ -699,7 +700,7 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { _checkMatch( [T], interfaceTypeNone(C), - interfaceTypeNone(A, typeArguments: [T_none]), + interfaceTypeNone2(A, typeArguments: [T_none]), true, [expectedConstraint], ); @@ -809,8 +810,8 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { /// Or if `P` is `dynamic` or `void` and `Object` is a subtype match /// for `Q0` under constraint set `C`. test_left_top_right_nullable() { - var U = typeParameter2('U', bound: objectNone); - var U_question = typeParameterTypeQuestion2(U); + var U = typeParameter('U', bound: objectNone); + var U_question = typeParameterTypeQuestion(U); _checkMatch([U], dynamicType, U_question, false, ['Object <: U <: _']); _checkMatch([U], voidNone, U_question, false, ['Object <: U <: _']); @@ -834,8 +835,8 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { test_left_typeParameterOther() { _checkMatch( [T], - typeParameterTypeNone2( - typeParameter2('U', bound: intNone), + typeParameterTypeNone( + typeParameter('U', bound: intNone), ), numNone, false, @@ -844,8 +845,8 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { _checkMatch( [T], - promotedTypeParameterTypeNone2( - typeParameter2('U'), + promotedTypeParameterTypeNone( + typeParameter('U'), intNone, ), numNone, @@ -855,8 +856,8 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { _checkNotMatch( [T], - typeParameterTypeNone2( - typeParameter2('U'), + typeParameterTypeNone( + typeParameter('U'), ), numNone, false, @@ -1201,8 +1202,8 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest { _checkNotMatch([T], dynamicType, objectNone, false); { - var U = typeParameter2('U', bound: numQuestion); - _checkNotMatch([T], typeParameterTypeNone2(U), objectNone, false); + var U = typeParameter('U', bound: numQuestion); + _checkNotMatch([T], typeParameterTypeNone(U), objectNone, false); } } diff --git a/pkg/analyzer/test/src/dart/element/type_references_any_test.dart b/pkg/analyzer/test/src/dart/element/type_references_any_test.dart index c3748fe29863..dc95537f4368 100644 --- a/pkg/analyzer/test/src/dart/element/type_references_any_test.dart +++ b/pkg/analyzer/test/src/dart/element/type_references_any_test.dart @@ -25,8 +25,8 @@ class TypeReferencesAnyTest extends AbstractTypeSystemTest { void setUp() { super.setUp(); - T = typeParameter2('T'); - T_none = typeParameterTypeNone2(T); + T = typeParameter('T'); + T_none = typeParameterTypeNone(T); } test_false() { @@ -53,7 +53,7 @@ class TypeReferencesAnyTest extends AbstractTypeSystemTest { _checkTrue( functionTypeNone( - typeFormals: [ + typeParameters: [ typeParameter('U', bound: T_none), ], returnType: voidNone, diff --git a/pkg/analyzer/test/src/dart/element/type_visitor_test.dart b/pkg/analyzer/test/src/dart/element/type_visitor_test.dart index a5706d6c421a..28d3d8905e75 100644 --- a/pkg/analyzer/test/src/dart/element/type_visitor_test.dart +++ b/pkg/analyzer/test/src/dart/element/type_visitor_test.dart @@ -42,7 +42,7 @@ class RecursiveTypeVisitorTest extends AbstractTypeSystemTest with StringTypes { var d = namedParameter(name: 'd', type: objectNone); var type = functionType( returnType: dynamicType, - typeFormals: [T, K], + typeParameters: [T, K], parameters: [a, b, c, d], nullabilitySuffix: NullabilitySuffix.none); expect(type.accept(visitor), true); @@ -61,7 +61,7 @@ class RecursiveTypeVisitorTest extends AbstractTypeSystemTest with StringTypes { var a = positionalParameter(type: intNone); var type = functionType( returnType: dynamicType, - typeFormals: [], + typeParameters: [], parameters: [a], nullabilitySuffix: NullabilitySuffix.none); expect(type.accept(visitor), true); @@ -71,7 +71,7 @@ class RecursiveTypeVisitorTest extends AbstractTypeSystemTest with StringTypes { void test_functionType_returnType() { var type = functionType( returnType: intNone, - typeFormals: [], + typeParameters: [], parameters: [], nullabilitySuffix: NullabilitySuffix.none); expect(type.accept(visitor), true); @@ -82,7 +82,7 @@ class RecursiveTypeVisitorTest extends AbstractTypeSystemTest with StringTypes { var T = typeParameter('T', bound: intNone); var type = functionType( returnType: dynamicType, - typeFormals: [T], + typeParameters: [T], parameters: [], nullabilitySuffix: NullabilitySuffix.none); expect(type.accept(visitor), true); @@ -93,7 +93,7 @@ class RecursiveTypeVisitorTest extends AbstractTypeSystemTest with StringTypes { var T = typeParameter('T'); var type = functionType( returnType: dynamicType, - typeFormals: [T], + typeParameters: [T], parameters: [], nullabilitySuffix: NullabilitySuffix.none); expect(type.accept(visitor), true); @@ -142,7 +142,7 @@ class RecursiveTypeVisitorTest extends AbstractTypeSystemTest with StringTypes { var d = namedParameter(name: 'd', type: objectNone); var type = functionType( returnType: dynamicType, - typeFormals: [T, K], + typeParameters: [T, K], parameters: [a, b, c, d], nullabilitySuffix: NullabilitySuffix.none); visitor.stopOnType = dynamicType; @@ -160,7 +160,7 @@ class RecursiveTypeVisitorTest extends AbstractTypeSystemTest with StringTypes { var d = namedParameter(name: 'd', type: objectNone); var type = functionType( returnType: dynamicType, - typeFormals: [T, K], + typeParameters: [T, K], parameters: [a, b, c, d], nullabilitySuffix: NullabilitySuffix.none); visitor.stopOnType = intNone; diff --git a/pkg/analyzer/test/src/dart/element/upper_lower_bound_test.dart b/pkg/analyzer/test/src/dart/element/upper_lower_bound_test.dart index aa32d41e8874..a54000fe4f0d 100644 --- a/pkg/analyzer/test/src/dart/element/upper_lower_bound_test.dart +++ b/pkg/analyzer/test/src/dart/element/upper_lower_bound_test.dart @@ -6,6 +6,7 @@ import 'package:_fe_analyzer_shared/src/type_inference/type_analyzer_operations. 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'; import 'package:analyzer/src/dart/element/type.dart'; import 'package:analyzer/src/dart/element/type_schema.dart'; import 'package:analyzer/src/dart/element/type_system.dart'; @@ -104,29 +105,29 @@ class BoundsHelperPredicatesTest extends _BoundsTestBase { } test_isBottom() { - TypeParameterElement2 T; + TypeParameterElementImpl2 T; // BOTTOM(Never) is true isBottom(neverNone); isNotBottom(neverQuestion); // BOTTOM(X&T) is true iff BOTTOM(T) - T = typeParameter2('T', bound: objectQuestion); + T = typeParameter('T', bound: objectQuestion); - isBottom(promotedTypeParameterTypeNone2(T, neverNone)); - isNotBottom(promotedTypeParameterTypeQuestion2(T, neverNone)); + isBottom(promotedTypeParameterTypeNone(T, neverNone)); + isNotBottom(promotedTypeParameterTypeQuestion(T, neverNone)); - isNotBottom(promotedTypeParameterTypeNone2(T, neverQuestion)); - isNotBottom(promotedTypeParameterTypeQuestion2(T, neverQuestion)); + isNotBottom(promotedTypeParameterTypeNone(T, neverQuestion)); + isNotBottom(promotedTypeParameterTypeQuestion(T, neverQuestion)); // BOTTOM(X extends T) is true iff BOTTOM(T) - T = typeParameter2('T', bound: neverNone); - isBottom(typeParameterTypeNone2(T)); - isNotBottom(typeParameterTypeQuestion2(T)); + T = typeParameter('T', bound: neverNone); + isBottom(typeParameterTypeNone(T)); + isNotBottom(typeParameterTypeQuestion(T)); - T = typeParameter2('T', bound: neverQuestion); - isNotBottom(typeParameterTypeNone2(T)); - isNotBottom(typeParameterTypeQuestion2(T)); + T = typeParameter('T', bound: neverQuestion); + isNotBottom(typeParameterTypeNone(T)); + isNotBottom(typeParameterTypeQuestion(T)); // BOTTOM(T) is false otherwise isNotBottom(dynamicType); @@ -139,12 +140,12 @@ class BoundsHelperPredicatesTest extends _BoundsTestBase { isNotBottom(intNone); isNotBottom(intQuestion); - T = typeParameter2('T', bound: numNone); - isNotBottom(typeParameterTypeNone2(T)); - isNotBottom(typeParameterTypeQuestion2(T)); + T = typeParameter('T', bound: numNone); + isNotBottom(typeParameterTypeNone(T)); + isNotBottom(typeParameterTypeQuestion(T)); - isNotBottom(promotedTypeParameterTypeNone2(T, intNone)); - isNotBottom(promotedTypeParameterTypeQuestion2(T, intNone)); + isNotBottom(promotedTypeParameterTypeNone(T, intNone)); + isNotBottom(promotedTypeParameterTypeQuestion(T, intNone)); } test_isMoreBottom() { @@ -724,7 +725,7 @@ class LowerBoundTest extends _BoundsTestBase { check( functionTypeNone( returnType: voidNone, - typeFormals: [ + typeParameters: [ typeParameter('T'), ], ), @@ -735,13 +736,13 @@ class LowerBoundTest extends _BoundsTestBase { check( functionTypeNone( returnType: voidNone, - typeFormals: [ + typeParameters: [ typeParameter('T', bound: intNone), ], ), functionTypeNone( returnType: voidNone, - typeFormals: [ + typeParameters: [ typeParameter('T', bound: numNone), ], ), @@ -755,15 +756,15 @@ class LowerBoundTest extends _BoundsTestBase { check( functionTypeNone( returnType: typeParameterTypeNone(T), - typeFormals: [T], + typeParameters: [T], ), functionTypeNone( returnType: typeParameterTypeNone(U), - typeFormals: [U], + typeParameters: [U], ), functionTypeNone( returnType: typeParameterTypeNone(R), - typeFormals: [R], + typeParameters: [R], ), ); } @@ -1261,7 +1262,7 @@ class LowerBoundTest extends _BoundsTestBase { } test_typeParameter() { - void check({DartType? bound, required TypeImpl T2}) { + void check({TypeImpl? bound, required TypeImpl T2}) { var T1 = typeParameterTypeNone( typeParameter('T', bound: bound), ); @@ -1814,7 +1815,7 @@ class UpperBound_FunctionTypes_Test extends _BoundsTestBase { check( functionTypeNone( returnType: voidNone, - typeFormals: [ + typeParameters: [ typeParameter('T'), ], ), @@ -1825,13 +1826,13 @@ class UpperBound_FunctionTypes_Test extends _BoundsTestBase { check( functionTypeNone( returnType: voidNone, - typeFormals: [ + typeParameters: [ typeParameter('T', bound: intNone), ], ), functionTypeNone( returnType: voidNone, - typeFormals: [ + typeParameters: [ typeParameter('T', bound: numNone), ], ), @@ -1843,11 +1844,11 @@ class UpperBound_FunctionTypes_Test extends _BoundsTestBase { var U = typeParameter('U', bound: numNone); var T1 = functionTypeNone( returnType: typeParameterTypeNone(T), - typeFormals: [T], + typeParameters: [T], ); var T2 = functionTypeNone( returnType: typeParameterTypeNone(U), - typeFormals: [U], + typeParameters: [U], ); { var result = typeSystem.leastUpperBound(T1, T2);