| Index: pkg/analyzer/test/generated/parser_test.dart
|
| diff --git a/pkg/analyzer/test/generated/parser_test.dart b/pkg/analyzer/test/generated/parser_test.dart
|
| index 9a2611f7d240fd7999821cea50f0103c8af69e2f..d85fc098bd39e2ddaee18f7d8beed04f71b5c307 100644
|
| --- a/pkg/analyzer/test/generated/parser_test.dart
|
| +++ b/pkg/analyzer/test/generated/parser_test.dart
|
| @@ -3822,7 +3822,7 @@ class C {
|
| VariableDeclaration field = fields[0];
|
| expect(field.name.name, 'f');
|
| // validate the type
|
| - TypeArgumentList typeArguments = (fieldList.type as TypeName).typeArguments;
|
| + TypeArgumentList typeArguments = fieldList.type.typeArguments;
|
| expect(typeArguments.arguments, hasLength(1));
|
| // synthetic '>'
|
| Token token = typeArguments.endToken;
|
| @@ -3869,9 +3869,9 @@ class C<K {
|
| expect(expression.expression, isNotNull);
|
| expect(expression.isOperator, isNotNull);
|
| expect(expression.notOperator, isNotNull);
|
| - TypeAnnotation type = expression.type;
|
| + TypeName type = expression.type;
|
| expect(type, isNotNull);
|
| - expect(type is TypeName && type.name.isSynthetic, isTrue);
|
| + expect(type.name.isSynthetic, isTrue);
|
| EngineTestCase.assertInstanceOf((obj) => obj is EmptyStatement,
|
| EmptyStatement, ifStatement.thenStatement);
|
| }
|
| @@ -6042,7 +6042,7 @@ class SimpleParserTest extends ParserTestCase {
|
| expect(method.externalKeyword, isNull);
|
| expect(method.modifierKeyword, isNull);
|
| expect(method.propertyKeyword, isNull);
|
| - expect((method.returnType as TypeName).name.name, 'T');
|
| + expect(method.returnType.name.name, 'T');
|
| expect(method.name, isNotNull);
|
| expect(method.operatorKeyword, isNull);
|
| expect(method.typeParameters, isNotNull);
|
| @@ -6062,14 +6062,14 @@ class SimpleParserTest extends ParserTestCase {
|
| expect(method.externalKeyword, isNull);
|
| expect(method.modifierKeyword, isNull);
|
| expect(method.propertyKeyword, isNull);
|
| - expect((method.returnType as TypeName).name.name, 'T');
|
| + expect(method.returnType.name.name, 'T');
|
| expect(method.name, isNotNull);
|
| expect(method.operatorKeyword, isNull);
|
| expect(method.typeParameters, isNotNull);
|
| TypeParameter tp = method.typeParameters.typeParameters[0];
|
| expect(tp.name.name, 'T');
|
| expect(tp.extendsKeyword, isNotNull);
|
| - expect((tp.bound as TypeName).name.name, 'num');
|
| + expect(tp.bound.name.name, 'num');
|
| expect(method.parameters, isNotNull);
|
| expect(method.body, isNotNull);
|
| }
|
| @@ -10150,9 +10150,9 @@ void''');
|
| expect(name.period, isNull);
|
| expect(name.name, isNull);
|
| expect(expression.argumentList, isNotNull);
|
| - NodeList<TypeAnnotation> arguments = type.typeArguments.arguments;
|
| + NodeList<TypeName> arguments = type.typeArguments.arguments;
|
| expect(arguments, hasLength(1));
|
| - expect((arguments[0] as TypeName).question, isNotNull);
|
| + expect(arguments[0].question, isNotNull);
|
| }
|
|
|
| void test_parseLibraryDirective() {
|
| @@ -13073,7 +13073,7 @@ void''');
|
| .parseVariableDeclarationListAfterMetadata(emptyCommentAndMetadata());
|
| expectNotNullIfNoErrors(declarationList);
|
| listener.assertNoErrors();
|
| - expect((declarationList.type as TypeName).name.name, 'T');
|
| + expect(declarationList.type.name.name, 'T');
|
| expect(declarationList.isFinal, true);
|
| }
|
|
|
| @@ -13128,7 +13128,7 @@ void''');
|
| .parseVariableDeclarationListAfterMetadata(emptyCommentAndMetadata());
|
| expectNotNullIfNoErrors(declarationList);
|
| listener.assertNoErrors();
|
| - expect((declarationList.type as TypeName).name.name, 'T');
|
| + expect(declarationList.type.name.name, 'T');
|
| expect(declarationList.keyword, isNull);
|
| }
|
|
|
|
|