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-
75import 'package:analyzer/dart/ast/ast.dart' ;
8- import 'package:analyzer/dart/element/element .dart' ;
6+ import 'package:analyzer/dart/element/element2 .dart' ;
97import 'package:analyzer/src/dart/element/type.dart' ;
108import 'package:analyzer/src/error/codes.dart' ;
119import 'package:analyzer/src/test_utilities/function_ast_visitor.dart' ;
@@ -247,7 +245,7 @@ void test(List<A> listA, List<B> listB) {
247245 String vSearch, String vType, String fSearch, String fType) {
248246 var node = findNode.declaredIdentifier (vSearch);
249247
250- var element = node.declaredElement as LocalVariableElement ;
248+ var element = node.declaredElement2 as LocalVariableElement2 ;
251249 assertType (element.type, vType);
252250
253251 var invocation = findNode.methodInvocation (fSearch);
@@ -269,12 +267,12 @@ class C {
269267}
270268''' ;
271269 await resolveTestCode (code);
272- ClassElement c = findElement .class_ ('C' );
270+ ClassElement2 c = findElement2 .class_ ('C' );
273271
274- PropertyAccessorElement x = c.accessors [0 ];
272+ SetterElement x = c.setters2 [0 ];
275273 expect (x.returnType, VoidTypeImpl .instance);
276274
277- MethodElement operator = c.methods [0 ];
275+ MethodElement2 operator = c.methods2 [0 ];
278276 expect (operator .displayName, '[]=' );
279277 expect (operator .returnType, VoidTypeImpl .instance);
280278 }
@@ -290,12 +288,12 @@ class Derived extends Base {
290288 operator[]=(int x, int y) {}
291289}''' ;
292290 await resolveTestCode (code);
293- ClassElement c = findElement .class_ ('Derived' );
291+ ClassElement2 c = findElement2 .class_ ('Derived' );
294292
295- PropertyAccessorElement x = c.accessors [0 ];
293+ SetterElement x = c.setters2 [0 ];
296294 expect (x.returnType, VoidTypeImpl .instance);
297295
298- MethodElement operator = c.methods [0 ];
296+ MethodElement2 operator = c.methods2 [0 ];
299297 expect (operator .displayName, '[]=' );
300298 expect (operator .returnType, VoidTypeImpl .instance);
301299 }
@@ -307,12 +305,12 @@ var y = {};
307305''' ;
308306 await resolveTestCode (code);
309307 var xNode = findNode.variableDeclaration ('x = ' );
310- var xElement = xNode.declaredElement ! ;
311- assertType (xElement .type, 'List<dynamic>' );
308+ var xfragment = xNode.declaredFragment ! ;
309+ assertType (xfragment.element .type, 'List<dynamic>' );
312310
313311 var yNode = findNode.variableDeclaration ('y = ' );
314- var yElement = yNode.declaredElement ! ;
315- assertType (yElement .type, 'Map<dynamic, dynamic>' );
312+ var yfragment = yNode.declaredFragment ! ;
313+ assertType (yfragment.element .type, 'Map<dynamic, dynamic>' );
316314 }
317315
318316 test_listMap_null () async {
@@ -322,12 +320,12 @@ var y = {null: null};
322320''' ;
323321 await resolveTestCode (code);
324322 var xNode = findNode.variableDeclaration ('x = ' );
325- var xElement = xNode.declaredElement ! ;
326- assertType (xElement .type, 'List<Null>' );
323+ var xFragment = xNode.declaredFragment ! ;
324+ assertType (xFragment.element .type, 'List<Null>' );
327325
328326 var yNode = findNode.variableDeclaration ('y = ' );
329- var yElement = yNode.declaredElement ! ;
330- assertType (yElement .type, 'Map<Null, Null>' );
327+ var yFragment = yNode.declaredFragment ! ;
328+ assertType (yFragment.element .type, 'Map<Null, Null>' );
331329 }
332330
333331 test_logicalAnd () async {
@@ -475,12 +473,12 @@ main() {
475473''' ;
476474 await resolveTestCode (code);
477475 var xNode = findNode.variableDeclaration ('x = ' );
478- var xElement = xNode.declaredElement ! ;
479- expect (xElement .type, VoidTypeImpl .instance);
476+ var xFragment = xNode.declaredFragment ! ;
477+ expect (xFragment.element .type, VoidTypeImpl .instance);
480478
481479 var yNode = findNode.variableDeclaration ('y = ' );
482- var yElement = yNode.declaredElement ! ;
483- expect (yElement .type, VoidTypeImpl .instance);
480+ var yFragment = yNode.declaredFragment ! ;
481+ expect (yFragment.element .type, VoidTypeImpl .instance);
484482 }
485483
486484 test_voidType_topLevelFunction () async {
@@ -493,12 +491,12 @@ main() {
493491''' ;
494492 await resolveTestCode (code);
495493 var xNode = findNode.variableDeclaration ('x = ' );
496- var xElement = xNode.declaredElement ! ;
497- expect (xElement .type, VoidTypeImpl .instance);
494+ var xFragment = xNode.declaredFragment ! ;
495+ expect (xFragment.element .type, VoidTypeImpl .instance);
498496
499497 var yNode = findNode.variableDeclaration ('y = ' );
500- var yElement = yNode.declaredElement ! ;
501- expect (yElement .type, VoidTypeImpl .instance);
498+ var yFragment = yNode.declaredFragment ! ;
499+ expect (yFragment.element .type, VoidTypeImpl .instance);
502500 }
503501
504502 void _assertTypeAnnotations () {
@@ -528,7 +526,7 @@ main() {
528526 if (comment != null ) {
529527 var expectedType = types[comment.offset];
530528 if (expectedType != null ) {
531- var element = node.staticElement as VariableElement ;
529+ var element = node.element as VariableElement2 ;
532530 String actualType = typeString (element.type);
533531 expect (actualType, expectedType, reason: '@${comment .offset }' );
534532 }
0 commit comments