Skip to content

Commit ae5cc18

Browse files
committed
Elements. Update ResolutionTest to return V2 elements.
Change-Id: Ide12204bbaf51454ef14f19a96d47d2fa107a582 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406380 Reviewed-by: Phil Quitslund <[email protected]>
1 parent 217bfed commit ae5cc18

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

pkg/analyzer/test/src/dart/analysis/index_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import 'package:analyzer/dart/element/element.dart';
99
import 'package:analyzer/src/dart/analysis/index.dart';
1010
import 'package:analyzer/src/summary/idl.dart';
1111
import 'package:analyzer/src/test_utilities/find_element.dart';
12+
import 'package:analyzer/src/utilities/extensions/element.dart';
1213
import 'package:collection/collection.dart';
1314
import 'package:test/test.dart';
1415
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -930,7 +931,7 @@ typedef B = A<int>;
930931
27 3:13 |A| IS_REFERENCED_BY
931932
''');
932933

933-
assertElementIndexText(intElement, r'''
934+
assertElementIndexText(intElement.asElement, r'''
934935
29 3:15 |int| IS_REFERENCED_BY
935936
''');
936937
}

pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import 'package:analyzer/src/dart/error/syntactic_errors.dart';
1313
import 'package:analyzer/src/dart/micro/resolve_file.dart';
1414
import 'package:analyzer/src/dart/micro/utils.dart';
1515
import 'package:analyzer/src/error/codes.dart';
16+
import 'package:analyzer/src/utilities/extensions/element.dart';
1617
import 'package:linter/src/lint_codes.dart';
1718
import 'package:test/test.dart';
1819
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -946,7 +947,7 @@ int a = 0;
946947
var b = 1 + 2;
947948
''');
948949
assertType(findElement.topVar('a').type, 'int');
949-
assertElement(findNode.namedType('int a'), intElement);
950+
assertElement(findNode.namedType('int a'), intElement.asElement);
950951

951952
assertType(findElement.topVar('b').type, 'int');
952953
}

pkg/analyzer/test/src/dart/resolution/resolution.dart

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,46 +55,45 @@ mixin ResolutionTest implements ResourceProviderMixin {
5555
final DartObjectPrinterConfiguration dartObjectPrinterConfiguration =
5656
DartObjectPrinterConfiguration();
5757

58-
ClassElement get boolElement => typeProvider.boolElement;
58+
ClassElement2 get boolElement => typeProvider.boolElement2;
5959

60-
ClassElement get doubleElement => typeProvider.doubleElement;
60+
ClassElement2 get doubleElement => typeProvider.doubleElement2;
6161

6262
InterfaceType get doubleType => typeProvider.doubleType;
6363

64-
Element get dynamicElement =>
65-
(typeProvider.dynamicType as DynamicTypeImpl).element;
64+
Element2 get dynamicElement =>
65+
(typeProvider.dynamicType as DynamicTypeImpl).element3;
6666

67-
FeatureSet get featureSet => result.libraryElement.featureSet;
67+
FeatureSet get featureSet => result.libraryElement2.featureSet;
6868

69-
ClassElement get futureElement => typeProvider.futureElement;
69+
ClassElement2 get futureElement => typeProvider.futureElement2;
7070

7171
InheritanceManager3 get inheritanceManager {
7272
var library = result.libraryElement2 as LibraryElementImpl;
7373
return library.session.inheritanceManager;
7474
}
7575

76-
ClassElement get intElement => typeProvider.intElement;
76+
ClassElement2 get intElement => typeProvider.intElement2;
7777

7878
InterfaceType get intType => typeProvider.intType;
7979

80-
ClassElement get listElement => typeProvider.listElement;
80+
ClassElement2 get listElement => typeProvider.listElement2;
8181

82-
ClassElement get mapElement => typeProvider.mapElement;
82+
ClassElement2 get mapElement => typeProvider.mapElement2;
8383

84-
NeverElementImpl get neverElement => NeverElementImpl.instance;
84+
NeverElementImpl2 get neverElement => NeverElementImpl2.instance;
8585

86-
ClassElement get numElement => typeProvider.numElement;
86+
ClassElement2 get numElement => typeProvider.numElement2;
8787

88-
ClassElement get objectElement =>
89-
typeProvider.objectType.element as ClassElement;
88+
ClassElement2 get objectElement => typeProvider.objectElement2;
9089

9190
bool get strictCasts {
9291
var analysisOptions =
9392
result.session.analysisContext.getAnalysisOptionsForFile(result.file);
9493
return analysisOptions.strictCasts;
9594
}
9695

97-
ClassElement get stringElement => typeProvider.stringElement;
96+
ClassElement2 get stringElement => typeProvider.stringElement2;
9897

9998
InterfaceType get stringType => typeProvider.stringType;
10099

0 commit comments

Comments
 (0)