| Index: pkg/analyzer/lib/src/generated/resolver.dart
|
| diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
|
| index 3be6c62f6052aa63d1f441063efbdabe324ce45b..74232cdf993c07d51b10b7be7e677f908db92be6 100644
|
| --- a/pkg/analyzer/lib/src/generated/resolver.dart
|
| +++ b/pkg/analyzer/lib/src/generated/resolver.dart
|
| @@ -391,7 +391,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<Object> {
|
| }
|
| String rhsNameStr = typeName is TypeName ? typeName.name.name : null;
|
| // if x is dynamic
|
| - if (rhsType.isDynamic && rhsNameStr == Keyword.DYNAMIC.syntax) {
|
| + if (rhsType.isDynamic && rhsNameStr == Keyword.DYNAMIC.lexeme) {
|
| if (node.notOperator == null) {
|
| // the is case
|
| _errorReporter.reportErrorForNode(
|
| @@ -8618,7 +8618,7 @@ class TypeNameResolver {
|
| */
|
| static bool _isBuiltInIdentifier(TypeName typeName) {
|
| Token token = typeName.name.beginToken;
|
| - return token.type == TokenType.KEYWORD;
|
| + return token.type.isKeyword;
|
| }
|
|
|
| /**
|
| @@ -10347,7 +10347,7 @@ class TypeResolverVisitor extends ScopedVisitor {
|
| // If the type is not an InterfaceType, then visitTypeName() sets the type
|
| // to be a DynamicTypeImpl
|
| Identifier name = typeName.name;
|
| - if (name.name == Keyword.DYNAMIC.syntax) {
|
| + if (name.name == Keyword.DYNAMIC.lexeme) {
|
| errorReporter.reportErrorForNode(dynamicTypeError, name, [name.name]);
|
| } else if (!nameScope.shouldIgnoreUndefined(name)) {
|
| errorReporter.reportErrorForNode(nonTypeError, name, [name.name]);
|
|
|