Migrate more tests in analysis_server

Change-Id: I14885a2b5ea4fd89b14ae52124d800a2b24ccad0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395401
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: bwilkerson

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -95,7 +95,6 @@ test/abstract_single_unit.dart
 test/plugin/protocol_dart_test.dart
 test/services/correction/name_suggestion_test.dart
 test/services/correction/status_test.dart
-test/services/refactoring/agnostic/change_method_signature_test.dart
 test/services/refactoring/legacy/abstract_rename.dart
 test/services/refactoring/legacy/convert_getter_to_method_test.dart
 test/services/refactoring/legacy/convert_method_to_getter_test.dart
@@ -105,5 +104,3 @@ test/services/refactoring/legacy/rename_constructor_test.dart
 test/services/refactoring/legacy/rename_import_test.dart
 test/services/refactoring/legacy/rename_library_test.dart
 test/services/search/element_visitors_test.dart
-test/services/search/hierarchy_test.dart
-test/services/search/search_engine_test.dart

pkg/analysis_server/lib/src/services/correction/namespace.dart

@@ -37,6 +37,17 @@ LibraryImportElement? getImportElement(SimpleIdentifier prefixNode) {
   return _getImportElementInfo(prefixNode);
 }
 
+/// Return the [LibraryImport] that is referenced by [prefixNode], or
+/// `null` if the node does not reference a prefix or if we cannot determine
+/// which import is being referenced.
+LibraryImport? getImportElement2(SimpleIdentifier prefixNode) {
+  var parent = prefixNode.parent;
+  if (parent is ImportDirective) {
+    return parent.libraryImport;
+  }
+  return _getImportElementInfo2(prefixNode);
+}
+
 /// Returns the export namespace of the given [LibraryElement].
 Map<String, Element> _getExportNamespaceForLibrary(LibraryElement library) {
   var namespace = NamespaceBuilder().createExportNamespaceForLibrary(library);
@@ -112,6 +123,74 @@ LibraryImportElement? _getImportElement(
   return null;
 }
 
+/// Return the [LibraryImportElement] that declared [prefix] and imports [element].
+///
+/// [libraryElement] - the [LibraryElement] where reference is.
+/// [prefix] - the import prefix, maybe `null`.
+/// [element] - the referenced element.
+LibraryImport? _getImportElement2(
+  LibraryElement2 libraryElement,
+  String prefix,
+  Element2 element,
+) {
+  if (element.enclosingElement2 is! LibraryElement2) {
+    return null;
+  }
+  var usedLibrary = element.library2;
+  // find ImportElement that imports used library with used prefix
+  List<LibraryImport>? candidates;
+  for (var libraryImport in libraryElement.firstFragment.libraryImports2) {
+    // required library
+    if (libraryImport.importedLibrary2 != usedLibrary) {
+      continue;
+    }
+    // required prefix
+    var prefixElement = libraryImport.prefix2?.element;
+    if (prefixElement == null) {
+      continue;
+    }
+    if (prefix != prefixElement.name3) {
+      continue;
+    }
+    // no combinators => only possible candidate
+    if (libraryImport.combinators.isEmpty) {
+      return libraryImport;
+    }
+    // OK, we have candidate
+    candidates ??= [];
+    candidates.add(libraryImport);
+  }
+  // no candidates, probably element is defined in this library
+  if (candidates == null) {
+    return null;
+  }
+  // one candidate
+  if (candidates.length == 1) {
+    return candidates[0];
+  }
+
+  var importElementsMap = <LibraryImport, Set<Element2>>{};
+  // ensure that each ImportElement has set of elements
+  for (var importElement in candidates) {
+    if (importElementsMap.containsKey(importElement)) {
+      continue;
+    }
+    var namespace = importElement.namespace;
+    var elements = namespace.definedNames2.values.toSet();
+    importElementsMap[importElement] = elements;
+  }
+  // use import namespace to choose correct one
+  for (var entry in importElementsMap.entries) {
+    var importElement = entry.key;
+    var elements = entry.value;
+    if (elements.contains(element)) {
+      return importElement;
+    }
+  }
+  // not found
+  return null;
+}
+
 /// Returns the [LibraryImportElement] that is referenced by [prefixNode] with a
 /// [PrefixElement], maybe `null`.
 LibraryImportElement? _getImportElementInfo(SimpleIdentifier prefixNode) {
@@ -143,3 +222,35 @@ LibraryImportElement? _getImportElementInfo(SimpleIdentifier prefixNode) {
   var prefix = prefixNode.name;
   return _getImportElement(libraryElement, prefix, usedElement);
 }
+
+/// Returns the [LibraryImport2] that is referenced by [prefixNode] with a
+/// [PrefixElement], maybe `null`.
+LibraryImport? _getImportElementInfo2(SimpleIdentifier prefixNode) {
+  // prepare environment
+  var parent = prefixNode.parent;
+  var unit = prefixNode.thisOrAncestorOfType<CompilationUnit>();
+  var libraryElement = unit?.declaredFragment?.element;
+  if (libraryElement == null) {
+    return null;
+  }
+  // prepare used element
+  Element2? usedElement;
+  if (parent is PrefixedIdentifier) {
+    var prefixed = parent;
+    if (prefixed.prefix == prefixNode) {
+      usedElement = prefixed.element;
+    }
+  } else if (parent is MethodInvocation) {
+    var invocation = parent;
+    if (invocation.target == prefixNode) {
+      usedElement = invocation.methodName.element;
+    }
+  }
+  // we need used Element
+  if (usedElement == null) {
+    return null;
+  }
+  // find ImportElement
+  var prefix = prefixNode.name;
+  return _getImportElement2(libraryElement, prefix, usedElement);
+}

pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart

@@ -16,9 +16,11 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/analysis/session_helper.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/utilities/extensions/collection.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -252,6 +254,10 @@ final class ValidSelectionState extends SelectionState {
     required this.element,
     required this.formalParameters,
   });
+
+  /// The element of the target method, used to find corresponding methods
+  /// in the class hierarchy.
+  ExecutableElement2 get element2 => element.asElement2;
 }
 
 class _AvailabilityAnalyzer {

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

@@ -9,6 +9,7 @@ import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// Returns direct children of [parent].
 List<Element> getChildren(Element parent, [String? name]) {
@@ -167,6 +168,25 @@ Future<Set<ClassMemberElement>> getHierarchyMembers(
   return members;
 }
 
+/// Return all implementations of the given [member], including in its
+/// superclasses and their subclasses.
+///
+/// If [includeParametersForFields] is true and [member] is a [FieldElement],
+/// any [FieldFormalParameterElement]s for the member will also be provided
+/// (otherwise, the parameter set will be empty in the result).
+Future<Set<Element2>> getHierarchyMembers2(
+  SearchEngine searchEngine,
+  Element2 member, {
+  OperationPerformanceImpl? performance,
+}) async {
+  var result = await getHierarchyMembers(
+    searchEngine,
+    member.asElement as ClassMemberElement,
+    performance: performance,
+  );
+  return result.map((e) => e.asElement2!).toSet();
+}
+
 /// Return all implementations of the given [member], including in its
 /// superclasses and their subclasses.
 ///
@@ -276,6 +296,19 @@ Future<List<ParameterElement>> getHierarchyNamedParameters(
   return [element];
 }
 
+/// If the [element] is a named parameter in a [MethodElement], return all
+/// corresponding named parameters in the method hierarchy.
+Future<List<FormalParameterElement>> getHierarchyNamedParameters2(
+  SearchEngine searchEngine,
+  FormalParameterElement element,
+) async {
+  var result = await getHierarchyNamedParameters(
+    searchEngine,
+    element.asElement as ParameterElement,
+  );
+  return result.map((e) => e.asElement2 as FormalParameterElement).toList();
+}
+
 /// Returns non-synthetic members of the given [InterfaceElement] and its super
 /// classes.
 ///

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

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/source/source.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
@@ -147,6 +148,9 @@ abstract class SearchMatch {
   /// Return the [Element] containing the match.
   Element get element;
 
+  /// Return the element containing the match.
+  Element2 get element2;
+
   /// The absolute path of the file containing the match.
   String get file;
 
@@ -162,6 +166,9 @@ abstract class SearchMatch {
   /// Return the [LibraryElement] for the [file].
   LibraryElement get libraryElement;
 
+  /// Return the library element for the [file].
+  LibraryElement2 get libraryElement2;
+
   /// The library [Source] of the reference.
   Source get librarySource;
 

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

@@ -4,13 +4,15 @@
 
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/source/source.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart';
 import 'package:analyzer/src/dart/analysis/search.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// A [SearchEngine] implementation.
 class SearchEngineImpl implements SearchEngine {
@@ -43,6 +45,16 @@ class SearchEngineImpl implements SearchEngine {
     await addSubtypes(type);
   }
 
+  Future<void> appendAllSubtypes2(
+    InterfaceElement2 type,
+    Set<InterfaceElement2> allSubtypes,
+    OperationPerformanceImpl performance,
+  ) async {
+    var subtypes = <InterfaceElement>{};
+    await appendAllSubtypes(type.asElement, subtypes, performance);
+    allSubtypes.addAll(subtypes.map((e) => e.asElement2));
+  }
+
   @override
   Future<Set<String>?> membersOfSubtypes(InterfaceElement type) async {
     var drivers = _drivers.toList();
@@ -86,6 +98,10 @@ class SearchEngineImpl implements SearchEngine {
     return members;
   }
 
+  Future<Set<String>?> membersOfSubtypes2(InterfaceElement2 type) async {
+    return await membersOfSubtypes(type.asElement);
+  }
+
   @override
   Future<List<SearchMatch>> searchMemberDeclarations(String name) async {
     var allDeclarations = <SearchMatch>[];
@@ -135,6 +151,10 @@ class SearchEngineImpl implements SearchEngine {
     return allResults.map(SearchMatchImpl.forSearchResult).toList();
   }
 
+  Future<List<SearchMatch>> searchReferences2(Element2 element) async {
+    return await searchReferences(element.asElement!);
+  }
+
   @override
   Future<List<SearchMatch>> searchSubtypes(
     InterfaceElement type,
@@ -255,6 +275,13 @@ class SearchMatchImpl implements SearchMatch {
     this.sourceRange,
   );
 
+  @override
+  Element2 get element2 => element.asElement2!;
+
+  @override
+  LibraryElement2 get libraryElement2 =>
+      libraryElement.asElement2 as LibraryElement2;
+
   @override
   String toString() {
     var buffer = StringBuffer();