| Index: pkg/analyzer2dart/test/identifier_semantics_test.dart
|
| diff --git a/pkg/analyzer2dart/test/identifier_semantics_test.dart b/pkg/analyzer2dart/test/identifier_semantics_test.dart
|
| index 937e1570b68830e5141b49aa710f845e49698f58..0801e7a3d78eee4d7bed07cc066421f3d168cd79 100644
|
| --- a/pkg/analyzer2dart/test/identifier_semantics_test.dart
|
| +++ b/pkg/analyzer2dart/test/identifier_semantics_test.dart
|
| @@ -12,7 +12,6 @@ import 'package:analyzer/src/generated/source.dart';
|
| import 'package:analyzer/src/generated/source_io.dart';
|
| import 'package:analyzer2dart/src/identifier_semantics.dart';
|
| import 'package:unittest/unittest.dart';
|
| -import 'package:sharedfrontend/src/access_semantics.dart';
|
|
|
| import 'mock_sdk.dart';
|
|
|
| @@ -2297,7 +2296,7 @@ class Helper {
|
| } else {
|
| expect(semantics.target.toSource(), equals(expectedTarget));
|
| }
|
| - expect(semantics.name, equals(expectedName));
|
| + expect(semantics.identifier.name, equals(expectedName));
|
| expect(semantics.element, isNull);
|
| expect(semantics.classElement, isNull);
|
| expect(semantics.isRead, equals(isRead));
|
| @@ -2320,8 +2319,8 @@ class Helper {
|
| count++;
|
| expect(node.toSource(), equals(expectedSource));
|
| expect(semantics.kind, equals(AccessKind.LOCAL_FUNCTION));
|
| - expect(semantics.name, equals(expectedName));
|
| - expect(displayName(semantics.element), equals(expectedName));
|
| + expect(semantics.identifier.name, equals(expectedName));
|
| + expect(semantics.element.displayName, equals(expectedName));
|
| expect(semantics.classElement, isNull);
|
| expect(semantics.target, isNull);
|
| expect(semantics.isRead, equals(isRead));
|
| @@ -2391,13 +2390,13 @@ class Helper {
|
| count++;
|
| expect(node.toSource(), equals(expectedSource));
|
| expect(semantics.kind, equals(AccessKind.STATIC_FIELD));
|
| - expect(semantics.name, equals(expectedName));
|
| - expect(displayName(semantics.element), equals(expectedName));
|
| + expect(semantics.identifier.name, equals(expectedName));
|
| + expect(semantics.element.displayName, equals(expectedName));
|
| if (expectedClass == null) {
|
| expect(semantics.classElement, isNull);
|
| } else {
|
| expect(semantics.classElement, isNotNull);
|
| - expect(displayName(semantics.classElement), equals(expectedClass));
|
| + expect(semantics.classElement.displayName, equals(expectedClass));
|
| }
|
| expect(semantics.target, isNull);
|
| expect(semantics.isRead, equals(isRead));
|
| @@ -2421,7 +2420,7 @@ class Helper {
|
| count++;
|
| expect(node.toSource(), equals(expectedSource));
|
| expect(semantics.kind, equals(AccessKind.STATIC_METHOD));
|
| - expect(semantics.name, equals(expectedName));
|
| + expect(semantics.identifier.name, equals(expectedName));
|
| if (expectedClass == null) {
|
| expect(semantics.classElement, isNull);
|
| if (defined) {
|
| @@ -2429,13 +2428,13 @@ class Helper {
|
| }
|
| } else {
|
| expect(semantics.classElement, isNotNull);
|
| - expect(displayName(semantics.classElement), equals(expectedClass));
|
| + expect(semantics.classElement.displayName, equals(expectedClass));
|
| if (defined) {
|
| expect(semantics.element, new isInstanceOf<MethodElement>());
|
| }
|
| }
|
| if (defined) {
|
| - expect(displayName(semantics.element), equals(expectedName));
|
| + expect(semantics.element.displayName, equals(expectedName));
|
| } else {
|
| expect(semantics.element, isNull);
|
| }
|
| @@ -2461,15 +2460,15 @@ class Helper {
|
| count++;
|
| expect(node.toSource(), equals(expectedSource));
|
| expect(semantics.kind, equals(AccessKind.STATIC_PROPERTY));
|
| - expect(semantics.name, equals(expectedName));
|
| + expect(semantics.identifier.name, equals(expectedName));
|
| if (expectedClass == null) {
|
| expect(semantics.classElement, isNull);
|
| } else {
|
| expect(semantics.classElement, isNotNull);
|
| - expect(displayName(semantics.classElement), equals(expectedClass));
|
| + expect(semantics.classElement.displayName, equals(expectedClass));
|
| }
|
| if (defined) {
|
| - expect(displayName(semantics.element), equals(expectedName));
|
| + expect(semantics.element.displayName, equals(expectedName));
|
| } else {
|
| expect(semantics.element, isNull);
|
| }
|
| @@ -2535,8 +2534,3 @@ class TestVisitor extends RecursiveAstVisitor {
|
| }
|
| }
|
| }
|
| -
|
| -// TODO(johnniwinther): Remove this when the semantics of element names have
|
| -// been resolved.
|
| -/// Helper methods for accessing the [displayName] method without warning.
|
| -String displayName(element) => element.displayName;
|
|
|