Elements. Update ResolutionTest to return V2 elements.
Change-Id: Ide12204bbaf51454ef14f19a96d47d2fa107a582
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406380
Reviewed-by: Phil Quitslund <pquitslund@google.com>
diff --git a/pkg/analyzer/test/src/dart/analysis/index_test.dart b/pkg/analyzer/test/src/dart/analysis/index_test.dart
index 9fe94eff..05870a6 100644
--- a/pkg/analyzer/test/src/dart/analysis/index_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/index_test.dart
@@ -9,6 +9,7 @@
import 'package:analyzer/src/dart/analysis/index.dart';
import 'package:analyzer/src/summary/idl.dart';
import 'package:analyzer/src/test_utilities/find_element.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
import 'package:collection/collection.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -930,7 +931,7 @@
27 3:13 |A| IS_REFERENCED_BY
''');
- assertElementIndexText(intElement, r'''
+ assertElementIndexText(intElement.asElement, r'''
29 3:15 |int| IS_REFERENCED_BY
''');
}
diff --git a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
index b04d5e4..6ee60f1 100644
--- a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
+++ b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
@@ -13,6 +13,7 @@
import 'package:analyzer/src/dart/micro/resolve_file.dart';
import 'package:analyzer/src/dart/micro/utils.dart';
import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
import 'package:linter/src/lint_codes.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -946,7 +947,7 @@
var b = 1 + 2;
''');
assertType(findElement.topVar('a').type, 'int');
- assertElement(findNode.namedType('int a'), intElement);
+ assertElement(findNode.namedType('int a'), intElement.asElement);
assertType(findElement.topVar('b').type, 'int');
}
diff --git a/pkg/analyzer/test/src/dart/resolution/resolution.dart b/pkg/analyzer/test/src/dart/resolution/resolution.dart
index 3502fa3..09934d2 100644
--- a/pkg/analyzer/test/src/dart/resolution/resolution.dart
+++ b/pkg/analyzer/test/src/dart/resolution/resolution.dart
@@ -55,38 +55,37 @@
final DartObjectPrinterConfiguration dartObjectPrinterConfiguration =
DartObjectPrinterConfiguration();
- ClassElement get boolElement => typeProvider.boolElement;
+ ClassElement2 get boolElement => typeProvider.boolElement2;
- ClassElement get doubleElement => typeProvider.doubleElement;
+ ClassElement2 get doubleElement => typeProvider.doubleElement2;
InterfaceType get doubleType => typeProvider.doubleType;
- Element get dynamicElement =>
- (typeProvider.dynamicType as DynamicTypeImpl).element;
+ Element2 get dynamicElement =>
+ (typeProvider.dynamicType as DynamicTypeImpl).element3;
- FeatureSet get featureSet => result.libraryElement.featureSet;
+ FeatureSet get featureSet => result.libraryElement2.featureSet;
- ClassElement get futureElement => typeProvider.futureElement;
+ ClassElement2 get futureElement => typeProvider.futureElement2;
InheritanceManager3 get inheritanceManager {
var library = result.libraryElement2 as LibraryElementImpl;
return library.session.inheritanceManager;
}
- ClassElement get intElement => typeProvider.intElement;
+ ClassElement2 get intElement => typeProvider.intElement2;
InterfaceType get intType => typeProvider.intType;
- ClassElement get listElement => typeProvider.listElement;
+ ClassElement2 get listElement => typeProvider.listElement2;
- ClassElement get mapElement => typeProvider.mapElement;
+ ClassElement2 get mapElement => typeProvider.mapElement2;
- NeverElementImpl get neverElement => NeverElementImpl.instance;
+ NeverElementImpl2 get neverElement => NeverElementImpl2.instance;
- ClassElement get numElement => typeProvider.numElement;
+ ClassElement2 get numElement => typeProvider.numElement2;
- ClassElement get objectElement =>
- typeProvider.objectType.element as ClassElement;
+ ClassElement2 get objectElement => typeProvider.objectElement2;
bool get strictCasts {
var analysisOptions =
@@ -94,7 +93,7 @@
return analysisOptions.strictCasts;
}
- ClassElement get stringElement => typeProvider.stringElement;
+ ClassElement2 get stringElement => typeProvider.stringElement2;
InterfaceType get stringType => typeProvider.stringType;
