Elements. Migrate lib/src/services/search/hierarchy.dart

scheglov · Commit Queue · commit 139a560f80ae · 2024-12-06T23:02:00.000Z
Change-Id: I4917d439dd5db00799958109505a6f2d88df26d6 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/399203 Reviewed-by: Phil Quitslund <pquitslund@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/analyzer_use_new_elements.txt b/pkg/analysis_server/analyzer_use_new_elements.txt
@@ -45,7 +45,6 @@ lib/src/services/refactoring/legacy/rename_unit_member.dart
 lib/src/services/refactoring/legacy/visible_ranges_computer.dart
 lib/src/services/refactoring/move_top_level_to_file.dart
 lib/src/services/search/element_visitors.dart
-lib/src/services/search/hierarchy.dart
 lib/src/services/search/search_engine.dart
 lib/src/services/search/search_engine_internal.dart
 test/abstract_single_unit.dart
diff --git a/pkg/analysis_server/lib/src/cider/rename.dart b/pkg/analysis_server/lib/src/cider/rename.dart
@@ -83,14 +83,17 @@ class CanRenameResponse {
       );
     }
     // check if there are members with "newName" in the same ClassElement
-    for (var newNameMember in getChildren(parentClass, newName)) {
+    for (var newNameMember in getChildren(parentClass.asElement2, newName)) {
       var message = format(
         "Class '{0}' already declares {1} with name '{2}'.",
         parentClass.displayName,
-        getElementKindName(newNameMember.asElement2!),
+        getElementKindName(newNameMember),
         newName,
       );
-      result.addError(message, newLocation_fromElement(newNameMember));
+      result.addError(
+        message,
+        newLocation_fromElement(newNameMember.asElement),
+      );
     }
   }
 
diff --git a/pkg/analysis_server/lib/src/search/element_references.dart b/pkg/analysis_server/lib/src/search/element_references.dart
@@ -8,6 +8,7 @@ import 'package:analysis_server/src/services/search/hierarchy.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// A computer for `search.findElementReferences` request results.
 class ElementReferencesComputer {
@@ -85,23 +86,26 @@ class ElementReferencesComputer {
     OperationPerformanceImpl performance,
   ) async {
     if (element is ParameterElement && element.isNamed) {
-      return await performance.runAsync(
+      return (await performance.runAsync(
         'getHierarchyNamedParameters',
-        (_) => getHierarchyNamedParameters(searchEngine, element),
-      );
+        (_) => getHierarchyNamedParameters(searchEngine, element.asElement2),
+      )).map((e) => e.asElement);
     }
     if (element is ClassMemberElement) {
       var (members, parameters) = await performance.runAsync(
         'getHierarchyMembers',
         (performance) => getHierarchyMembersAndParameters(
           searchEngine,
-          element,
+          element.asElement2!,
           performance: performance,
           includeParametersForFields: true,
         ),
       );
 
-      return {...members, ...parameters};
+      return {
+        ...members.map((e) => e.asElement!),
+        ...parameters.map((e) => e.asElement),
+      };
     }
     return [element];
   }
diff --git a/pkg/analysis_server/lib/src/search/type_hierarchy.dart b/pkg/analysis_server/lib/src/search/type_hierarchy.dart
@@ -10,6 +10,7 @@ import 'package:analysis_server/src/services/search/hierarchy.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// A computer for a type hierarchy of an [Element].
 class TypeHierarchyComputer {
@@ -54,23 +55,23 @@ class TypeHierarchyComputer {
   ) async {
     var subElements = await getDirectSubClasses(
       _searchEngine,
-      classElement,
+      classElement.asElement2,
       searchEngineCache,
     );
     var subItemIds = <int>[];
     for (var subElement in subElements) {
       // check for recursion
-      var subItem = _elementItemMap[subElement];
+      var subItem = _elementItemMap[subElement.asElement];
       if (subItem != null) {
         var id = _items.indexOf(subItem);
         item.subclasses.add(id);
         continue;
       }
       // create a subclass item
-      var subMemberElement = helper.findMemberElement(subElement);
+      var subMemberElement = helper.findMemberElement(subElement.asElement);
       var subMemberElementDeclared = subMemberElement?.nonSynthetic;
       subItem = TypeHierarchyItem(
-        convertElement(subElement),
+        convertElement(subElement.asElement),
         memberElement:
             subMemberElementDeclared != null
                 ? convertElement(subMemberElementDeclared)
@@ -79,9 +80,9 @@ class TypeHierarchyComputer {
       );
       var subItemId = _items.length;
       // remember
-      _elementItemMap[subElement] = subItem;
+      _elementItemMap[subElement.asElement] = subItem;
       _items.add(subItem);
-      _itemClassElements.add(subElement);
+      _itemClassElements.add(subElement.asElement);
       // add to hierarchy
       item.subclasses.add(subItemId);
       subItemIds.add(subItemId);
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/change_to.dart b/pkg/analysis_server/lib/src/services/correction/dart/change_to.dart
@@ -357,7 +357,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
     _ClosestElementFinder finder,
     InterfaceElement2 clazz,
   ) {
-    var members = getMembers2(clazz);
+    var members = getMembers(clazz);
     finder._updateList(members);
   }
 
@@ -366,7 +366,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
     ExtensionElement2? element,
   ) {
     if (element != null) {
-      finder._updateList(getExtensionMembers2(element));
+      finder._updateList(getExtensionMembers(element));
     }
   }
 }
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_into_is_not_empty.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_into_is_not_empty.dart
@@ -53,7 +53,7 @@ class ConvertIntoIsNotEmpty extends ResolvedCorrectionProducer {
     // should have "isNotEmpty"
     var propertyTarget = propertyElement.enclosingElement2;
     if (propertyTarget == null ||
-        getChildren2(propertyTarget, 'isNotEmpty').isEmpty) {
+        getChildren(propertyTarget, 'isNotEmpty').isEmpty) {
       return;
     }
     // should be in PrefixExpression
diff --git a/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart b/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart
@@ -662,8 +662,11 @@ class _SignatureUpdater {
   Future<List<ExecutableElement>> computeElements() async {
     var element = selectionState.element;
     if (element case ClassMemberElement member) {
-      var set = await getHierarchyMembers(searchEngine, member);
-      return set.whereType<ExecutableElement>().toList();
+      var set = await getHierarchyMembers(searchEngine, member.asElement2!);
+      return set
+          .whereType<ExecutableElement2>()
+          .map((e) => e.asElement)
+          .toList();
     }
     return [element];
   }
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart
@@ -60,7 +60,7 @@ class ConvertGetterToMethodRefactoringImpl extends RefactoringImpl
     if (field is FieldElement2 &&
         (field.enclosingElement2 is InterfaceElement2 ||
             field.enclosingElement2 is ExtensionElement2)) {
-      var elements = await getHierarchyMembers2(searchEngine, field);
+      var elements = await getHierarchyMembers(searchEngine, field);
       await Future.forEach(elements, (Element2 member) async {
         if (member is FieldElement2) {
           var getter = member.getter2;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart
@@ -59,7 +59,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
     }
     // MethodElement
     if (element is MethodElement2) {
-      var elements = await getHierarchyMembers2(searchEngine, element);
+      var elements = await getHierarchyMembers(searchEngine, element);
       await Future.forEach(elements, (Element2 element) async {
         await _updateElementDeclaration(element as ExecutableElement2);
         return _updateElementReferences(element);
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart
@@ -182,7 +182,7 @@ Set<String> _getNamesConflictingAt(AstNode node) {
         enclosingInterfaceElement,
       ];
       for (var interfaceElement in elements) {
-        var classMembers = getChildren2(interfaceElement);
+        var classMembers = getChildren(interfaceElement);
         for (var classMemberElement in classMembers) {
           result.add(classMemberElement.displayName);
         }
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart
@@ -221,7 +221,7 @@ class _BaseClassMemberValidator {
 
   void _checkClassAlreadyDeclares() {
     // check if there is a member with "newName" in the same ClassElement
-    for (var newNameMember in getChildren2(interfaceElement, name)) {
+    for (var newNameMember in getChildren(interfaceElement, name)) {
       result.addError(
         format(
           "{0} '{1}' already declares {2} with name '{3}'.",
@@ -244,7 +244,7 @@ class _BaseClassMemberValidator {
     // check shadowing in the hierarchy
     var declarations = await searchEngine.searchMemberDeclarations(name);
     for (var declaration in declarations) {
-      var nameElement = getSyntheticAccessorVariable2(declaration.element2);
+      var nameElement = getSyntheticAccessorVariable(declaration.element2);
       var nameClass = nameElement.enclosingElement2;
       // the renamed Element shadows a member of a superclass
       if (superClasses.contains(nameClass)) {
@@ -479,7 +479,7 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
   Future<void> _prepareElements() async {
     var element = this.element;
     if (element is FieldElement2 || element is MethodElement2) {
-      elements = await getHierarchyMembers2(searchEngine, element);
+      elements = await getHierarchyMembers(searchEngine, element);
     } else {
       elements = {element};
     }
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart
@@ -142,7 +142,7 @@ class RenameConstructorRefactoringImpl extends RenameRefactoringImpl {
       );
     }
     // check if there are members with "newName" in the same ClassElement
-    for (var newNameMember in getChildren2(parentClass, newName)) {
+    for (var newNameMember in getChildren(parentClass, newName)) {
       var message = format(
         "{0} '{1}' already declares {2} with name '{3}'.",
         capitalize(parentClass.kind.displayName),
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart
@@ -119,7 +119,7 @@ class _ExtensionMemberValidator {
 
   Future<RefactoringStatus> validate() async {
     // Check if there is a member with "newName" in the extension.
-    for (var newNameMember in getChildren2(elementExtension, name)) {
+    for (var newNameMember in getChildren(elementExtension, name)) {
       result.addError(
         format(
           "Extension '{0}' already declares {1} with name '{2}'.",
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_local.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_local.dart
@@ -56,7 +56,8 @@ class ConflictValidatorVisitor extends RecursiveAstVisitor<void> {
           targetRange.contains(node.offset) &&
           !node.isQualified &&
           !_isNamedExpressionName(node)) {
-        nodeElement = getSyntheticAccessorVariable(nodeElement);
+        nodeElement =
+            getSyntheticAccessorVariable(nodeElement.asElement2!).asElement!;
         var nodeKind = nodeElement.kind.displayName;
         var nodeName = getElementQualifiedName(nodeElement.asElement2!);
         var nameElementSourceName = nodeElement.source!.shortName;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_parameter.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_parameter.dart
@@ -11,6 +11,7 @@ import 'package:analysis_server/src/services/refactoring/legacy/visible_ranges_c
 import 'package:analysis_server/src/services/search/hierarchy.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/generated/java_core.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// A [Refactoring] for renaming [ParameterElement]s.
 class RenameParameterRefactoringImpl extends RenameRefactoringImpl {
@@ -104,7 +105,11 @@ class RenameParameterRefactoringImpl extends RenameRefactoringImpl {
   Future<void> _prepareElements() async {
     var element = this.element;
     if (element.isNamed) {
-      elements = await getHierarchyNamedParameters(searchEngine, element);
+      elements =
+          (await getHierarchyNamedParameters(
+            searchEngine,
+            element.asElement2,
+          )).map((e) => e.asElement).toList();
     } else {
       elements = [element];
     }
diff --git a/pkg/analysis_server/lib/src/services/search/hierarchy.dart b/pkg/analysis_server/lib/src/services/search/hierarchy.dart
diff --git a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
diff --git a/pkg/analysis_server/test/search/type_hierarchy_test.dart b/pkg/analysis_server/test/search/type_hierarchy_test.dart
diff --git a/pkg/analysis_server/test/services/search/hierarchy_test.dart b/pkg/analysis_server/test/services/search/hierarchy_test.dart

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ class ChangeTo extends ResolvedCorrectionProducer {`
`357`	`357`	`_ClosestElementFinder finder,`
`358`	`358`	`InterfaceElement2 clazz,`
`359`	`359`	`) {`
`360`		`- var members = getMembers2(clazz);`
	`360`	`+ var members = getMembers(clazz);`
`361`	`361`	`finder._updateList(members);`
`362`	`362`	`}`
`363`	`363`
`@@ -366,7 +366,7 @@ class ChangeTo extends ResolvedCorrectionProducer {`
`366`	`366`	`ExtensionElement2? element,`
`367`	`367`	`) {`
`368`	`368`	`if (element != null) {`
`369`		`- finder._updateList(getExtensionMembers2(element));`
	`369`	`+ finder._updateList(getExtensionMembers(element));`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class ConvertIntoIsNotEmpty extends ResolvedCorrectionProducer {`
`53`	`53`	`// should have "isNotEmpty"`
`54`	`54`	`var propertyTarget = propertyElement.enclosingElement2;`
`55`	`55`	`if (propertyTarget == null \|\|`
`56`		`- getChildren2(propertyTarget, 'isNotEmpty').isEmpty) {`
	`56`	`+ getChildren(propertyTarget, 'isNotEmpty').isEmpty) {`
`57`	`57`	`return;`
`58`	`58`	`}`
`59`	`59`	`// should be in PrefixExpression`
Original file line number	Diff line number	Diff line change
`@@ -662,8 +662,11 @@ class _SignatureUpdater {`
`662`	`662`	`Future<List<ExecutableElement>> computeElements() async {`
`663`	`663`	`var element = selectionState.element;`
`664`	`664`	`if (element case ClassMemberElement member) {`
`665`		`- var set = await getHierarchyMembers(searchEngine, member);`
`666`		`- return set.whereType<ExecutableElement>().toList();`
	`665`	`+ var set = await getHierarchyMembers(searchEngine, member.asElement2!);`
	`666`	`+ return set`
	`667`	`+ .whereType<ExecutableElement2>()`
	`668`	`+ .map((e) => e.asElement)`
	`669`	`+ .toList();`
`667`	`670`	`}`
`668`	`671`	`return [element];`
`669`	`672`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl`
`59`	`59`	`}`
`60`	`60`	`// MethodElement`
`61`	`61`	`if (element is MethodElement2) {`
`62`		`- var elements = await getHierarchyMembers2(searchEngine, element);`
	`62`	`+ var elements = await getHierarchyMembers(searchEngine, element);`
`63`	`63`	`await Future.forEach(elements, (Element2 element) async {`
`64`	`64`	`await _updateElementDeclaration(element as ExecutableElement2);`
`65`	`65`	`return _updateElementReferences(element);`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ Set<String> _getNamesConflictingAt(AstNode node) {`
`182`	`182`	`enclosingInterfaceElement,`
`183`	`183`	`];`
`184`	`184`	`for (var interfaceElement in elements) {`
`185`		`- var classMembers = getChildren2(interfaceElement);`
	`185`	`+ var classMembers = getChildren(interfaceElement);`
`186`	`186`	`for (var classMemberElement in classMembers) {`
`187`	`187`	`result.add(classMemberElement.displayName);`
`188`	`188`	`}`