Skip to content

Commit 048b4ac

Browse files
pqCommit Queue
pq
authored and
Commit Queue
committed
[element model] migrate non_error_resolver_test
Change-Id: Id18ca7bb116f2c0624f6a94005d879e2401f6226 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/405562 Commit-Queue: Phil Quitslund <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]> Auto-Submit: Phil Quitslund <[email protected]>
1 parent 41e888a commit 048b4ac

File tree

1 file changed

+37
-39
lines changed

1 file changed

+37
-39
lines changed

‎pkg/analyzer/test/generated/non_error_resolver_test.dart‎

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// ignore_for_file: analyzer_use_new_elements
6-
75
import 'package:analyzer/dart/ast/ast.dart';
8-
import 'package:analyzer/dart/element/element.dart';
6+
import 'package:analyzer/dart/element/element2.dart';
97
import 'package:analyzer/src/dart/element/member.dart';
108
import 'package:analyzer/src/error/codes.dart';
119
import 'package:analyzer/src/generated/parser.dart' show ParserErrorCode;
@@ -698,7 +696,7 @@ class D {}
698696
mixin E {}
699697
''');
700698
CompilationUnit unit = result.unit;
701-
ClassElement classC = unit.declaredElement!.getClass('C')!;
699+
ClassElement2 classC = unit.declaredFragment!.element.getClass2('C')!;
702700
expect(classC.documentationComment, isNotNull);
703701
}
704702

@@ -1365,9 +1363,9 @@ class C<T> {
13651363
test() {}
13661364
''');
13671365
var x = findNode.namedExpression('arg: true');
1368-
var y = x.staticParameterElement!;
1366+
var y = x.correspondingParameter!;
13691367
expect(y, TypeMatcher<ParameterMember>());
1370-
expect(y.declaration, findElement.parameter('arg'));
1368+
expect(y.baseElement, findElement2.parameter('arg'));
13711369
}
13721370

13731371
test_generic_staticParameterElement_annotation_implicitTypeArg() async {
@@ -1379,9 +1377,9 @@ class C<T> {
13791377
test() {}
13801378
''');
13811379
var x = findNode.namedExpression('arg: true');
1382-
var y = x.staticParameterElement!;
1380+
var y = x.correspondingParameter!;
13831381
expect(y, TypeMatcher<ParameterMember>());
1384-
expect(y.declaration, findElement.parameter('arg'));
1382+
expect(y.baseElement, findElement2.parameter('arg'));
13851383
}
13861384

13871385
test_generic_staticParameterElement_functionCall_explicitTypeArg() async {
@@ -1394,9 +1392,9 @@ void test() {
13941392
''');
13951393

13961394
var x = findNode.namedExpression('arg: true');
1397-
var y = x.staticParameterElement!;
1398-
expect(y.enclosingElement3, isNotNull);
1399-
expect(y.declaration, findElement.parameter('arg'));
1395+
var y = x.correspondingParameter!;
1396+
expect(y.enclosingElement2, isNotNull);
1397+
expect(y.baseElement, findElement2.parameter('arg'));
14001398
}
14011399

14021400
test_generic_staticParameterElement_functionCall_implicitTypeArg() async {
@@ -1409,9 +1407,9 @@ void test() {
14091407
''');
14101408

14111409
var x = findNode.namedExpression('arg: true');
1412-
var y = x.staticParameterElement!;
1413-
expect(y.enclosingElement3, isNotNull);
1414-
expect(y.declaration, findElement.parameter('arg'));
1410+
var y = x.correspondingParameter!;
1411+
expect(y.enclosingElement2, isNotNull);
1412+
expect(y.baseElement, findElement2.parameter('arg'));
14151413
}
14161414

14171415
test_generic_staticParameterElement_instanceCreation_explicitNew() async {
@@ -1422,9 +1420,9 @@ class C<T> {
14221420
test() => new C<bool>.named(arg: true);
14231421
''');
14241422
var x = findNode.namedExpression('arg: true');
1425-
var y = x.staticParameterElement!;
1423+
var y = x.correspondingParameter!;
14261424
expect(y, TypeMatcher<ParameterMember>());
1427-
expect(y.declaration, findElement.parameter('arg'));
1425+
expect(y.baseElement, findElement2.parameter('arg'));
14281426
}
14291427

14301428
test_generic_staticParameterElement_instanceCreation_explicitNew_implicitTypeArg() async {
@@ -1435,9 +1433,9 @@ class C<T> {
14351433
C<bool> test() => new C.named(arg: true);
14361434
''');
14371435
var x = findNode.namedExpression('arg: true');
1438-
var y = x.staticParameterElement!;
1436+
var y = x.correspondingParameter!;
14391437
expect(y, TypeMatcher<ParameterMember>());
1440-
expect(y.declaration, findElement.parameter('arg'));
1438+
expect(y.baseElement, findElement2.parameter('arg'));
14411439
}
14421440

14431441
test_generic_staticParameterElement_instanceCreation_implicitNew() async {
@@ -1448,9 +1446,9 @@ class C<T> {
14481446
test() => C<bool>.named(arg: true);
14491447
''');
14501448
var x = findNode.namedExpression('arg: true');
1451-
var y = x.staticParameterElement!;
1449+
var y = x.correspondingParameter!;
14521450
expect(y, TypeMatcher<ParameterMember>());
1453-
expect(y.declaration, findElement.parameter('arg'));
1451+
expect(y.baseElement, findElement2.parameter('arg'));
14541452
}
14551453

14561454
test_generic_staticParameterElement_instanceCreation_implicitNew_implicitTypeArg() async {
@@ -1461,9 +1459,9 @@ class C<T> {
14611459
C<bool> test() => C.named(arg: true);
14621460
''');
14631461
var x = findNode.namedExpression('arg: true');
1464-
var y = x.staticParameterElement!;
1462+
var y = x.correspondingParameter!;
14651463
expect(y, TypeMatcher<ParameterMember>());
1466-
expect(y.declaration, findElement.parameter('arg'));
1464+
expect(y.baseElement, findElement2.parameter('arg'));
14671465
}
14681466

14691467
test_generic_staticParameterElement_methodCall() async {
@@ -1474,9 +1472,9 @@ abstract class C {
14741472
test(C c) => c.method<bool>(arg: true);
14751473
''');
14761474
var x = findNode.namedExpression('arg: true');
1477-
var y = x.staticParameterElement!;
1478-
expect(y.enclosingElement3, isNotNull);
1479-
expect(y.declaration, findElement.parameter('arg'));
1475+
var y = x.correspondingParameter!;
1476+
expect(y.enclosingElement2, isNotNull);
1477+
expect(y.baseElement, findElement2.parameter('arg'));
14801478
}
14811479

14821480
test_generic_staticParameterElement_methodCall_implicitTypeArg() async {
@@ -1487,9 +1485,9 @@ abstract class C {
14871485
bool test(C c) => c.method(arg: true);
14881486
''');
14891487
var x = findNode.namedExpression('arg: true');
1490-
var y = x.staticParameterElement!;
1491-
expect(y.enclosingElement3, isNotNull);
1492-
expect(y.declaration, findElement.parameter('arg'));
1488+
var y = x.correspondingParameter!;
1489+
expect(y.enclosingElement2, isNotNull);
1490+
expect(y.baseElement, findElement2.parameter('arg'));
14931491
}
14941492

14951493
test_generic_staticParameterElement_staticMethodCall_explicitTypeArg() async {
@@ -1504,9 +1502,9 @@ void test() {
15041502
''');
15051503

15061504
var x = findNode.namedExpression('arg: true');
1507-
var y = x.staticParameterElement!;
1508-
expect(y.enclosingElement3, isNotNull);
1509-
expect(y.declaration, findElement.parameter('arg'));
1505+
var y = x.correspondingParameter!;
1506+
expect(y.enclosingElement2, isNotNull);
1507+
expect(y.baseElement, findElement2.parameter('arg'));
15101508
}
15111509

15121510
test_generic_staticParameterElement_staticMethodCall_implicitTypeArg() async {
@@ -1521,9 +1519,9 @@ void test() {
15211519
''');
15221520

15231521
var x = findNode.namedExpression('arg: true');
1524-
var y = x.staticParameterElement!;
1525-
expect(y.enclosingElement3, isNotNull);
1526-
expect(y.declaration, findElement.parameter('arg'));
1522+
var y = x.correspondingParameter!;
1523+
expect(y.enclosingElement2, isNotNull);
1524+
expect(y.baseElement, findElement2.parameter('arg'));
15271525
}
15281526

15291527
test_genericTypeAlias_fieldAndReturnType_noTypeParameters() async {
@@ -2239,8 +2237,8 @@ void main() {
22392237
error(WarningCode.UNUSED_LOCAL_VARIABLE, 93, 1),
22402238
error(CompileTimeErrorCode.INVALID_ASSIGNMENT, 97, 1),
22412239
]);
2242-
var z = result.unit.declaredElement!.topLevelVariables
2243-
.where((e) => e.name == 'z')
2240+
var z = result.unit.declaredFragment!.element.topLevelVariables
2241+
.where((e) => e.name3 == 'z')
22442242
.single;
22452243
assertType(z.type, 'List<String>');
22462244
}
@@ -2295,9 +2293,9 @@ h(bool b) {
22952293
''', [
22962294
error(WarningCode.UNUSED_LOCAL_VARIABLE, 104, 1),
22972295
]);
2298-
var parameter = findNode.stringLiteral("'x'").staticParameterElement;
2299-
expect(parameter!.library, isNull);
2300-
expect(parameter.librarySource, isNull);
2296+
var parameter = findNode.stringLiteral("'x'").correspondingParameter;
2297+
expect(parameter!.library2, isNull);
2298+
expect(parameter.library2?.firstFragment.source, isNull);
23012299
}
23022300

23032301
test_loadLibraryDefined() async {

0 commit comments

Comments
 (0)