languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 03:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename FindNode.typeName() to namedType().

Browse source 
Change-Id: Idc0a2ef9cd5bddda345e9a7e603145c7d3ee2a38
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/214063
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2021-09-21 21:30:28 +00:00 committed by commit-bot@chromium.org
parent b41ae230a2
commit 8495d8b591
19 changed files with 201 additions and 201 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/analyzer/lib/src/test_utilities/find_node.dart
View file

@ -244,6 +244,10 @@ class FindNode {
return _node(search, (n) => n is NamedExpression);
}
NamedType namedType(String search) {
return _node(search, (n) => n is NamedType);
}
NullLiteral nullLiteral(String search) {
return _node(search, (n) => n is NullLiteral);
}
@ -370,10 +374,6 @@ class FindNode {
return _node(search, (n) => n is TypeLiteral);
}
TypeName typeName(String search) {
return _node(search, (n) => n is TypeName);
}
TypeParameter typeParameter(String search) {
return _node(search, (n) => n is TypeParameter);
}

90
pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart
View file

@ -2587,7 +2587,7 @@ const int b = a as int;
assertElement(aRef, findElement.topGet('a'));
assertType(aRef, 'num');
assertNamedType(findNode.typeName('int;'), intElement, 'int');
assertNamedType(findNode.namedType('int;'), intElement, 'int');
}
test_invalid_const_constructor_initializer_field_multiple() async {
@ -2908,12 +2908,12 @@ main() {
expect(result.errors, isNotEmpty);
assertNamedType(
findNode.typeName('a.Future'),
findNode.namedType('a.Future'),
futureElement,
'Future<int>',
expectedPrefix: findElement.import('dart:async').prefix,
);
assertNamedType(findNode.typeName('int>'), intElement, 'int');
assertNamedType(findNode.namedType('int>'), intElement, 'int');
}
test_invalid_fieldInitializer_field() async {
@ -4614,7 +4614,7 @@ void main() {
var tElement = findNode.typeParameter('T>(T x)').declaredElement!;
var gType = findNode.typeName('Consumer<T>');
var gType = findNode.namedType('Consumer<T>');
var gTypeType = gType.type as FunctionType;
var gTypeParameterType =
@ -4641,7 +4641,7 @@ void main() {
var tElement = findNode.typeParameter('T>(T x)').declaredElement!;
var gType = findNode.typeName('Consumer<T>');
var gType = findNode.namedType('Consumer<T>');
var gTypeType = gType.type as FunctionType;
var gTypeParameterType =
@ -4668,7 +4668,7 @@ void main() {
var tElement = findNode.typeParameter('T>(T x)').declaredElement!;
var gType = findNode.typeName('Consumer<T>');
var gType = findNode.namedType('Consumer<T>');
var gTypeType = gType.type as FunctionType;
var gTypeParameterType =
@ -4695,7 +4695,7 @@ void main() {
var tElement = findNode.typeParameter('T>(T x)').declaredElement!;
var gType = findNode.typeName('Producer<T>');
var gType = findNode.namedType('Producer<T>');
var gTypeType = gType.type as FunctionType;
var gTypeReturnType = gTypeType.returnType as TypeParameterType;
@ -5693,7 +5693,7 @@ const b = C<String>.named(); // ref
assertType(creation, 'C<int>');
assertNamedType(creation.constructorName.type, c, 'C<int>');
assertNamedType(findNode.typeName('int>'), intElement, 'int');
assertNamedType(findNode.namedType('int>'), intElement, 'int');
}
{
@ -5703,7 +5703,7 @@ const b = C<String>.named(); // ref
assertType(creation, 'C<String>');
assertNamedType(creation.constructorName.type, c, 'C<String>');
assertNamedType(findNode.typeName('String>'), stringElement, 'String');
assertNamedType(findNode.namedType('String>'), stringElement, 'String');
assertMember(
creation.constructorName.name, namedConstructor, {'T': 'String'});
@ -5717,10 +5717,10 @@ class A extends Object with Map<int> {}
await resolveTestFile();
expect(result.errors, isNotEmpty);
var mapRef = findNode.typeName('Map<');
var mapRef = findNode.namedType('Map<');
assertNamedType(mapRef, mapElement, 'Map<dynamic, dynamic>');
var intRef = findNode.typeName('int>');
var intRef = findNode.namedType('int>');
assertNamedType(intRef, intElement, 'int');
}
@ -5731,13 +5731,13 @@ class A extends Object with List<int, double> {}
await resolveTestFile();
expect(result.errors, isNotEmpty);
var listRef = findNode.typeName('List<');
var listRef = findNode.namedType('List<');
assertNamedType(listRef, listElement, 'List<dynamic>');
var intRef = findNode.typeName('int,');
var intRef = findNode.namedType('int,');
assertNamedType(intRef, intElement, 'int');
var doubleRef = findNode.typeName('double>');
var doubleRef = findNode.namedType('double>');
assertNamedType(doubleRef, doubleElement, 'double');
}
@ -5748,13 +5748,13 @@ class A<T> extends Object with T<int, double> {}
await resolveTestFile();
expect(result.errors, isNotEmpty);
var tRef = findNode.typeName('T<');
var tRef = findNode.namedType('T<');
assertNamedType(tRef, findElement.typeParameter('T'), 'T');
var intRef = findNode.typeName('int,');
var intRef = findNode.namedType('int,');
assertNamedType(intRef, intElement, 'int');
var doubleRef = findNode.typeName('double>');
var doubleRef = findNode.namedType('double>');
assertNamedType(doubleRef, doubleElement, 'double');
}
@ -5765,10 +5765,10 @@ class A extends Map<int> {}
await resolveTestFile();
expect(result.errors, isNotEmpty);
var mapRef = findNode.typeName('Map<');
var mapRef = findNode.namedType('Map<');
assertNamedType(mapRef, mapElement, 'Map<dynamic, dynamic>');
var intRef = findNode.typeName('int>');
var intRef = findNode.namedType('int>');
assertNamedType(intRef, intElement, 'int');
}
@ -5779,13 +5779,13 @@ class A extends List<int, double> {}
await resolveTestFile();
expect(result.errors, isNotEmpty);
var listRef = findNode.typeName('List<');
var listRef = findNode.namedType('List<');
assertNamedType(listRef, listElement, 'List<dynamic>');
var intRef = findNode.typeName('int,');
var intRef = findNode.namedType('int,');
assertNamedType(intRef, intElement, 'int');
var doubleRef = findNode.typeName('double>');
var doubleRef = findNode.namedType('double>');
assertNamedType(doubleRef, doubleElement, 'double');
}
@ -5796,13 +5796,13 @@ class A extends X<int, double> {}
await resolveTestFile();
expect(result.errors, isNotEmpty);
var xRef = findNode.typeName('X<');
var xRef = findNode.namedType('X<');
assertNamedType(xRef, null, 'dynamic');
var intRef = findNode.typeName('int,');
var intRef = findNode.namedType('int,');
assertNamedType(intRef, intElement, 'int');
var doubleRef = findNode.typeName('double>');
var doubleRef = findNode.namedType('double>');
assertNamedType(doubleRef, doubleElement, 'double');
}
@ -5813,7 +5813,7 @@ class A extends X {}
await resolveTestFile();
expect(result.errors, isNotEmpty);
var xRef = findNode.typeName('X {}');
var xRef = findNode.namedType('X {}');
assertNamedType(xRef, null, 'dynamic');
}
@ -5824,13 +5824,13 @@ class A<T> extends T<int, double> {}
await resolveTestFile();
expect(result.errors, isNotEmpty);
var tRef = findNode.typeName('T<');
var tRef = findNode.namedType('T<');
assertNamedType(tRef, findElement.typeParameter('T'), 'T');
var intRef = findNode.typeName('int,');
var intRef = findNode.namedType('int,');
assertNamedType(intRef, intElement, 'int');
var doubleRef = findNode.typeName('double>');
var doubleRef = findNode.namedType('double>');
assertNamedType(doubleRef, doubleElement, 'double');
}
@ -5841,10 +5841,10 @@ typedef Map<int> F();
await resolveTestFile();
expect(result.errors, isNotEmpty);
var mapRef = findNode.typeName('Map<');
var mapRef = findNode.namedType('Map<');
assertNamedType(mapRef, mapElement, 'Map<dynamic, dynamic>');
var intRef = findNode.typeName('int>');
var intRef = findNode.namedType('int>');
assertNamedType(intRef, intElement, 'int');
}
@ -5855,13 +5855,13 @@ typedef List<int, double> F();
await resolveTestFile();
expect(result.errors, isNotEmpty);
var listRef = findNode.typeName('List<');
var listRef = findNode.namedType('List<');
assertNamedType(listRef, listElement, 'List<dynamic>');
var intRef = findNode.typeName('int,');
var intRef = findNode.namedType('int,');
assertNamedType(intRef, intElement, 'int');
var doubleRef = findNode.typeName('double>');
var doubleRef = findNode.namedType('double>');
assertNamedType(doubleRef, doubleElement, 'double');
}
@ -5872,10 +5872,10 @@ typedef T<int> F<T>();
await resolveTestFile();
expect(result.errors, isNotEmpty);
var tRef = findNode.typeName('T<');
var tRef = findNode.namedType('T<');
assertNamedType(tRef, findElement.typeParameter('T'), 'T');
var intRef = findNode.typeName('int>');
var intRef = findNode.namedType('int>');
assertNamedType(intRef, intElement, 'int');
}
@ -5886,13 +5886,13 @@ int Function(double) g() => (double g) => 0;
await resolveTestFile();
expect(result.errors, isEmpty);
var intRef = findNode.typeName('int Function');
var intRef = findNode.namedType('int Function');
assertNamedType(intRef, intElement, 'int');
var functionRef = findNode.genericFunctionType('Function(double)');
assertType(functionRef, 'int Function(double)');
var doubleRef = findNode.typeName('double) g');
var doubleRef = findNode.namedType('double) g');
assertNamedType(doubleRef, doubleElement, 'double');
}
@ -5904,13 +5904,13 @@ List<double> b = [];
await resolveTestFile();
expect(result.errors, isEmpty);
var intRef = findNode.typeName('int a');
var intRef = findNode.namedType('int a');
assertNamedType(intRef, intElement, 'int');
var listRef = findNode.typeName('List<double> b');
var listRef = findNode.namedType('List<double> b');
assertNamedType(listRef, listElement, 'List<double>');
var doubleRef = findNode.typeName('double> b');
var doubleRef = findNode.namedType('double> b');
assertNamedType(doubleRef, doubleElement, 'double');
}
@ -5922,10 +5922,10 @@ my.Future<int> a;
await resolveTestFile();
ImportElement myImport = result.libraryElement.imports[0];
var intRef = findNode.typeName('int> a');
var intRef = findNode.namedType('int> a');
assertNamedType(intRef, intElement, 'int');
var futureRef = findNode.typeName('my.Future<int> a');
var futureRef = findNode.namedType('my.Future<int> a');
assertNamedType(futureRef, futureElement, 'Future<int>',
expectedPrefix: myImport.prefix);
}
@ -6910,10 +6910,10 @@ class B extends A<int> {}
addTestFile(content);
await resolveTestFile();
var aRef = findNode.typeName('A<int>');
var aRef = findNode.namedType('A<int>');
assertNamedType(aRef, findElement.class_('A'), 'A<int>');
var intRef = findNode.typeName('int>');
var intRef = findNode.namedType('int>');
assertNamedType(intRef, intElement, 'int');
}

10
pkg/analyzer/test/src/dart/constant/potentially_constant_test.dart
View file

@ -563,7 +563,7 @@ class A<T> {
var x = const <T>[0, 1, 2];
}
}
''', () => _xInitializer(), () => [findNode.typeName('T>[0')]);
''', () => _xInitializer(), () => [findNode.namedType('T>[0')]);
}
test_literal_bool() async {
@ -646,7 +646,7 @@ class A<T> {
}
}
''', () => _xInitializer(),
() => [findNode.typeName('T,'), findNode.typeName('T>{')]);
() => [findNode.namedType('T,'), findNode.namedType('T>{')]);
}
test_methodInvocation_identical() async {
@ -978,7 +978,7 @@ class A<T> {
var x = const <T>{0, 1, 2};
}
}
''', () => _xInitializer(), () => [findNode.typeName('T>{0')]);
''', () => _xInitializer(), () => [findNode.namedType('T>{0')]);
}
test_simpleIdentifier_class() async {
@ -1174,7 +1174,7 @@ class A<T> {
var x = a as T;
}
}
''', () => _xInitializer(), () => [findNode.typeName('T;')]);
''', () => _xInitializer(), () => [findNode.namedType('T;')]);
}
test_isExpression_typeParameter() async {
@ -1185,7 +1185,7 @@ class A<T> {
var x = a is T;
}
}
''', () => _xInitializer(), () => [findNode.typeName('T;')]);
''', () => _xInitializer(), () => [findNode.namedType('T;')]);
}
_assertNotConst(String code, AstNode Function() getNode,

6
pkg/analyzer/test/src/dart/resolution/class_alias_test.dart
View file

@ -35,9 +35,9 @@ class X = A with B implements C;
var x = findElement.class_('X');
assertNamedType(findNode.typeName('A with'), findElement.class_('A'), 'A');
assertNamedType(findNode.typeName('B impl'), findElement.class_('B'), 'B');
assertNamedType(findNode.typeName('C;'), findElement.class_('C'), 'C');
assertNamedType(findNode.namedType('A with'), findElement.class_('A'), 'A');
assertNamedType(findNode.namedType('B impl'), findElement.class_('B'), 'B');
assertNamedType(findNode.namedType('C;'), findElement.class_('C'), 'C');
assertType(x.supertype, 'A');
assertElementTypes(x.mixins, ['B']);

4
pkg/analyzer/test/src/dart/resolution/class_test.dart
View file

@ -379,7 +379,7 @@ class A extends E {}
var a = findElement.class_('A');
assertType(a.supertype, 'Object');
var eRef = findNode.typeName('E {}');
var eRef = findNode.namedType('E {}');
assertNamedType(eRef, findElement.enum_('E'), 'E');
}
@ -394,7 +394,7 @@ class A extends M {} // ref
var a = findElement.class_('A');
assertType(a.supertype, 'Object');
var mRef = findNode.typeName('M {} // ref');
var mRef = findNode.namedType('M {} // ref');
assertNamedType(mRef, findElement.mixin('M'), 'M');
}

4
pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart
View file

@ -64,7 +64,7 @@ void f() {
expectedConstructorMember: true,
expectedSubstitution: {'T': 'int'},
);
assertNamedType(findNode.typeName('int>'), intElement, 'int');
assertNamedType(findNode.namedType('int>'), intElement, 'int');
}
test_class_generic_unnamed_inferTypeArguments() async {
@ -107,7 +107,7 @@ void f() {
expectedConstructorMember: true,
expectedSubstitution: {'T': 'int'},
);
assertNamedType(findNode.typeName('int>'), intElement, 'int');
assertNamedType(findNode.namedType('int>'), intElement, 'int');
}
test_class_notGeneric() async {

6
pkg/analyzer/test/src/dart/resolution/metadata_test.dart
View file

@ -1200,7 +1200,7 @@ import 'a.dart';
void f(C c) {}
''');
var classC = findNode.typeName('C c').name.staticElement!;
var classC = findNode.namedType('C c').name.staticElement!;
var annotation = classC.metadata.single;
_assertElementAnnotationValueText(annotation, r'''
B
@ -1230,7 +1230,7 @@ import 'b.dart';
void f(B b) {}
''');
var classB = findNode.typeName('B b').name.staticElement!;
var classB = findNode.namedType('B b').name.staticElement!;
var annotation = classB.metadata.single;
_assertElementAnnotationValueText(annotation, r'''
A
@ -1259,7 +1259,7 @@ import 'b.dart';
void f(B b) {}
''');
var classB = findNode.typeName('B b').name.staticElement!;
var classB = findNode.namedType('B b').name.staticElement!;
var annotation = classB.metadata.single;
_assertElementAnnotationValueText(annotation, r'''
A

6
pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
View file

@ -943,7 +943,7 @@ main() {
'foo<int>();',
expectedTypeArguments: ['int'],
);
assertNamedType(findNode.typeName('int>'), intElement, 'int');
assertNamedType(findNode.namedType('int>'), intElement, 'int');
}
test_error_undefinedMethod_hasTarget_class_typeParameter() async {
@ -1296,7 +1296,7 @@ main() {
findElement.topFunction('foo'),
'void Function()',
);
assertNamedType(findNode.typeName('int>'), intElement, 'int');
assertNamedType(findNode.namedType('int>'), intElement, 'int');
}
test_error_wrongNumberOfTypeArgumentsMethod_21() async {
@ -1315,7 +1315,7 @@ main() {
'Map<dynamic, dynamic> Function()',
expectedTypeArguments: ['dynamic', 'dynamic'],
);
assertNamedType(findNode.typeName('int>'), intElement, 'int');
assertNamedType(findNode.namedType('int>'), intElement, 'int');
}
test_hasReceiver_class_staticGetter() async {

30
pkg/analyzer/test/src/dart/resolution/mixin_test.dart
View file

@ -93,7 +93,7 @@ class A extends Object with M {} // A
var aElement = findElement.class_('A');
assertElementTypes(aElement.mixins, ['M']);
var mRef = findNode.typeName('M {} // A');
var mRef = findNode.namedType('M {} // A');
assertNamedType(mRef, mElement, 'M');
}
@ -108,7 +108,7 @@ class A = Object with M;
var aElement = findElement.class_('A');
assertElementTypes(aElement.mixins, ['M']);
var mRef = findNode.typeName('M;');
var mRef = findNode.namedType('M;');
assertNamedType(mRef, mElement, 'M');
}
@ -308,7 +308,7 @@ mixin M implements math.Random {}
var element = findElement.mixin('M');
assertElementTypes(element.interfaces, ['Random']);
var typeRef = findNode.typeName('Random {}');
var typeRef = findNode.namedType('Random {}');
assertNamedType(typeRef, randomElement, 'Random',
expectedPrefix: mathImport.prefix);
}
@ -323,7 +323,7 @@ mixin M implements int {}
var element = findElement.mixin('M');
assertElementTypes(element.interfaces, ['int']);
var typeRef = findNode.typeName('int {}');
var typeRef = findNode.namedType('int {}');
assertNamedType(typeRef, intElement, 'int');
}
@ -338,7 +338,7 @@ mixin M implements void {}
var element = findElement.mixin('M');
assertElementTypes(element.interfaces, []);
var typeRef = findNode.typeName('void {}');
var typeRef = findNode.namedType('void {}');
assertNamedType(typeRef, null, 'void');
}
@ -831,7 +831,7 @@ mixin M on math.Random {}
var element = findElement.mixin('M');
assertElementTypes(element.superclassConstraints, ['Random']);
var typeRef = findNode.typeName('Random {}');
var typeRef = findNode.namedType('Random {}');
assertNamedType(typeRef, randomElement, 'Random',
expectedPrefix: mathImport.prefix);
}
@ -847,7 +847,7 @@ mixin M on int {}
var element = findElement.mixin('M');
assertElementTypes(element.superclassConstraints, ['int']);
var typeRef = findNode.typeName('int {}');
var typeRef = findNode.namedType('int {}');
assertNamedType(typeRef, intElement, 'int');
}
@ -862,7 +862,7 @@ mixin M on dynamic {}
var element = findElement.mixin('M');
assertElementTypes(element.superclassConstraints, ['Object']);
var typeRef = findNode.typeName('dynamic {}');
var typeRef = findNode.namedType('dynamic {}');
assertNamedType(typeRef, dynamicElement, 'dynamic');
}
@ -878,7 +878,7 @@ mixin M on E {}
var element = findElement.mixin('M');
assertElementTypes(element.superclassConstraints, ['Object']);
var typeRef = findNode.typeName('E {}');
var typeRef = findNode.namedType('E {}');
assertNamedType(typeRef, findElement.enum_('E'), 'E');
}
@ -894,7 +894,7 @@ mixin M on void {}
var element = findElement.mixin('M');
assertElementTypes(element.superclassConstraints, ['Object']);
var typeRef = findNode.typeName('void {}');
var typeRef = findNode.namedType('void {}');
assertNamedType(typeRef, null, 'void');
}
@ -956,7 +956,7 @@ mixin M<T> {
var fNode = findNode.variableDeclaration('f;');
assertElement(fNode.name, fElement);
assertNamedType(findNode.typeName('T f'), tElement, 'T');
assertNamedType(findNode.namedType('T f'), tElement, 'T');
var accessors = element.accessors;
expect(accessors, hasLength(2));
@ -975,10 +975,10 @@ mixin M implements A, B {} // M
var element = findElement.mixin('M');
assertElementTypes(element.interfaces, ['A', 'B']);
var aRef = findNode.typeName('A, ');
var aRef = findNode.namedType('A, ');
assertNamedType(aRef, findElement.class_('A'), 'A');
var bRef = findNode.typeName('B {} // M');
var bRef = findNode.namedType('B {} // M');
assertNamedType(bRef, findElement.class_('B'), 'B');
}
@ -1063,10 +1063,10 @@ mixin M on A, B {} // M
var element = findElement.mixin('M');
assertElementTypes(element.superclassConstraints, ['A', 'B']);
var aRef = findNode.typeName('A, ');
var aRef = findNode.namedType('A, ');
assertNamedType(aRef, findElement.class_('A'), 'A');
var bRef = findNode.typeName('B {} // M');
var bRef = findNode.namedType('B {} // M');
assertNamedType(bRef, findElement.class_('B'), 'B');
}

14
pkg/analyzer/test/src/dart/resolution/non_nullable_bazel_workspace_test.dart
View file

@ -28,7 +28,7 @@ dart_package(
'int v = 0;',
);
assertNoErrorsInResult();
assertType(findNode.typeName('int v'), 'int*');
assertType(findNode.namedType('int v'), 'int*');
}
test_buildFile_nonNullable() async {
@ -44,7 +44,7 @@ dart_package(
'int v = 0;',
);
assertNoErrorsInResult();
assertType(findNode.typeName('int v'), 'int');
assertType(findNode.namedType('int v'), 'int');
// Non-nullable in test/.
await resolveFileCode(
@ -52,7 +52,7 @@ dart_package(
'int v = 0;',
);
assertNoErrorsInResult();
assertType(findNode.typeName('int v'), 'int');
assertType(findNode.namedType('int v'), 'int');
// Non-nullable in bin/.
await resolveFileCode(
@ -60,7 +60,7 @@ dart_package(
'int v = 0;',
);
assertNoErrorsInResult();
assertType(findNode.typeName('int v'), 'int');
assertType(findNode.namedType('int v'), 'int');
}
test_buildFile_nonNullable_oneLine_noComma() async {
@ -73,7 +73,7 @@ dart_package(null_safety = True)
'int v = 0;',
);
assertNoErrorsInResult();
assertType(findNode.typeName('int v'), 'int');
assertType(findNode.namedType('int v'), 'int');
}
test_buildFile_nonNullable_withComments() async {
@ -89,7 +89,7 @@ dart_package(
'int v = 0;',
);
assertNoErrorsInResult();
assertType(findNode.typeName('int v'), 'int');
assertType(findNode.namedType('int v'), 'int');
}
test_noBuildFile_legacy() async {
@ -97,6 +97,6 @@ dart_package(
int v = 0;
''');
assertType(findNode.typeName('int v'), 'int*');
assertType(findNode.namedType('int v'), 'int*');
}
}

88
pkg/analyzer/test/src/dart/resolution/non_nullable_test.dart
View file

@ -28,9 +28,9 @@ class X2 implements A {} // 2
class X3 with A {} // 3
''');
assertType(findNode.typeName('A {} // 1'), 'A');
assertType(findNode.typeName('A {} // 2'), 'A');
assertType(findNode.typeName('A {} // 3'), 'A');
assertType(findNode.namedType('A {} // 1'), 'A');
assertType(findNode.namedType('A {} // 2'), 'A');
assertType(findNode.namedType('A {} // 3'), 'A');
}
test_classTypeAlias_hierarchy() async {
@ -42,9 +42,9 @@ class C {}
class X = A with B implements C;
''');
assertType(findNode.typeName('A with'), 'A');
assertType(findNode.typeName('B implements'), 'B');
assertType(findNode.typeName('C;'), 'C');
assertType(findNode.namedType('A with'), 'A');
assertType(findNode.namedType('B implements'), 'B');
assertType(findNode.namedType('C;'), 'C');
}
test_field_functionTypeAlias() async {
@ -100,8 +100,8 @@ main() {
error(HintCode.UNUSED_LOCAL_VARIABLE, 29, 1),
]);
assertType(findNode.typeName('int? a'), 'int?');
assertType(findNode.typeName('int b'), 'int');
assertType(findNode.namedType('int? a'), 'int?');
assertType(findNode.namedType('int b'), 'int');
}
test_local_interfaceType_generic() async {
@ -119,10 +119,10 @@ main() {
error(HintCode.UNUSED_LOCAL_VARIABLE, 85, 1),
]);
assertType(findNode.typeName('List<int?>? a'), 'List<int?>?');
assertType(findNode.typeName('List<int>? b'), 'List<int>?');
assertType(findNode.typeName('List<int?> c'), 'List<int?>');
assertType(findNode.typeName('List<int> d'), 'List<int>');
assertType(findNode.namedType('List<int?>? a'), 'List<int?>?');
assertType(findNode.namedType('List<int>? b'), 'List<int>?');
assertType(findNode.namedType('List<int?> c'), 'List<int?>');
assertType(findNode.namedType('List<int> d'), 'List<int>');
}
test_local_methodNullAwareCall_interfaceType() async {
@ -172,8 +172,8 @@ void f<T>(T a) {
error(HintCode.UNUSED_LOCAL_VARIABLE, 33, 1),
]);
assertType(findNode.typeName('T x'), 'T');
assertType(findNode.typeName('T? y'), 'T?');
assertType(findNode.namedType('T x'), 'T');
assertType(findNode.namedType('T? y'), 'T?');
}
test_local_variable_genericFunctionType() async {
@ -200,8 +200,8 @@ main() {
error(HintCode.UNUSED_ELEMENT, 11, 1),
]);
assertType(findNode.typeName('int? a'), 'int?');
assertType(findNode.typeName('int b'), 'int');
assertType(findNode.namedType('int? a'), 'int?');
assertType(findNode.namedType('int b'), 'int');
}
test_localFunction_returnType_interfaceType() async {
@ -215,8 +215,8 @@ main() {
error(HintCode.UNUSED_ELEMENT, 32, 1),
]);
assertType(findNode.typeName('int? f'), 'int?');
assertType(findNode.typeName('int g'), 'int');
assertType(findNode.namedType('int? f'), 'int?');
assertType(findNode.namedType('int g'), 'int');
}
test_member_potentiallyNullable_called() async {
@ -239,8 +239,8 @@ mixin X1 on A {} // 1
mixin X2 implements A {} // 2
''');
assertType(findNode.typeName('A {} // 1'), 'A');
assertType(findNode.typeName('A {} // 2'), 'A');
assertType(findNode.namedType('A {} // 1'), 'A');
assertType(findNode.namedType('A {} // 2'), 'A');
}
test_parameter_functionTyped() async {
@ -315,8 +315,8 @@ void f(int? a, int b) {
}
''');
assertType(findNode.typeName('int? a'), 'int?');
assertType(findNode.typeName('int b'), 'int');
assertType(findNode.namedType('int? a'), 'int?');
assertType(findNode.namedType('int b'), 'int');
}
test_parameter_interfaceType_generic() async {
@ -325,10 +325,10 @@ void f(List<int?>? a, List<int>? b, List<int?> c, List<int> d) {
}
''');
assertType(findNode.typeName('List<int?>? a'), 'List<int?>?');
assertType(findNode.typeName('List<int>? b'), 'List<int>?');
assertType(findNode.typeName('List<int?> c'), 'List<int?>');
assertType(findNode.typeName('List<int> d'), 'List<int>');
assertType(findNode.namedType('List<int?>? a'), 'List<int?>?');
assertType(findNode.namedType('List<int>? b'), 'List<int>?');
assertType(findNode.namedType('List<int?> c'), 'List<int?>');
assertType(findNode.namedType('List<int> d'), 'List<int>');
}
test_parameter_methodNullAwareCall_interfaceType() async {
@ -369,8 +369,8 @@ void f<T>(T a, T? b) {
}
''');
assertType(findNode.typeName('T a'), 'T');
assertType(findNode.typeName('T? b'), 'T?');
assertType(findNode.namedType('T a'), 'T');
assertType(findNode.namedType('T? b'), 'T?');
}
test_typedef_classic() async {
@ -384,7 +384,7 @@ main() {
error(HintCode.UNUSED_LOCAL_VARIABLE, 50, 1),
]);
assertType(findNode.typeName('F? a'), 'int? Function(bool, String?)?');
assertType(findNode.namedType('F? a'), 'int? Function(bool, String?)?');
}
test_typedef_function() async {
@ -399,7 +399,7 @@ main() {
]);
assertType(
findNode.typeName('F<String>'),
findNode.namedType('F<String>'),
'int? Function(bool, String, String?)?',
);
}
@ -411,8 +411,8 @@ typedef F<T> = int Function(T)?;
void f(F<int> a, F<double>? b) {}
''');
assertType(findNode.typeName('F<int>'), 'int Function(int)?');
assertType(findNode.typeName('F<double>?'), 'int Function(double)?');
assertType(findNode.namedType('F<int>'), 'int Function(int)?');
assertType(findNode.namedType('F<double>?'), 'int Function(double)?');
}
test_typedef_function_nullable_local() async {
@ -428,8 +428,8 @@ main() {
error(HintCode.UNUSED_LOCAL_VARIABLE, 68, 1),
]);
assertType(findNode.typeName('F<int>'), 'int Function(int)?');
assertType(findNode.typeName('F<double>?'), 'int Function(double)?');
assertType(findNode.namedType('F<int>'), 'int Function(int)?');
assertType(findNode.namedType('F<double>?'), 'int Function(double)?');
}
}
@ -448,9 +448,9 @@ class X2 implements A {} // 2
class X3 with A {} // 3
''');
assertType(findNode.typeName('A {} // 1'), 'A*');
assertType(findNode.typeName('A {} // 2'), 'A*');
assertType(findNode.typeName('A {} // 3'), 'A*');
assertType(findNode.namedType('A {} // 1'), 'A*');
assertType(findNode.namedType('A {} // 2'), 'A*');
assertType(findNode.namedType('A {} // 3'), 'A*');
}
test_classTypeAlias_hierarchy() async {
@ -462,9 +462,9 @@ class C {}
class X = A with B implements C;
''');
assertType(findNode.typeName('A with'), 'A*');
assertType(findNode.typeName('B implements'), 'B*');
assertType(findNode.typeName('C;'), 'C*');
assertType(findNode.namedType('A with'), 'A*');
assertType(findNode.namedType('B implements'), 'B*');
assertType(findNode.namedType('C;'), 'C*');
}
test_local_variable_interfaceType_notMigrated() async {
@ -479,8 +479,8 @@ main() {
error(HintCode.UNUSED_LOCAL_VARIABLE, 29, 1),
]);
assertType(findNode.typeName('int? a'), 'int*');
assertType(findNode.typeName('int b'), 'int*');
assertType(findNode.namedType('int? a'), 'int*');
assertType(findNode.namedType('int b'), 'int*');
}
test_mixin_hierarchy() async {
@ -491,7 +491,7 @@ mixin X1 on A {} // 1
mixin X2 implements A {} // 2
''');
assertType(findNode.typeName('A {} // 1'), 'A*');
assertType(findNode.typeName('A {} // 2'), 'A*');
assertType(findNode.namedType('A {} // 1'), 'A*');
assertType(findNode.namedType('A {} // 2'), 'A*');
}
}

102
pkg/analyzer/test/src/dart/resolution/type_name_test.dart
View file

@ -36,7 +36,7 @@ f(A a) {}
''');
assertNamedType(
findNode.typeName('A a'),
findNode.namedType('A a'),
import_a.class_('A'),
'A*',
);
@ -55,7 +55,7 @@ f(A a) {}
''');
assertNamedType(
findNode.typeName('A a'),
findNode.namedType('A a'),
import_a.class_('A'),
'A<num*>*',
);
@ -74,7 +74,7 @@ f(A a) {}
''');
assertNamedType(
findNode.typeName('A a'),
findNode.namedType('A a'),
import_a.class_('A'),
'A<dynamic>*',
);
@ -93,7 +93,7 @@ f(A<int> a) {}
''');
assertNamedType(
findNode.typeName('A<int> a'),
findNode.namedType('A<int> a'),
import_a.class_('A'),
'A<int*>*',
);
@ -113,7 +113,7 @@ f(F a) {}
var element = import_a.typeAlias('F');
var typeName = findNode.typeName('F a');
var typeName = findNode.namedType('F a');
assertNamedType(typeName, element, 'int* Function(bool*)*');
assertTypeAlias(
@ -137,7 +137,7 @@ f(F a) {}
var element = import_a.typeAlias('F');
var typeName = findNode.typeName('F a');
var typeName = findNode.namedType('F a');
assertNamedType(typeName, element, 'dynamic Function(bool*)*');
assertTypeAlias(
@ -161,7 +161,7 @@ f(F a) {}
var element = import_a.typeAlias('F');
var typeName = findNode.typeName('F a');
var typeName = findNode.namedType('F a');
assertNamedType(typeName, element, 'num* Function(bool*)*');
assertTypeAlias(
@ -185,7 +185,7 @@ f(F<int> a) {}
var element = import_a.typeAlias('F');
var typeName = findNode.typeName('F<int> a');
var typeName = findNode.namedType('F<int> a');
assertNamedType(typeName, element, 'int* Function(bool*)*');
assertTypeAlias(
@ -210,7 +210,7 @@ f(A a) {}
]);
assertNamedType(
findNode.typeName('A a'),
findNode.namedType('A a'),
import_a.class_('A'),
'A',
);
@ -231,7 +231,7 @@ f(A a) {}
]);
assertNamedType(
findNode.typeName('A a'),
findNode.namedType('A a'),
import_a.class_('A'),
'A<num*>',
);
@ -252,7 +252,7 @@ f(A a) {}
]);
assertNamedType(
findNode.typeName('A a'),
findNode.namedType('A a'),
import_a.class_('A'),
'A<dynamic>',
);
@ -273,7 +273,7 @@ f(A<int> a) {}
]);
assertNamedType(
findNode.typeName('A<int> a'),
findNode.namedType('A<int> a'),
import_a.class_('A'),
'A<int>',
);
@ -294,7 +294,7 @@ f(F a) {}
]);
assertNamedType(
findNode.typeName('F a'),
findNode.namedType('F a'),
import_a.typeAlias('F'),
'int* Function()',
);
@ -315,7 +315,7 @@ f(F a) {}
]);
assertNamedType(
findNode.typeName('F a'),
findNode.namedType('F a'),
import_a.typeAlias('F'),
'num* Function()',
);
@ -336,7 +336,7 @@ f(F a) {}
]);
assertNamedType(
findNode.typeName('F a'),
findNode.namedType('F a'),
import_a.typeAlias('F'),
'dynamic Function()',
);
@ -357,7 +357,7 @@ f(F<int> a) {}
]);
assertNamedType(
findNode.typeName('F<int> a'),
findNode.namedType('F<int> a'),
import_a.typeAlias('F'),
'int* Function()',
);
@ -375,7 +375,7 @@ void f() {
''');
assertNamedType(
findNode.typeName('X<int>()'),
findNode.namedType('X<int>()'),
findElement.typeAlias('X'),
'A<int>',
);
@ -393,7 +393,7 @@ void f() {
''');
assertNamedType(
findNode.typeName('X()'),
findNode.namedType('X()'),
findElement.typeAlias('X'),
'A<int>',
);
@ -411,7 +411,7 @@ void f() {
''');
assertNamedType(
findNode.typeName('X<int>()'),
findNode.namedType('X<int>()'),
findElement.typeAlias('X'),
'A<int>',
);
@ -424,13 +424,13 @@ void f(X<String> a, X<String?> b) {}
''');
assertNamedType(
findNode.typeName('X<String>'),
findNode.namedType('X<String>'),
findElement.typeAlias('X'),
'Map<int, String>',
);
assertNamedType(
findNode.typeName('X<String?>'),
findNode.namedType('X<String?>'),
findElement.typeAlias('X'),
'Map<int, String?>',
);
@ -447,7 +447,7 @@ void f(X<String> a) {}
''');
assertNamedType(
findNode.typeName('X<String>'),
findNode.namedType('X<String>'),
findElement.importFind('package:test/a.dart').typeAlias('X'),
'Map<int*, String*>*',
);
@ -460,13 +460,13 @@ void f(X<int> a, X<int?> b) {}
''');
assertNamedType(
findNode.typeName('X<int>'),
findNode.namedType('X<int>'),
findElement.typeAlias('X'),
'List<int?>',
);
assertNamedType(
findNode.typeName('X<int?>'),
findNode.namedType('X<int?>'),
findElement.typeAlias('X'),
'List<int?>',
);
@ -483,7 +483,7 @@ void f(X<int> a) {}
''');
assertNamedType(
findNode.typeName('X<int>'),
findNode.namedType('X<int>'),
findElement.importFind('package:test/a.dart').typeAlias('X'),
'List<int*>*',
);
@ -496,13 +496,13 @@ void f(X a, X? b) {}
''');
assertNamedType(
findNode.typeName('X a'),
findNode.namedType('X a'),
findElement.typeAlias('X'),
'Never',
);
assertNamedType(
findNode.typeName('X? b'),
findNode.namedType('X? b'),
findElement.typeAlias('X'),
'Never?',
);
@ -519,7 +519,7 @@ void f(X a) {}
''');
assertNamedType(
findNode.typeName('X a'),
findNode.namedType('X a'),
findElement.importFind('package:test/a.dart').typeAlias('X'),
'Null*',
);
@ -532,13 +532,13 @@ void f(X a, X? b) {}
''');
assertNamedType(
findNode.typeName('X a'),
findNode.namedType('X a'),
findElement.typeAlias('X'),
'Never?',
);
assertNamedType(
findNode.typeName('X? b'),
findNode.namedType('X? b'),
findElement.typeAlias('X'),
'Never?',
);
@ -551,7 +551,7 @@ void f(X<int> a) {}
''');
assertNamedType(
findNode.typeName('X<int>'),
findNode.namedType('X<int>'),
findElement.typeAlias('X'),
'int?',
);
@ -564,7 +564,7 @@ X<String> f() => {};
''');
assertNamedType(
findNode.typeName('X<String>'),
findNode.namedType('X<String>'),
findElement.typeAlias('X'),
'Map<int, String>',
);
@ -577,7 +577,7 @@ Nothing f() {}
''');
assertNamedType(
findNode.typeName('Nothing f()'),
findNode.namedType('Nothing f()'),
findElement.typeAlias('Nothing'),
'void',
);
@ -593,7 +593,7 @@ f(A a) {}
''');
assertNamedType(
findNode.typeName('A a'),
findNode.namedType('A a'),
findElement.class_('A'),
typeStr('A', 'A*'),
);
@ -607,7 +607,7 @@ f(A a) {}
''');
assertNamedType(
findNode.typeName('A a'),
findNode.namedType('A a'),
findElement.class_('A'),
typeStr('A<num>', 'A<num*>*'),
);
@ -621,7 +621,7 @@ f(A a) {}
''');
assertNamedType(
findNode.typeName('A a'),
findNode.namedType('A a'),
findElement.class_('A'),
typeStr('A<dynamic>', 'A<dynamic>*'),
);
@ -635,7 +635,7 @@ f(A<int> a) {}
''');
assertNamedType(
findNode.typeName('A<int> a'),
findNode.namedType('A<int> a'),
findElement.class_('A'),
typeStr('A<int>', 'A<int*>*'),
);
@ -649,7 +649,7 @@ dynamic a;
''');
assertNamedType(
findNode.typeName('dynamic a;'),
findNode.namedType('dynamic a;'),
dynamicElement,
'dynamic',
);
@ -663,7 +663,7 @@ mycore.dynamic a;
''');
assertNamedType(
findNode.typeName('mycore.dynamic a;'),
findNode.namedType('mycore.dynamic a;'),
dynamicElement,
'dynamic',
expectedPrefix: findElement.import('dart:core').prefix,
@ -680,7 +680,7 @@ dynamic a;
]);
assertNamedType(
findNode.typeName('dynamic a;'),
findNode.namedType('dynamic a;'),
null,
'dynamic',
);
@ -692,7 +692,7 @@ dynamic a;
''');
assertNamedType(
findNode.typeName('dynamic a;'),
findNode.namedType('dynamic a;'),
dynamicElement,
'dynamic',
);
@ -706,7 +706,7 @@ f(F a) {}
''');
assertNamedType(
findNode.typeName('F a'),
findNode.namedType('F a'),
findElement.typeAlias('F'),
typeStr('int Function()', 'int* Function()*'),
);
@ -720,7 +720,7 @@ f(F a) {}
''');
assertNamedType(
findNode.typeName('F a'),
findNode.namedType('F a'),
findElement.typeAlias('F'),
typeStr('num Function()', 'num* Function()*'),
);
@ -734,7 +734,7 @@ f(F a) {}
''');
assertNamedType(
findNode.typeName('F a'),
findNode.namedType('F a'),
findElement.typeAlias('F'),
typeStr('dynamic Function()', 'dynamic Function()*'),
);
@ -748,7 +748,7 @@ f(F<int> a) {}
''');
assertNamedType(
findNode.typeName('F<int> a'),
findNode.namedType('F<int> a'),
findElement.typeAlias('F'),
typeStr('int Function()', 'int* Function()*'),
);
@ -766,7 +766,7 @@ main() {
]);
assertNamedType(
findNode.typeName('A();'),
findNode.namedType('A();'),
null,
'dynamic',
expectedPrefix: findElement.prefix('math'),
@ -783,7 +783,7 @@ main() {
''');
assertNamedType(
findNode.typeName('A();'),
findNode.namedType('A();'),
findElement.class_('A'),
typeStr('A', 'A*'),
);
@ -799,7 +799,7 @@ main() {
]);
assertNamedType(
findNode.typeName('A();'),
findNode.namedType('A();'),
null,
'dynamic',
);
@ -815,7 +815,7 @@ void f() {
]);
assertNamedType(
findNode.typeName('int.double'),
findNode.namedType('int.double'),
null,
'dynamic',
expectedPrefix: intElement,
@ -832,7 +832,7 @@ void f() {
]);
assertNamedType(
findNode.typeName('int.double'),
findNode.namedType('int.double'),
null,
'dynamic',
expectedPrefix: intElement,
@ -845,7 +845,7 @@ f(Never a) {}
''');
assertNamedType(
findNode.typeName('Never a'),
findNode.namedType('Never a'),
neverElement,
typeStr('Never', 'Null*'),
);

8
pkg/analyzer/test/src/diagnostics/implements_repeated_test.dart
View file

@ -24,8 +24,8 @@ class B implements A, A {} // ref
]);
var A = findElement.class_('A');
assertNamedType(findNode.typeName('A, A {} // ref'), A, 'A');
assertNamedType(findNode.typeName('A {} // ref'), A, 'A');
assertNamedType(findNode.namedType('A, A {} // ref'), A, 'A');
assertNamedType(findNode.namedType('A {} // ref'), A, 'A');
}
test_class_implements_2times_viaTypeAlias() async {
@ -38,13 +38,13 @@ class C implements A, B {} // ref
]);
assertNamedType(
findNode.typeName('A, B {} // ref'),
findNode.namedType('A, B {} // ref'),
findElement.class_('A'),
'A',
);
assertNamedType(
findNode.typeName('B {} // ref'),
findNode.namedType('B {} // ref'),
findElement.typeAlias('B'),
'A',
);

6
pkg/analyzer/test/src/diagnostics/mixin_inference_no_possible_substitution_test.dart
View file

@ -32,7 +32,7 @@ mixin M<T> on A<T> {}
class X extends A<int> with M {}
''');
assertType(findNode.typeName('M {}'), 'M<int>');
assertType(findNode.namedType('M {}'), 'M<int>');
}
}
@ -55,7 +55,7 @@ import 'a.dart';
class D extends A<int> with B<int>, C {}
''');
assertType(findNode.typeName('B<int>'), 'B<int*>*');
assertType(findNode.typeName('C {}'), 'C<int*>*');
assertType(findNode.namedType('B<int>'), 'B<int*>*');
assertType(findNode.namedType('C {}'), 'C<int*>*');
}
}

2
pkg/analyzer/test/src/diagnostics/not_a_type_test.dart
View file

@ -44,7 +44,7 @@ A.foo bar() {}
extension E on int {}
E a;
''', [error(CompileTimeErrorCode.NOT_A_TYPE, 22, 1)]);
var typeName = findNode.typeName('E a;');
var typeName = findNode.namedType('E a;');
assertTypeDynamic(typeName.type);
assertTypeNull(typeName.name);
}

2
pkg/analyzer/test/src/diagnostics/void_with_type_arguments_test.dart
View file

@ -27,6 +27,6 @@ void<int> f() {}
''', [
error(ParserErrorCode.VOID_WITH_TYPE_ARGUMENTS, 4, 1),
]);
assertNamedType(findNode.typeName('int>'), intElement, 'int');
assertNamedType(findNode.namedType('int>'), intElement, 'int');
}
}

2
pkg/nnbd_migration/test/edge_builder_test.dart
View file

@ -8108,7 +8108,7 @@ import 'dart:math';
void f(Point<int> x) {}
''');
var pointClass =
findNode.typeName('Point').name.staticElement as ClassElement;
findNode.namedType('Point').name.staticElement as ClassElement;
var pointBound =
variables!.decoratedTypeParameterBound(pointClass.typeParameters[0])!;
_assertType(pointBound.type!, 'num');

6
pkg/nnbd_migration/test/fix_aggregator_test.dart
View file

@ -1187,7 +1187,7 @@ f(Object o) => o as a.Future<Null>;
Future<void> test_makeNullable() async {
await analyze('f(int x) {}');
var typeName = findNode.typeName('int');
var typeName = findNode.namedType('int');
var previewInfo = run({
typeName: NodeChangeForTypeAnnotation()
..recordNullability(
@ -1217,7 +1217,7 @@ f(Object o) => o as a.Future<Null>;
Future<void> test_noChangeToTypeAnnotation() async {
await analyze('int x = 0;');
var typeName = findNode.typeName('int');
var typeName = findNode.namedType('int');
var previewInfo = run({
typeName: NodeChangeForTypeAnnotation()
..recordNullability(
@ -1233,7 +1233,7 @@ f(Object o) => o as a.Future<Null>;
Future<void> test_noInfoForTypeAnnotation() async {
await analyze('int x = 0;');
var typeName = findNode.typeName('int');
var typeName = findNode.namedType('int');
var previewInfo = run({typeName: NodeChangeForTypeAnnotation()});
expect(previewInfo, null);
}

8
pkg/nnbd_migration/test/fix_builder_test.dart
View file

@ -1327,7 +1327,7 @@ int _f({int x = 0}) => x + 1;
int _f({int/*?*/ x}) => 1;
''');
visitAll(
changes: {findNode.typeName('int/*?*/ x'): isMakeNullableDueToHint});
changes: {findNode.namedType('int/*?*/ x'): isMakeNullableDueToHint});
}
Future<void>
@ -1367,7 +1367,7 @@ void _f({@required int/*?*/ x}) {}
''');
visitAll(changes: {
findNode.annotation('required'): isRequiredAnnotationToRequiredKeyword,
findNode.typeName('int'): isMakeNullableDueToHint,
findNode.namedType('int'): isMakeNullableDueToHint,
});
}
@ -1594,7 +1594,7 @@ void Function(int/*?*/) _f() {
}
void _g(int/*?*/ x) {}
''');
var intTypeAnnotation = findNode.typeName('int)');
var intTypeAnnotation = findNode.namedType('int)');
var genericFunctionTypeAnnotation =
findNode.genericFunctionType('Function(int)');
visitTypeAnnotation(genericFunctionTypeAnnotation, 'void Function(int?)',
@ -1608,7 +1608,7 @@ void _f() {
}
int/*?*/ _g() => null;
''');
var intTypeAnnotation = findNode.typeName('int Function');
var intTypeAnnotation = findNode.namedType('int Function');
var genericFunctionTypeAnnotation =
findNode.genericFunctionType('Function');
visitTypeAnnotation(genericFunctionTypeAnnotation, 'int? Function()',