Migrate four computer classes

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

Author: bwilkerson

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -6,11 +6,7 @@ lib/src/cider/local_library_contributor.dart
 lib/src/cider/rename.dart
 lib/src/computer/computer_call_hierarchy.dart
 lib/src/computer/computer_documentation.dart
-lib/src/computer/computer_hover.dart
-lib/src/computer/computer_inlay_hint.dart
-lib/src/computer/computer_lazy_type_hierarchy.dart
 lib/src/computer/import_elements_computer.dart
-lib/src/computer/imported_elements_computer.dart
 lib/src/domains/analysis/implemented_dart.dart
 lib/src/domains/analysis/occurrences_dart.dart
 lib/src/handler/legacy/completion_get_suggestions2.dart

pkg/analysis_server/lib/src/computer/computer_hover.dart

@@ -154,7 +154,7 @@ class DartUnitHoverComputer {
 
     var definingSource = library.firstFragment.source;
     var uri = definingSource.uri;
-    var analysisSession = _unit.declaredElement?.session;
+    var analysisSession = _unit.declaredFragment?.element.session;
 
     String? libraryName, libraryPath;
     if (uri.isScheme('file') && analysisSession != null) {

pkg/analysis_server/lib/src/computer/computer_inlay_hint.dart

@@ -9,7 +9,7 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/line_info.dart';
@@ -44,10 +44,10 @@ class DartInlayHintComputer {
   /// automatically.
   void _addParameterNamePrefix(
     SyntacticEntity nodeOrToken,
-    ParameterElement parameter,
+    FormalParameterElement parameter,
   ) {
-    var name = parameter.name;
-    if (name.isEmpty) {
+    var name = parameter.name3;
+    if (name == null || name.isEmpty) {
       return;
     }
     var offset = nodeOrToken.offset;
@@ -185,8 +185,8 @@ class DartInlayHintComputer {
         InlayHintLabelPart(
           // Write type without type args or nullability suffix. Type args need
           // adding as their own parts, and the nullability suffix does after them.
-          value: type.element?.name ?? type.getDisplayString(),
-          location: _locationForElement(type.element),
+          value: type.element3?.name3 ?? type.getDisplayString(),
+          location: _locationForElement(type.element3),
         ),
       );
       // Call recursively for any nested type arguments.
@@ -202,20 +202,21 @@ class DartInlayHintComputer {
     }
   }
 
-  Location? _locationForElement(Element? element) {
+  Location? _locationForElement(Element2? element) {
     if (element == null) {
       return null;
     }
-    var compilationUnit =
-        element.thisOrAncestorOfType<CompilationUnitElement>();
-    var path = compilationUnit?.source.fullName;
-    var lineInfo = compilationUnit?.lineInfo;
-    if (path == null || lineInfo == null || element.nameOffset == -1) {
+    var firstFragment = element.firstFragment;
+    var nameOffset = firstFragment.nameOffset2;
+    var libraryFragment = firstFragment.libraryFragment;
+    var path = libraryFragment?.source.fullName;
+    var lineInfo = libraryFragment?.lineInfo;
+    if (path == null || lineInfo == null || nameOffset == null) {
       return null;
     }
     return Location(
       uri: pathContext.toUri(path),
-      range: toRange(lineInfo, element.nameOffset, element.nameLength),
+      range: toRange(lineInfo, nameOffset, firstFragment.name2?.length ?? 0),
     );
   }
 
@@ -248,7 +249,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
   void visitArgumentList(ArgumentList node) {
     for (var argument in node.arguments) {
       if (argument is! NamedExpression) {
-        var parameter = argument.staticParameterElement;
+        var parameter = argument.correspondingParameter;
         if (parameter != null) {
           _computer._addParameterNamePrefix(argument, parameter);
         }
@@ -269,8 +270,8 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
       return;
     }
 
-    var declaration = node.declaredElement;
-    if (declaration != null) {
+    var declaration = node.declaredElement2;
+    if (declaration is LocalVariableElement2) {
       _computer._addTypePrefix(node.name, declaration.type);
     }
   }
@@ -284,7 +285,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
       return;
     }
 
-    var declaration = node.declaredElement;
+    var declaration = node.declaredElement2;
     if (declaration != null) {
       _computer._addTypePrefix(node.name, declaration.type);
     }
@@ -304,7 +305,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
       return;
     }
 
-    var declaration = node.declaredElement;
+    var declaration = node.declaredFragment?.element;
     if (declaration != null) {
       // For getters/setters, the type must come before the property keyword,
       // not the name.
@@ -351,7 +352,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
       return;
     }
 
-    var declaration = node.declaredElement;
+    var declaration = node.declaredFragment?.element;
     if (declaration != null) {
       _computer._addTypePrefix(node.name, declaration.returnType);
     }
@@ -394,7 +395,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
       return;
     }
 
-    var declaration = node.declaredElement;
+    var declaration = node.declaredFragment?.element;
     if (declaration != null) {
       // Prefer to insert before `name` to avoid going before keywords like
       // `required`.
@@ -412,7 +413,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
       return;
     }
 
-    var declaration = node.declaredElement;
+    var declaration = node.declaredFragment?.element;
     if (declaration != null) {
       _computer._addTypePrefix(node, declaration.type);
     }

pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart

@@ -5,7 +5,7 @@
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -38,7 +38,7 @@ class DartLazyTypeHierarchyComputer {
     SearchEngine searchEngine,
   ) async {
     var targetElement = await _findTargetElement(location);
-    if (targetElement is! InterfaceElement) {
+    if (targetElement is! InterfaceElement2) {
       return null;
     }
 
@@ -92,8 +92,8 @@ class DartLazyTypeHierarchyComputer {
       Declaration? declaration = node?.thisOrAncestorMatching(
         (node) => _isValidTargetDeclaration(node),
       );
-      var element = declaration?.declaredElement;
-      if (element is InterfaceElement) {
+      var element = declaration?.declaredFragment?.element;
+      if (element is InterfaceElement2) {
         type = element.thisType;
       }
     }
@@ -102,19 +102,21 @@ class DartLazyTypeHierarchyComputer {
   }
 
   /// Locate the [Element] referenced by [location].
-  Future<InterfaceElement?> _findTargetElement(ElementLocation location) async {
-    var element = await _result.session.locateElement(location);
-    return element is InterfaceElement ? element : null;
+  Future<InterfaceElement2?> _findTargetElement(
+    ElementLocation location,
+  ) async {
+    var element = await _result.session.locateElement2(location);
+    return element is InterfaceElement2 ? element : null;
   }
 
   /// Gets immediate sub types for the class/mixin [element].
   Future<List<TypeHierarchyRelatedItem>> _getSubtypes(
-    InterfaceElement target,
+    InterfaceElement2 target,
     SearchEngine searchEngine,
   ) async {
     /// Helper to convert a [SearchMatch] to a [TypeHierarchyRelatedItem].
     TypeHierarchyRelatedItem toHierarchyItem(SearchMatch match) {
-      var element = match.element as InterfaceElement;
+      var element = match.element2 as InterfaceElement2;
       var type = element.thisType;
       switch (match.kind) {
         case MatchKind.REFERENCE_IN_EXTENDS_CLAUSE:
@@ -131,12 +133,13 @@ class DartLazyTypeHierarchyComputer {
       }
     }
 
-    var matches = await searchEngine.searchSubtypes(
+    var matches = await searchEngine.searchSubtypes2(
       target,
       SearchEngineCache(),
     );
+    var seenElements = <Element2>{};
     return matches
-        .where((match) => !(match.element as InterfaceElement).isAugmentation)
+        .where((match) => seenElements.add(match.element2))
         .map(toHierarchyItem)
         .toList();
   }
@@ -206,7 +209,7 @@ class DartLazyTypeHierarchyComputer {
 
     // Verify the element we arrived at matches the targetElement to guard
     // against code changes that made the path from the anchor invalid.
-    return type != null && type.element == target.element ? type : null;
+    return type != null && type.element3 == target.element3 ? type : null;
   }
 }
 
@@ -258,17 +261,17 @@ class TypeHierarchyItem {
     : this(
         type: type,
         displayName: _displayNameForType(type),
-        location: type.element.location!,
-        nameRange: _nameRangeForElement(type.element),
-        codeRange: _codeRangeForElement(type.element),
-        file: type.element.source.fullName,
+        location: type.element3.location!,
+        nameRange: _nameRangeForElement(type.element3),
+        codeRange: _codeRangeForElement(type.element3),
+        file: type.element3.firstFragment.libraryFragment.source.fullName,
       );
 
   /// Returns the [SourceRange] of the code for [element].
-  static SourceRange _codeRangeForElement(Element element) {
+  static SourceRange _codeRangeForElement(Element2 element) {
     // Non-synthetic elements should always have code locations.
-    var elementImpl = element.nonSynthetic as ElementImpl;
-    return SourceRange(elementImpl.codeOffset!, elementImpl.codeLength!);
+    var firstFragment = element.nonSynthetic2.firstFragment as ElementImpl;
+    return SourceRange(firstFragment.codeOffset!, firstFragment.codeLength!);
   }
 
   /// Returns a name to display in the hierarchy for [type].
@@ -277,15 +280,15 @@ class TypeHierarchyItem {
   }
 
   /// Returns the [SourceRange] of the name for [element].
-  static SourceRange _nameRangeForElement(Element element) {
-    element = element.nonSynthetic;
+  static SourceRange _nameRangeForElement(Element2 element) {
+    var fragment = element.nonSynthetic2.firstFragment;
 
     // Some non-synthetic items can still have invalid nameOffsets (for example
     // a compilation unit). This should never happen here, but guard against it.
-    assert(element.nameOffset != -1);
-    return element.nameOffset == -1
+    assert(fragment.nameOffset2 != -1);
+    return fragment.nameOffset2 == -1
         ? SourceRange(0, 0)
-        : SourceRange(element.nameOffset, element.nameLength);
+        : SourceRange(fragment.nameOffset2 ?? 0, fragment.name2?.length ?? 0);
   }
 }
 

pkg/analysis_server/lib/src/computer/imported_elements_computer.dart

@@ -5,7 +5,7 @@
 import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 
 /// An object used to compute the list of elements referenced within a given
@@ -71,8 +71,8 @@ class _Visitor extends UnifyingAstVisitor<void> {
   void visitNamedType(NamedType node) {
     if (node.offset <= endOffset && node.end >= startOffset) {
       var importPrefix = node.importPrefix;
-      var prefix = importPrefix?.element?.name ?? '';
-      _addElement(prefix, node.element);
+      var prefix = importPrefix?.element2?.name3 ?? '';
+      _addElement(prefix, node.element2);
     }
 
     super.visitNamedType(node);
@@ -91,7 +91,7 @@ class _Visitor extends UnifyingAstVisitor<void> {
         node.offset <= endOffset &&
         node.end >= startOffset &&
         !_isConstructorDeclarationReturnType(node)) {
-      var nodeElement = node.writeOrReadElement;
+      var nodeElement = node.writeOrReadElement2;
 
       var prefix = '';
       var parent = node.parent;
@@ -108,18 +108,18 @@ class _Visitor extends UnifyingAstVisitor<void> {
     }
   }
 
-  void _addElement(String prefix, Element? element) {
+  void _addElement(String prefix, Element2? element) {
     if (element == null) {
       return;
     }
-    if (element is PrefixElement) {
+    if (element is PrefixElement2) {
       return;
     }
-    if (element.enclosingElement3 is! CompilationUnitElement) {
+    if (element.enclosingElement2 is! LibraryElement2) {
       return;
     }
 
-    var path = element.library?.definingCompilationUnit.source.fullName;
+    var path = element.library2?.firstFragment.source.fullName;
     if (path == null) {
       return;
     }
@@ -130,17 +130,17 @@ class _Visitor extends UnifyingAstVisitor<void> {
       () => ImportedElements(path, prefix, <String>[]),
     );
     var elementNames = elements.elements;
-    var elementName = element.name;
+    var elementName = element.name3;
     if (elementName != null && !elementNames.contains(elementName)) {
       elementNames.add(elementName);
     }
   }
 
   String _getPrefixFrom(SimpleIdentifier identifier) {
     if (identifier.offset <= endOffset && identifier.end >= startOffset) {
-      var prefixElement = identifier.staticElement;
-      if (prefixElement is PrefixElement) {
-        return prefixElement.name;
+      var prefixElement = identifier.element;
+      if (prefixElement is PrefixElement2) {
+        return prefixElement.name3 ?? '';
       }
     }
     return '';

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

@@ -128,6 +128,17 @@ abstract class SearchEngine {
     OperationPerformanceImpl? performance,
   });
 
+  /// Returns direct subtypes of the given [type].
+  ///
+  /// [type] - the [ClassElement] being subtyped by the found matches.
+  /// [cache] - the [SearchEngineCache] used to speeding up the computation. If
+  ///    empty it will be filled out and can be used on any subsequent query.
+  Future<List<SearchMatch>> searchSubtypes2(
+    InterfaceElement2 type,
+    SearchEngineCache cache, {
+    OperationPerformanceImpl? performance,
+  });
+
   /// Returns all the top-level declarations matching the given pattern.
   ///
   /// [pattern] the regular expression used to match the names of the

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

@@ -170,6 +170,19 @@ class SearchEngineImpl implements SearchEngine {
     return results.map(SearchMatchImpl.forSearchResult).toList();
   }
 
+  @override
+  Future<List<SearchMatch>> searchSubtypes2(
+    InterfaceElement2 type,
+    SearchEngineCache searchEngineCache, {
+    OperationPerformanceImpl? performance,
+  }) async {
+    return await searchSubtypes(
+      type.asElement,
+      searchEngineCache,
+      performance: performance,
+    );
+  }
+
   @override
   Future<List<SearchMatch>> searchTopLevelDeclarations(String pattern) async {
     var allElements = <Element>{};

pkg/analysis_server/test/src/computer/imported_elements_computer_test.dart

@@ -377,7 +377,7 @@ void f() {
 ''';
     await _computeElements(content, selection);
     assertElements([
-      ImportedElements(fooPath, 'prefix', ['foo=']),
+      ImportedElements(fooPath, 'prefix', ['foo']),
     ]);
   }