Elements. Migrate test/services/correction/status_test.dart

Change-Id: Ie0afd64be7b90d68c81b05f2973557a5c562a431
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/400165
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -26,7 +26,6 @@ lib/src/services/search/element_visitors.dart
 lib/src/services/search/search_engine.dart
 lib/src/services/search/search_engine_internal.dart
 test/abstract_single_unit.dart
-test/services/correction/status_test.dart
 test/services/refactoring/legacy/abstract_rename.dart
 test/services/refactoring/legacy/rename_import_test.dart
 test/services/search/element_visitors_test.dart

pkg/analysis_server/lib/src/services/search/search_engine_internal.dart

@@ -293,10 +293,10 @@ class SearchMatchImpl implements SearchMatch {
   final Source unitSource;
 
   @override
-  final LibraryElement libraryElement;
+  final LibraryElement2 libraryElement2;
 
   @override
-  final Element element;
+  final Element2 element2;
 
   @override
   final bool isResolved;
@@ -314,19 +314,19 @@ class SearchMatchImpl implements SearchMatch {
     this.file,
     this.librarySource,
     this.unitSource,
-    this.libraryElement,
-    this.element,
+    this.libraryElement2,
+    this.element2,
     this.isResolved,
     this.isQualified,
     this.kind,
     this.sourceRange,
   );
 
   @override
-  Element2 get element2 => element.asElement2!;
+  Element get element => element2.asElement!;
 
   @override
-  LibraryElement2 get libraryElement2 => libraryElement.asElement2;
+  LibraryElement get libraryElement => libraryElement2.asElement;
 
   @override
   String toString() {
@@ -352,8 +352,8 @@ class SearchMatchImpl implements SearchMatch {
       element.source!.fullName,
       element.librarySource!,
       element.source!,
-      element.library!,
-      element,
+      element.library!.asElement2,
+      element.asElement2!,
       true,
       true,
       MatchKind.DECLARATION,
@@ -367,8 +367,8 @@ class SearchMatchImpl implements SearchMatch {
       enclosingElement.source!.fullName,
       enclosingElement.librarySource!,
       enclosingElement.source!,
-      enclosingElement.library!,
-      enclosingElement,
+      enclosingElement.library!.asElement2,
+      enclosingElement.asElement2!,
       result.isResolved,
       result.isQualified,
       toMatchKind(result.kind),

pkg/analysis_server/test/services/correction/status_test.dart

@@ -24,9 +24,9 @@ void main() {
 class RefactoringLocationTest extends AbstractSingleUnitTest {
   Future<void> test_createLocation_forElement() async {
     await resolveTestCode('class MyClass {}');
-    var element = findElement.class_('MyClass');
+    var element = findElement2.class_('MyClass');
     // check
-    var location = newLocation_fromElement(element)!;
+    var location = newLocation_fromElement2(element)!;
     expect(location.file, testFile.path);
     expect(location.offset, 6);
     expect(location.length, 7);
@@ -36,13 +36,15 @@ class RefactoringLocationTest extends AbstractSingleUnitTest {
 
   Future<void> test_createLocation_forMatch() async {
     await resolveTestCode('class MyClass {}');
-    var element = findElement.class_('MyClass');
-    var sourceRange = range.elementName(element);
+    var element = findElement2.class_('MyClass');
+    var firstFragment = element.firstFragment;
+    var libraryFragment = firstFragment.libraryFragment;
+    var sourceRange = range.fragmentName(firstFragment)!;
     SearchMatch match = SearchMatchImpl(
-      element.source.fullName,
-      element.library.source,
-      element.source,
-      element.library,
+      libraryFragment.source.fullName,
+      element.library2.firstFragment.source,
+      libraryFragment.source,
+      element.library2,
       element,
       true,
       false,