| Index: pkg/analyzer/test/generated/resolver_test.dart
|
| diff --git a/pkg/analyzer/test/generated/resolver_test.dart b/pkg/analyzer/test/generated/resolver_test.dart
|
| index 0a01df515cbde79bc447788819ff9a1c95fbe8ed..fadd4c34f5425d9b77e0c6cbd00299f7509fb615 100644
|
| --- a/pkg/analyzer/test/generated/resolver_test.dart
|
| +++ b/pkg/analyzer/test/generated/resolver_test.dart
|
| @@ -7,8 +7,8 @@ library analyzer.test.generated.resolver_test;
|
| import 'dart:collection';
|
|
|
| import 'package:analyzer/dart/ast/ast.dart';
|
| -import 'package:analyzer/dart/ast/standard_resolution_map.dart';
|
| import 'package:analyzer/dart/ast/standard_ast_factory.dart';
|
| +import 'package:analyzer/dart/ast/standard_resolution_map.dart';
|
| import 'package:analyzer/dart/ast/token.dart';
|
| import 'package:analyzer/dart/ast/visitor.dart';
|
| import 'package:analyzer/dart/element/element.dart';
|
| @@ -409,9 +409,9 @@ class StaticTypeVerifier extends GeneralizingAstVisitor<Object> {
|
| List<Expression> _invalidlyPropagatedExpressions = new List<Expression>();
|
|
|
| /**
|
| - * A list containing all of the AST TypeName nodes that were not resolved.
|
| + * The TypeAnnotation nodes that were not resolved.
|
| */
|
| - List<TypeName> _unresolvedTypes = new List<TypeName>();
|
| + List<TypeAnnotation> _unresolvedTypes = new List<TypeAnnotation>();
|
|
|
| /**
|
| * Counter for the number of Expression nodes visited that are resolved.
|
| @@ -441,7 +441,7 @@ class StaticTypeVerifier extends GeneralizingAstVisitor<Object> {
|
| buffer.write(" of ");
|
| buffer.write(_resolvedTypeCount + unresolvedTypeCount);
|
| buffer.writeln(" type names:");
|
| - for (TypeName identifier in _unresolvedTypes) {
|
| + for (TypeAnnotation identifier in _unresolvedTypes) {
|
| buffer.write(" ");
|
| buffer.write(identifier.toString());
|
| buffer.write(" (");
|
| @@ -575,9 +575,21 @@ class StaticTypeVerifier extends GeneralizingAstVisitor<Object> {
|
| }
|
|
|
| @override
|
| + Object visitTypeAnnotation(TypeAnnotation node) {
|
| + if (node.type == null) {
|
| + _unresolvedTypes.add(node);
|
| + } else {
|
| + _resolvedTypeCount++;
|
| + }
|
| + return super.visitTypeAnnotation(node);
|
| + }
|
| +
|
| + @override
|
| Object visitTypeName(TypeName node) {
|
| // Note: do not visit children from this node, the child SimpleIdentifier in
|
| // TypeName (i.e. "String") does not have a static type defined.
|
| + // TODO(brianwilkerson) Not visiting the children means that we won't catch
|
| + // type arguments that were not resolved.
|
| if (node.type == null) {
|
| _unresolvedTypes.add(node);
|
| } else {
|
|
|