[migration] Rename utilities in protocol_dart.dart

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

Author: bwilkerson

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

@@ -13,12 +13,12 @@ import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:path/path.dart' as path;
 
-Element convertElement2(engine.Element2 element) {
-  var kind = convertElementToElementKind2(element);
-  var name = getElementDisplayName2(element);
-  var elementTypeParameters = _getTypeParametersString2(element);
+Element convertElement(engine.Element2 element) {
+  var kind = convertElementToElementKind(element);
+  var name = getElementDisplayName(element);
+  var elementTypeParameters = _getTypeParametersString(element);
   var aliasedType = getAliasedTypeString2(element);
-  var elementParameters = getParametersString2(element);
+  var elementParameters = getParametersString(element);
   var elementReturnType = getReturnTypeString2(element);
   return Element(
     kind,
@@ -28,10 +28,10 @@ Element convertElement2(engine.Element2 element) {
       isDeprecated:
           (element is engine.Annotatable) &&
           (element as engine.Annotatable).metadata2.hasDeprecated,
-      isAbstract: _isAbstract2(element),
-      isConst: _isConst2(element),
-      isFinal: _isFinal2(element),
-      isStatic: _isStatic2(element),
+      isAbstract: _isAbstract(element),
+      isConst: _isConst(element),
+      isFinal: _isFinal(element),
+      isStatic: _isStatic(element),
     ),
     location: newLocation_fromElement2(element),
     typeParameters: elementTypeParameters,
@@ -46,7 +46,7 @@ Element convertElement2(engine.Element2 element) {
 ///
 /// This does not take into account that an instance of [engine.ClassElement]
 /// can be an enum and an instance of [engine.FieldElement] can be an enum
-/// constant. Use [convertElementToElementKind2] where possible.
+/// constant. Use [convertElementToElementKind] where possible.
 ElementKind convertElementKind(engine.ElementKind kind) {
   if (kind == engine.ElementKind.CLASS) {
     return ElementKind.CLASS;
@@ -121,7 +121,7 @@ ElementKind convertElementKind(engine.ElementKind kind) {
 }
 
 /// Return an [ElementKind] corresponding to the given [engine.Element2].
-ElementKind convertElementToElementKind2(engine.Element2 element) {
+ElementKind convertElementToElementKind(engine.Element2 element) {
   if (element is engine.EnumElement2) {
     return ElementKind.ENUM;
   } else if (element is engine.MixinElement2) {
@@ -134,22 +134,22 @@ ElementKind convertElementToElementKind2(engine.Element2 element) {
 }
 
 Element convertLibraryFragment(CompilationUnitElementImpl fragment) {
-  var kind = convertElementToElementKind2(fragment);
-  var name = getElementDisplayName2(fragment);
-  var elementTypeParameters = _getTypeParametersString2(fragment);
+  var kind = convertElementToElementKind(fragment);
+  var name = getElementDisplayName(fragment);
+  var elementTypeParameters = _getTypeParametersString(fragment);
   var aliasedType = getAliasedTypeString2(fragment);
-  var elementParameters = getParametersString2(fragment);
+  var elementParameters = getParametersString(fragment);
   var elementReturnType = getReturnTypeString2(fragment);
   return Element(
     kind,
     name,
     Element.makeFlags(
       isPrivate: fragment.isPrivate,
       isDeprecated: fragment.hasDeprecated,
-      isAbstract: _isAbstract2(fragment),
-      isConst: _isConst2(fragment),
-      isFinal: _isFinal2(fragment),
-      isStatic: _isStatic2(fragment),
+      isAbstract: _isAbstract(fragment),
+      isConst: _isConst(fragment),
+      isFinal: _isFinal(fragment),
+      isStatic: _isStatic(fragment),
     ),
     location: newLocation_fromFragment(fragment),
     typeParameters: elementTypeParameters,
@@ -159,15 +159,15 @@ Element convertLibraryFragment(CompilationUnitElementImpl fragment) {
   );
 }
 
-String getElementDisplayName2(engine.Element2 element) {
+String getElementDisplayName(engine.Element2 element) {
   if (element is engine.LibraryFragment) {
     return path.basename((element as engine.LibraryFragment).source.fullName);
   } else {
     return element.displayName;
   }
 }
 
-String? getParametersString2(engine.Element2 element) {
+String? getParametersString(engine.Element2 element) {
   // TODO(scheglov): expose the corresponding feature from ExecutableElement
   List<engine.FormalParameterElement> parameters;
   if (element is engine.ExecutableElement2) {
@@ -188,7 +188,7 @@ String? getParametersString2(engine.Element2 element) {
     return null;
   }
 
-  parameters.sort(_preferRequiredParams2);
+  parameters.sort(_preferRequiredParams);
 
   var sb = StringBuffer();
   var closeOptionalString = '';
@@ -216,7 +216,7 @@ String? getParametersString2(engine.Element2 element) {
   return '($sb)';
 }
 
-String? _getTypeParametersString2(engine.Element2 element) {
+String? _getTypeParametersString(engine.Element2 element) {
   List<engine.TypeParameterElement2>? typeParameters;
   if (element is engine.InterfaceElement2) {
     typeParameters = element.typeParameters2;
@@ -229,7 +229,7 @@ String? _getTypeParametersString2(engine.Element2 element) {
   return '<${typeParameters.join(', ')}>';
 }
 
-bool _isAbstract2(engine.Element2 element) {
+bool _isAbstract(engine.Element2 element) {
   if (element is engine.ClassElement2) {
     return element.isAbstract;
   }
@@ -242,7 +242,7 @@ bool _isAbstract2(engine.Element2 element) {
   return false;
 }
 
-bool _isConst2(engine.Element2 element) {
+bool _isConst(engine.Element2 element) {
   if (element is engine.ConstructorElement2) {
     return element.isConst;
   }
@@ -252,14 +252,14 @@ bool _isConst2(engine.Element2 element) {
   return false;
 }
 
-bool _isFinal2(engine.Element2 element) {
+bool _isFinal(engine.Element2 element) {
   if (element is engine.VariableElement2) {
     return element.isFinal;
   }
   return false;
 }
 
-bool _isStatic2(engine.Element2 element) {
+bool _isStatic(engine.Element2 element) {
   if (element is engine.ExecutableElement2) {
     return element.isStatic;
   }
@@ -270,7 +270,7 @@ bool _isStatic2(engine.Element2 element) {
 }
 
 /// Sort required named parameters before optional ones.
-int _preferRequiredParams2(
+int _preferRequiredParams(
   engine.FormalParameterElement e1,
   engine.FormalParameterElement e2,
 ) {

pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart

@@ -18,7 +18,7 @@ void addDartOccurrences(OccurrencesCollector collector, CompilationUnit unit) {
     // For legacy protocol, we only support occurrences with the same
     // length, so we must filter the offset to only those that match the length
     // from the element.
-    var serverElement = protocol.convertElement2(engineElement);
+    var serverElement = protocol.convertElement(engineElement);
     // Prefer the length from the mapped element over the element directly,
     // because 'name3' may contain 'new' for constructors which doesn't match
     // what is in the source.

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

@@ -49,7 +49,7 @@ class SearchFindElementReferencesHandler extends LegacyHandler {
     var result = protocol.SearchFindElementReferencesResult();
     if (element != null) {
       result.id = searchId;
-      result.element = protocol.convertElement2(element.asElement2!);
+      result.element = protocol.convertElement(element.asElement2!);
     }
     sendResult(result);
     // search elements

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

@@ -552,7 +552,7 @@ CompletionDetail _getCompletionDetail(
   }
   String? parameters;
   if (element != null) {
-    parameters = getParametersString2(element);
+    parameters = getParametersString(element);
     // Prefer the element return type (because it may be more specific
     // for overrides) and fall back to the parameter type or return type from
     // the suggestion (handles records).

pkg/analysis_server/lib/src/protocol_server.dart

@@ -382,7 +382,7 @@ Location newLocation_fromUnit(
 
 /// Construct based on an element from the analyzer engine.
 OverriddenMember newOverriddenMember_fromEngine(engine.Element2 member) {
-  var element = convertElement2(member);
+  var element = convertElement(member);
   var className = member.enclosingElement2!.displayName;
   return OverriddenMember(element, className);
 }
@@ -444,7 +444,7 @@ List<Element> _computePath(engine.Element element) {
             convertLibraryFragment(fragment as CompilationUnitElementImpl),
           );
         }
-        path.add(convertElement2(e.asElement2!));
+        path.add(convertElement(e.asElement2!));
       }
     }
   }

pkg/analysis_server/lib/src/search/type_hierarchy.dart

@@ -5,7 +5,7 @@
 import 'dart:collection';
 
 import 'package:analysis_server/src/protocol_server.dart'
-    show TypeHierarchyItem, convertElement2;
+    show TypeHierarchyItem, convertElement;
 import 'package:analysis_server/src/services/search/hierarchy.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/element/element2.dart';
@@ -70,10 +70,10 @@ class TypeHierarchyComputer {
       var subMemberElement = helper.findMemberElement(subElement);
       var subMemberElementDeclared = subMemberElement?.nonSynthetic2;
       subItem = TypeHierarchyItem(
-        convertElement2(subElement),
+        convertElement(subElement),
         memberElement:
             subMemberElementDeclared != null
-                ? convertElement2(subMemberElementDeclared)
+                ? convertElement(subMemberElementDeclared)
                 : null,
         superclass: itemId,
       );
@@ -122,11 +122,11 @@ class TypeHierarchyComputer {
       var memberElement = helper.findMemberElement(classElement);
       var memberElementDeclared = memberElement?.nonSynthetic2;
       item = TypeHierarchyItem(
-        convertElement2(classElement),
+        convertElement(classElement),
         displayName: displayName,
         memberElement:
             memberElementDeclared != null
-                ? convertElement2(memberElementDeclared)
+                ? convertElement(memberElementDeclared)
                 : null,
       );
       _elementItemMap[classElement] = item;

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

@@ -723,7 +723,7 @@ class SuggestionBuilder {
       parameterName: name,
       parameterType: type,
       replacementLength: replacementLength,
-      element: convertElement2(parameter),
+      element: convertElement(parameter),
     );
 
     if (parameter is FieldFormalParameterElement2) {
@@ -847,7 +847,7 @@ class SuggestionBuilder {
       displayText: displayText,
       requiredImports: overrideImports.toList(),
     );
-    suggestion.element = protocol.convertElement2(element);
+    suggestion.element = protocol.convertElement(element);
     _addSuggestion(
       suggestion,
       textToMatchOverride: _textToMatchOverride(element),
@@ -1464,7 +1464,7 @@ class SuggestionBuilder {
   _ElementCompletionData _createElementCompletionData(Element2 element) {
     var documentation = _getDocumentation(element);
 
-    var suggestedElement = protocol.convertElement2(element);
+    var suggestedElement = protocol.convertElement(element);
 
     String? declaringType;
     if (element is! FormalParameterElement) {