[element model] migrate computer_documentation

Change-Id: I7ff0a47ea8b9fc325932d1a9c9f65dd8c65e2714
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/400000
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>

Author: pq

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -2,7 +2,6 @@ lib/plugin/protocol/protocol_dart.dart
 lib/src/analysis_server.dart
 lib/src/cider/rename.dart
 lib/src/computer/computer_call_hierarchy.dart
-lib/src/computer/computer_documentation.dart
 lib/src/domains/analysis/occurrences_dart.dart
 lib/src/handler/legacy/edit_get_available_refactorings.dart
 lib/src/handler/legacy/search_find_element_references.dart

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

@@ -4,31 +4,16 @@
 
 import 'package:analysis_server/src/computer/computer_overrides.dart';
 import 'package:analysis_server/src/utilities/extensions/element.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 
-/// Computes documentation for an [Element].
+/// Computes documentation for an [Element2].
 class DartDocumentationComputer {
   final DartdocDirectiveInfo dartdocInfo;
 
   DartDocumentationComputer(this.dartdocInfo);
 
   Documentation? compute(
-    Element elementBeingDocumented, {
-    bool includeSummary = false,
-  }) {
-    // TODO(dantup): Remove this temporary implementation used to split
-    //  migration of this class and callers into separate changes.
-    var element2 = elementBeingDocumented.asElement2;
-
-    return element2 != null
-        ? compute2(element2, includeSummary: includeSummary)
-        : null;
-  }
-
-  Documentation? compute2(
     Element2 elementBeingDocumented, {
     bool includeSummary = false,
   }) {
@@ -96,26 +81,14 @@ class DartDocumentationComputer {
   /// Compute documentation for [element] and return either the summary or full
   /// docs (or `null`) depending on `preference`.
   String? computePreferred(
-    Element element,
-    DocumentationPreference preference,
-  ) {
-    // TODO(dantup): Remove this temporary implementation used to split
-    //  migration of this class and callers into separate changes.
-    var element2 = element.asElement2;
-    return element2 != null ? computePreferred2(element2, preference) : null;
-  }
-
-  /// Compute documentation for [element] and return either the summary or full
-  /// docs (or `null`) depending on `preference`.
-  String? computePreferred2(
     Element2 element,
     DocumentationPreference preference,
   ) {
     if (preference == DocumentationPreference.none) {
       return null;
     }
 
-    var doc = compute2(
+    var doc = compute(
       element,
       includeSummary: preference == DocumentationPreference.summary,
     );

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

@@ -81,7 +81,7 @@ class DartUnitHoverComputer {
           hover.containingLibraryPath = libraryInfo?.libraryPath;
         }
         // documentation
-        hover.dartdoc = _documentationComputer.computePreferred2(
+        hover.dartdoc = _documentationComputer.computePreferred(
           element,
           documentationPreference,
         );

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

@@ -102,7 +102,7 @@ class DartUnitSignatureComputer {
       }
     }
 
-    var dartdoc = _documentationComputer.computePreferred2(
+    var dartdoc = _documentationComputer.computePreferred(
       element,
       documentationPreference,
     );

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

@@ -57,7 +57,7 @@ class DartTypeArgumentsSignatureComputer {
     _argumentList = argumentList;
 
     var label = element.displayString2();
-    var documentation = _documentationComputer.computePreferred2(
+    var documentation = _documentationComputer.computePreferred(
       element,
       documentationPreference,
     );

pkg/analysis_server/lib/src/lsp/completion_utils.dart

@@ -626,8 +626,10 @@ _ElementDocumentation? _getDocsFromComputer(
   Element element,
   DartCompletionRequest request,
 ) {
+  var element2 = element.asElement2;
+  if (element2 == null) return null;
   var doc = request.documentationComputer.compute(
-    element,
+    element2,
     includeSummary: true,
   );
   if (doc is DocumentationWithSummary) {

pkg/analysis_server/lib/src/lsp/handlers/handler_completion_resolve.dart

@@ -13,6 +13,7 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/utilities/extensions/analysis_session.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 
 class CompletionResolveHandler
@@ -130,7 +131,7 @@ class CompletionResolveHandler
         Either2<MarkupContent, String>? documentation;
         var element =
             elementLocation != null
-                ? await session.locateElement(elementLocation)
+                ? (await session.locateElement(elementLocation)).asElement2
                 : null;
         if (element != null) {
           var formats = clientCapabilities.completionDocumentationFormats;

pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

@@ -1576,7 +1576,7 @@ class SuggestionBuilder {
 
   /// If the [element] has a documentation comment, return it.
   _ElementDocumentation? _getDocumentation(Element2 element) {
-    var doc = request.documentationComputer.compute2(
+    var doc = request.documentationComputer.compute(
       element,
       includeSummary: true,
     );
@@ -1642,7 +1642,7 @@ class SuggestionBuilder {
   /// If the [element] has a documentation comment, fill the [suggestion]'s
   /// documentation fields.
   void _setDocumentation(CompletionSuggestion suggestion, Element2 element) {
-    var doc = request.documentationComputer.compute2(
+    var doc = request.documentationComputer.compute(
       element,
       includeSummary: true,
     );