@@ -34,7 +34,7 @@ int v = 0;
3434''' );
3535 String uri = file.toUri ().toString ();
3636
37- var element = (await helper.getClass (uri, 'C' ))! ;
37+ var element = (await helper.getClass2 (uri, 'C' ))! ;
3838 expect (element.displayName, 'C' );
3939 }
4040
@@ -44,7 +44,7 @@ int v = 0;
4444''' );
4545 String uri = file.toUri ().toString ();
4646
47- var element = await helper.getClass (uri, 'v' );
47+ var element = await helper.getClass2 (uri, 'v' );
4848 expect (element, isNull);
4949 }
5050
@@ -57,7 +57,7 @@ export 'a.dart';
5757''' );
5858 String bUri = bFile.toUri ().toString ();
5959
60- var element = (await helper.getClass (bUri, 'A' ))! ;
60+ var element = (await helper.getClass2 (bUri, 'A' ))! ;
6161 expect (element.displayName, 'A' );
6262 }
6363
@@ -70,16 +70,16 @@ import 'a.dart';
7070''' );
7171 String bUri = bFile.toUri ().toString ();
7272
73- var element = await helper.getClass (bUri, 'A' );
73+ var element = await helper.getClass2 (bUri, 'A' );
7474 expect (element, isNull);
7575 }
7676
7777 test_getElementDeclaration_class () async {
7878 await resolveTestCode (r'''
7979class A {}
8080''' );
81- var element = findElement .class_ ('A' );
82- var result = (await helper.getElementDeclaration (element))! ;
81+ var element = findElement2 .class_ ('A' );
82+ var result = (await helper.getElementDeclaration2 (element.firstFragment ))! ;
8383 var node = result.node as ClassDeclaration ;
8484 expect (node.name.lexeme, 'A' );
8585 }
@@ -89,8 +89,8 @@ class A {}
8989class A {}
9090class B {}
9191''' );
92- var element = findNode.classDeclaration ('A' ).declaredElement ! ;
93- var resolvedUnit = (await helper.getResolvedUnitByElement (element))! ;
92+ var element = findNode.classDeclaration ('A' ).declaredFragment ! .element ;
93+ var resolvedUnit = (await helper.getResolvedUnitByElement2 (element))! ;
9494 expect (resolvedUnit.unit.declarations, hasLength (2 ));
9595 }
9696
@@ -100,7 +100,7 @@ int get a => 0;
100100''' );
101101 String uri = file.toUri ().toString ();
102102
103- var element = (await helper.getTopLevelPropertyAccessor (uri, 'a' ))! ;
103+ var element = (await helper.getTopLevelPropertyAccessor2 (uri, 'a' ))! ;
104104 expect (element.kind, ElementKind .GETTER );
105105 expect (element.displayName, 'a' );
106106 }
@@ -111,7 +111,7 @@ set a(_) {}
111111''' );
112112 String uri = file.toUri ().toString ();
113113
114- var element = (await helper.getTopLevelPropertyAccessor (uri, 'a=' ))! ;
114+ var element = (await helper.getTopLevelPropertyAccessor2 (uri, 'a=' ))! ;
115115 expect (element.kind, ElementKind .SETTER );
116116 expect (element.displayName, 'a' );
117117 }
@@ -122,7 +122,7 @@ int a;
122122''' );
123123 String uri = file.toUri ().toString ();
124124
125- var element = (await helper.getTopLevelPropertyAccessor (uri, 'a' ))! ;
125+ var element = (await helper.getTopLevelPropertyAccessor2 (uri, 'a' ))! ;
126126 expect (element.kind, ElementKind .GETTER );
127127 expect (element.displayName, 'a' );
128128 }
@@ -136,7 +136,7 @@ export 'a.dart';
136136''' );
137137 String bUri = bFile.toUri ().toString ();
138138
139- var element = (await helper.getTopLevelPropertyAccessor (bUri, 'a' ))! ;
139+ var element = (await helper.getTopLevelPropertyAccessor2 (bUri, 'a' ))! ;
140140 expect (element.kind, ElementKind .GETTER );
141141 expect (element.displayName, 'a' );
142142 }
@@ -150,7 +150,7 @@ import 'a.dart';
150150''' );
151151 String bUri = bFile.toUri ().toString ();
152152
153- var element = await helper.getTopLevelPropertyAccessor (bUri, 'a' );
153+ var element = await helper.getTopLevelPropertyAccessor2 (bUri, 'a' );
154154 expect (element, isNull);
155155 }
156156
@@ -160,7 +160,7 @@ int a;
160160''' );
161161 String uri = file.toUri ().toString ();
162162
163- var element = await helper.getTopLevelPropertyAccessor (uri, 'b' );
163+ var element = await helper.getTopLevelPropertyAccessor2 (uri, 'b' );
164164 expect (element, isNull);
165165 }
166166
@@ -170,7 +170,7 @@ int a() {}
170170''' );
171171 String uri = file.toUri ().toString ();
172172
173- var element = await helper.getTopLevelPropertyAccessor (uri, 'a' );
173+ var element = await helper.getTopLevelPropertyAccessor2 (uri, 'a' );
174174 expect (element, isNull);
175175 }
176176}
0 commit comments