Cleanup code in analysis_server_plugin

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

Author: bwilkerson

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

@@ -167,7 +167,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
     } else if (targetIdentifierElement is ExtensionElement2) {
       _updateFinderWithExtensionMembers(finder, targetIdentifierElement);
     } else {
-      var interfaceElement = getTargetInterfaceElement2(target);
+      var interfaceElement = getTargetInterfaceElement(target);
       if (interfaceElement != null) {
         _updateFinderWithClassMembers(finder, interfaceElement);
       }

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

@@ -21,9 +21,8 @@ class CreateField extends CreateFieldOrGetter {
 
   @override
   CorrectionApplicability get applicability =>
-          // TODO(applicability): comment on why.
-          CorrectionApplicability
-          .singleLocation;
+      // TODO(applicability): comment on why.
+      CorrectionApplicability.singleLocation;
 
   @override
   List<String> get fixArguments => [_fieldName];
@@ -156,7 +155,7 @@ class CreateField extends CreateFieldOrGetter {
     var staticModifier = false;
     InterfaceElement2? targetClassElement;
     if (target != null) {
-      targetClassElement = getTargetInterfaceElement2(target);
+      targetClassElement = getTargetInterfaceElement(target);
       // Maybe static.
       if (target is Identifier) {
         var targetIdentifier = target;

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

@@ -133,7 +133,7 @@ class CreateMethod extends ResolvedCorrectionProducer {
         staticModifier = inStaticContext;
       }
     } else {
-      var targetClassElement = getTargetInterfaceElement2(target);
+      var targetClassElement = getTargetInterfaceElement(target);
       if (targetClassElement == null) {
         return;
       }

pkg/analysis_server_plugin/lib/edit/dart/correction_producer.dart

@@ -458,7 +458,7 @@ abstract class ResolvedCorrectionProducer
 
   /// Returns the class element associated with the [target], or `null` if there
   /// is no such element.
-  InterfaceElement2? getTargetInterfaceElement2(Expression target) {
+  InterfaceElement2? getTargetInterfaceElement(Expression target) {
     var type = target.staticType;
     if (type is InterfaceType) {
       return type.element3;

pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart

@@ -238,7 +238,7 @@ class AnalyzerConverter {
       return null;
     }
 
-    parameters.sort(_preferRequiredParams2);
+    parameters.sort(_preferRequiredParams);
 
     var sb = StringBuffer();
     var closeOptionalString = '';
@@ -370,7 +370,7 @@ class AnalyzerConverter {
   }
 
   /// Sort required named parameters before optional ones.
-  int _preferRequiredParams2(
+  int _preferRequiredParams(
     analyzer.FormalParameterElement e1,
     analyzer.FormalParameterElement e2,
   ) {

pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart

@@ -45,7 +45,7 @@ class InheritedReferenceContributor
       return;
     }
     containingLibrary = request.result.libraryElement2;
-    _computeSuggestionsForClass2(
+    _computeSuggestionsForClass(
         collector, target, classDecl.declaredFragment!.element, optype);
   }
 
@@ -73,7 +73,7 @@ class InheritedReferenceContributor
       classElement = classDecl.declaredFragment!.element;
     }
     containingLibrary = request.result.libraryElement2;
-    _computeSuggestionsForClass2(collector, target, classElement, optype,
+    _computeSuggestionsForClass(collector, target, classElement, optype,
         skipChildClass: skipChildClass);
   }
 
@@ -104,7 +104,7 @@ class InheritedReferenceContributor
     }
   }
 
-  void _computeSuggestionsForClass2(CompletionCollector collector,
+  void _computeSuggestionsForClass(CompletionCollector collector,
       CompletionTarget target, ClassElement2 classElement, OpType optype,
       {bool skipChildClass = true}) {
     var isFunctionalArgument = target.isFunctionalArgument();