Cleanup declarations in server with trailing digits

There are still lots of declarations whose name ends in a trailing
digit, but most of them are unrelated to the migration, and some
are required in order to not break internal code.

I'm happy to break this up into smaller CLs if it's hard to review.
Mostly it's just renaming some declarations, although there are one or
two places where I did a little more clean-up.

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

Author: bwilkerson

pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart

@@ -17,9 +17,9 @@ Element convertElement(engine.Element2 element) {
   var kind = convertElementToElementKind(element);
   var name = getElementDisplayName(element);
   var elementTypeParameters = _getTypeParametersString(element);
-  var aliasedType = getAliasedTypeString2(element);
+  var aliasedType = getAliasedTypeString(element);
   var elementParameters = getParametersString(element);
-  var elementReturnType = getReturnTypeString2(element);
+  var elementReturnType = getReturnTypeString(element);
   return Element(
     kind,
     name,
@@ -33,7 +33,7 @@ Element convertElement(engine.Element2 element) {
       isFinal: _isFinal(element),
       isStatic: _isStatic(element),
     ),
-    location: newLocation_fromElement2(element),
+    location: newLocation_fromElement(element),
     typeParameters: elementTypeParameters,
     aliasedType: aliasedType,
     parameters: elementParameters,
@@ -137,9 +137,9 @@ Element convertLibraryFragment(CompilationUnitElementImpl fragment) {
   var kind = convertElementToElementKind(fragment);
   var name = getElementDisplayName(fragment);
   var elementTypeParameters = _getTypeParametersString(fragment);
-  var aliasedType = getAliasedTypeString2(fragment);
+  var aliasedType = getAliasedTypeString(fragment);
   var elementParameters = getParametersString(fragment);
-  var elementReturnType = getReturnTypeString2(fragment);
+  var elementReturnType = getReturnTypeString(fragment);
   return Element(
     kind,
     name,

pkg/analysis_server/lib/src/analysis_server.dart

@@ -646,7 +646,7 @@ abstract class AnalysisServer {
   /// Return a [Future] that completes with the [Element2] at the given
   /// [offset] of the given [file], or with `null` if there is no node at the
   /// [offset] or the node does not have an element.
-  Future<Element2?> getElementAtOffset2(String file, int offset) async {
+  Future<Element2?> getElementAtOffset(String file, int offset) async {
     if (!priorityFiles.contains(file)) {
       var driver = getAnalysisDriver(file);
       if (driver == null) {
@@ -668,7 +668,7 @@ abstract class AnalysisServer {
     }
 
     var node = await getNodeAtOffset(file, offset);
-    return getElementOfNode2(node);
+    return getElementOfNode(node);
   }
 
   /// Returns the element associated with the [node].
@@ -679,7 +679,7 @@ abstract class AnalysisServer {
   /// this work-around.
   ///
   /// Returns `null` if [node] is `null` or doesn't have an element.
-  Element2? getElementOfNode2(AstNode? node, {bool useMockForImport = false}) {
+  Element2? getElementOfNode(AstNode? node, {bool useMockForImport = false}) {
     if (node == null) {
       return null;
     }
@@ -702,7 +702,7 @@ abstract class AnalysisServer {
     if (useMockForImport &&
         node is SimpleIdentifier &&
         element is PrefixElement2) {
-      element = MockLibraryImportElement(getImportElement2(node)!);
+      element = MockLibraryImportElement(getImportElement(node)!);
     }
     return element;
   }

pkg/analysis_server/lib/src/cider/rename.dart

@@ -91,7 +91,7 @@ class CanRenameResponse {
         getElementKindName(newNameMember),
         newName,
       );
-      result.addError(message, newLocation_fromElement2(newNameMember));
+      result.addError(message, newLocation_fromElement(newNameMember));
     }
   }
 
@@ -445,7 +445,7 @@ class CiderRenameComputer {
     if (!_canRenameElement(element)) {
       return null;
     }
-    var refactoring = RenameRefactoring.getElementToRename2(node, element);
+    var refactoring = RenameRefactoring.getElementToRename(node, element);
     if (refactoring != null) {
       return CanRenameResponse(lineInfo, refactoring, _fileResolver, filePath);
     }

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

@@ -245,7 +245,7 @@ class DartCallHierarchyComputer {
     // across calls.
     var parsedUnits = <String, SomeParsedUnitResult?>{};
     for (var reference in references) {
-      var container = _getContainer(reference.element2);
+      var container = _getContainer(reference.element);
       if (container == null) {
         continue;
       }

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

@@ -9,7 +9,7 @@ import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analysis_server/src/utilities/element_location2.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element2.dart' hide ElementLocation;
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -37,7 +37,7 @@ class DartLazyTypeHierarchyComputer {
 
   /// Finds subtypes for the [Element2] at [location].
   Future<List<TypeHierarchyRelatedItem>?> findSubtypes(
-    ElementLocation2 location,
+    ElementLocation location,
     SearchEngine searchEngine,
   ) async {
     var targetElement = await _findTargetElement(location);
@@ -57,7 +57,7 @@ class DartLazyTypeHierarchyComputer {
   /// Anchors are included in returned types (where necessary to preserve type
   /// arguments) that can be used when calling for the next level of types.
   Future<List<TypeHierarchyRelatedItem>?> findSupertypes(
-    ElementLocation2 location, {
+    ElementLocation location, {
     TypeHierarchyAnchor? anchor,
   }) async {
     var targetElement = await _findTargetElement(location);
@@ -106,7 +106,7 @@ class DartLazyTypeHierarchyComputer {
 
   /// Locate the [Element2] referenced by [location].
   Future<InterfaceElement2?> _findTargetElement(
-    ElementLocation2 location,
+    ElementLocation location,
   ) async {
     var element = await location.locateIn(_result.session);
     return element is InterfaceElement2 ? element : null;
@@ -119,7 +119,7 @@ class DartLazyTypeHierarchyComputer {
   ) async {
     /// Helper to convert a [SearchMatch] to a [TypeHierarchyRelatedItem].
     TypeHierarchyRelatedItem? toHierarchyItem(SearchMatch match) {
-      var element = match.element2 as InterfaceElement2;
+      var element = match.element as InterfaceElement2;
       var type = element.thisType;
       switch (match.kind) {
         case MatchKind.REFERENCE_IN_EXTENDS_CLAUSE:
@@ -142,7 +142,7 @@ class DartLazyTypeHierarchyComputer {
     );
     var seenElements = <Element2>{};
     return matches
-        .where((match) => seenElements.add(match.element2))
+        .where((match) => seenElements.add(match.element))
         .map(toHierarchyItem)
         .nonNulls
         .toList();
@@ -220,7 +220,7 @@ class DartLazyTypeHierarchyComputer {
 
 class TypeHierarchyAnchor {
   /// The location of the anchor element.
-  final ElementLocation2 location;
+  final ElementLocation location;
 
   /// The supertype path from [location] to the target element.
   final List<int> path;
@@ -239,7 +239,7 @@ class TypeHierarchyItem {
   /// `findSubtypes`/`findSupertypes` so that if code has been modified since
   /// the `findTarget` call the element can still be located (provided the
   /// names/identifiers have not changed).
-  final ElementLocation2 location;
+  final ElementLocation location;
 
   /// The type being displayed.
   final InterfaceType _type;
@@ -272,7 +272,7 @@ class TypeHierarchyItem {
        file = type.element3.firstFragment.libraryFragment.source.fullName;
 
   static TypeHierarchyItem? forType(InterfaceType type) {
-    var location = ElementLocation2.forElement(type.element3);
+    var location = ElementLocation.forElement(type.element3);
     if (location == null) return null;
 
     return TypeHierarchyItem._forType(type: type, location: location);
@@ -356,7 +356,7 @@ class TypeHierarchyRelatedItem extends TypeHierarchyItem {
     InterfaceType type, {
     required TypeHierarchyItemRelationship relationship,
   }) {
-    var location = ElementLocation2.forElement(type.element3);
+    var location = ElementLocation.forElement(type.element3);
     if (location == null) return null;
 
     return TypeHierarchyRelatedItem.forType(

pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart

@@ -75,7 +75,7 @@ class EditGetAvailableRefactoringsHandler extends LegacyHandler {
     var resolvedUnit = await server.getResolvedUnit(file);
     if (resolvedUnit != null) {
       var node = NodeLocator(offset).searchWithin(resolvedUnit.unit);
-      var element = server.getElementOfNode2(node);
+      var element = server.getElementOfNode(node);
       if (element != null) {
         var refactoringWorkspace = server.refactoringWorkspace;
         // try CONVERT_METHOD_TO_GETTER
@@ -89,7 +89,7 @@ class EditGetAvailableRefactoringsHandler extends LegacyHandler {
           }
         }
         // try RENAME
-        var renameRefactoring = RenameRefactoring.create2(
+        var renameRefactoring = RenameRefactoring.create(
           refactoringWorkspace,
           resolvedUnit,
           element,

pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart

@@ -31,7 +31,7 @@ class SearchFindElementReferencesHandler extends LegacyHandler {
     );
     var file = params.file;
     // prepare element
-    var element = await server.getElementAtOffset2(file, params.offset);
+    var element = await server.getElementAtOffset(file, params.offset);
     if (element is FieldFormalParameterElement2) {
       element = element.field2;
     }

pkg/analysis_server/lib/src/handler/legacy/search_get_type_hierarchy.dart

@@ -29,7 +29,7 @@ class SearchGetTypeHierarchyHandler extends LegacyHandler {
     );
     var file = params.file;
     // prepare element
-    var element = await server.getElementAtOffset2(file, params.offset);
+    var element = await server.getElementAtOffset(file, params.offset);
     if (element == null) {
       _sendTypeHierarchyNull(request);
       return;

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

@@ -199,7 +199,7 @@ Future<lsp.CompletionItem?> toLspCompletionItem(
   var colorPreviewHex =
       capabilities.completionItemKinds.contains(lsp.CompletionItemKind.Color) &&
               suggestion is ElementBasedSuggestion
-          ? server.getColorHexString2(element)
+          ? server.getColorHexString(element)
           : null;
 
   var completionKind =
@@ -560,7 +560,7 @@ CompletionDetail _getCompletionDetail(
     if (element is FormalParameterElement) {
       parameterType = element.type.getDisplayString();
     }
-    returnType = server.getReturnTypeString2(element) ?? parameterType;
+    returnType = server.getReturnTypeString(element) ?? parameterType;
 
     // Extract the type from setters to be shown in the place a return type
     // would usually be shown.

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

@@ -322,7 +322,7 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
       // Converts/Rewrites
       if (shouldIncludeKind(CodeActionKind.RefactorRewrite)) {
         var node = NodeLocator(offset).searchWithin(unitResult.unit);
-        var element = server.getElementOfNode2(node);
+        var element = server.getElementOfNode(node);
 
         // Getter to Method
         if (element is GetterElement &&