[element model] migrate session_helper API

Change-Id: Ia2717bb24c83a409e853fb5271a3d5ed91cd3306 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/402142 Reviewed-by: Brian Wilkerson <[email protected]>
dart-lang · Dec 20, 2024 · 8a08c1b · 8a08c1b
1 parent 9f3e0cf
commit 8a08c1b
Show file tree

Hide file tree

Showing 35 changed files with 107 additions and 222 deletions.
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color_presentation.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color_presentation.dart
@@ -158,7 +158,7 @@ class DocumentColorPresentationHandler
       var editRange = SourceRange(editStart, editEnd - editStart);
 
       var sessionHelper = AnalysisSessionHelper(unit.session);
-      var colorType = await sessionHelper.getFlutterClass2('Color');
+      var colorType = await sessionHelper.getFlutterClass('Color');
       if (colorType == null) {
         // If we can't find the class (perhaps because this isn't a Flutter
         // project) we will not include any results. In theory the client should

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_enum_constant.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_enum_constant.dart
@@ -42,7 +42,7 @@ class AddEnumConstant extends ResolvedCorrectionProducer {
     if (targetElement.library2.isInSdk) return;
 
     var targetFragment = targetElement.firstFragment;
-    var targetDeclarationResult = await sessionHelper.getElementDeclaration2(
+    var targetDeclarationResult = await sessionHelper.getElementDeclaration(
       targetFragment,
     );
     if (targetDeclarationResult == null) return;

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_key_to_constructors.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_key_to_constructors.dart
@@ -167,7 +167,7 @@ class AddKeyToConstructors extends ResolvedCorrectionProducer {
 
   /// Return the type for the class `Key`.
   Future<DartType?> _getKeyType() async {
-    var keyClass = await sessionHelper.getFlutterClass2('Key');
+    var keyClass = await sessionHelper.getFlutterClass('Key');
     if (keyClass == null) {
       return null;
     }

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_late.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_late.dart
@@ -69,7 +69,7 @@ class AddLate extends ResolvedCorrectionProducer {
             !variableElement.isLate &&
             variableElement.setter2 == null) {
           var variableFragment = variableElement.firstFragment;
-          var declarationResult = await sessionHelper.getElementDeclaration2(
+          var declarationResult = await sessionHelper.getElementDeclaration(
             variableFragment,
           );
           if (declarationResult == null) {

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart
@@ -89,7 +89,7 @@ class CreateConstructor extends ResolvedCorrectionProducer {
     // prepare target ClassDeclaration
     var targetElement = targetType.element3;
     var targetFragment = targetElement.firstFragment;
-    var targetResult = await sessionHelper.getElementDeclaration2(
+    var targetResult = await sessionHelper.getElementDeclaration(
       targetFragment,
     );
     if (targetResult == null) {
@@ -130,9 +130,7 @@ class CreateConstructor extends ResolvedCorrectionProducer {
     }
 
     // prepare target interface type
-    var targetResult = await sessionHelper.getElementDeclaration2(
-      targetElement,
-    );
+    var targetResult = await sessionHelper.getElementDeclaration(targetElement);
     if (targetResult == null) {
       return;
     }
@@ -185,7 +183,7 @@ class CreateConstructor extends ResolvedCorrectionProducer {
     }
 
     // prepare target ClassDeclaration
-    var targetResult = await sessionHelper.getElementDeclaration2(
+    var targetResult = await sessionHelper.getElementDeclaration(
       targetFragment,
     );
     if (targetResult == null) {

diff --git a/...analysis_server/lib/src/services/correction/dart/create_constructor_for_final_fields.dart b/...analysis_server/lib/src/services/correction/dart/create_constructor_for_final_fields.dart
@@ -155,7 +155,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
     required _FixContext fixContext,
     required NamedCompilationUnitMember classDeclaration,
   }) async {
-    var keyClass = await sessionHelper.getFlutterClass2('Key');
+    var keyClass = await sessionHelper.getFlutterClass('Key');
     if (keyClass == null) {
       return;
     }

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_field.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_field.dart
@@ -76,7 +76,7 @@ class CreateField extends CreateFieldOrGetter {
     }
     // Prepare target `ClassDeclaration`.
     var targetFragment = targetElement.firstFragment;
-    var targetDeclarationResult = await sessionHelper.getElementDeclaration2(
+    var targetDeclarationResult = await sessionHelper.getElementDeclaration(
       targetFragment,
     );
     if (targetDeclarationResult == null) {

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_getter.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_getter.dart
@@ -198,7 +198,7 @@ class CreateGetter extends CreateFieldOrGetter {
       return;
     }
     // prepare target declaration
-    var targetDeclarationResult = await sessionHelper.getElementDeclaration2(
+    var targetDeclarationResult = await sessionHelper.getElementDeclaration(
       targetFragment,
     );
     if (targetDeclarationResult == null) {

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_method.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_method.dart
@@ -105,15 +105,15 @@ class CreateMethod extends ResolvedCorrectionProducer {
     if (target is ExtensionOverride) {
       targetFragment = target.element2.firstFragment;
       if (targetFragment is ExtensionFragment) {
-        targetNode = await getExtensionDeclaration2(targetFragment);
+        targetNode = await getExtensionDeclaration(targetFragment);
         if (targetNode == null) {
           return;
         }
       }
     } else if (target is Identifier && target.element is ExtensionElement2) {
       targetFragment = (target.element as ExtensionElement2).firstFragment;
       if (targetFragment is ExtensionFragment) {
-        targetNode = await getExtensionDeclaration2(targetFragment);
+        targetNode = await getExtensionDeclaration(targetFragment);
         if (targetNode == null) {
           return;
         }
@@ -144,13 +144,13 @@ class CreateMethod extends ResolvedCorrectionProducer {
       // Prepare target ClassDeclaration.
       if (targetClassElement is MixinElement2) {
         var fragment = targetClassElement.firstFragment;
-        targetNode = await getMixinDeclaration2(fragment);
+        targetNode = await getMixinDeclaration(fragment);
       } else if (targetClassElement is ClassElement2) {
         var fragment = targetClassElement.firstFragment;
-        targetNode = await getClassDeclaration2(fragment);
+        targetNode = await getClassDeclaration(fragment);
       } else if (targetClassElement is ExtensionTypeElement2) {
         var fragment = targetClassElement.firstFragment;
-        targetNode = await getExtensionTypeDeclaration2(fragment);
+        targetNode = await getExtensionTypeDeclaration(fragment);
       }
       if (targetNode == null) {
         return;

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_method_or_function.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_method_or_function.dart
@@ -203,11 +203,11 @@ class CreateMethodOrFunction extends ResolvedCorrectionProducer {
     List<ClassMember>? classMembers;
     if (targetClassElement is MixinElement2) {
       var fragment = targetClassElement.firstFragment;
-      var node = targetNode = await getMixinDeclaration2(fragment);
+      var node = targetNode = await getMixinDeclaration(fragment);
       classMembers = node?.members;
     } else if (targetClassElement is ClassElement2) {
       var fragment = targetClassElement.firstFragment;
-      var node = targetNode = await getClassDeclaration2(fragment);
+      var node = targetNode = await getClassDeclaration(fragment);
       classMembers = node?.members;
     }
     if (targetNode == null || classMembers == null) {

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_setter.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_setter.dart
@@ -83,7 +83,7 @@ class CreateSetter extends ResolvedCorrectionProducer {
       return;
     }
     // prepare target declaration
-    var targetDeclarationResult = await sessionHelper.getElementDeclaration2(
+    var targetDeclarationResult = await sessionHelper.getElementDeclaration(
       targetFragment,
     );
     if (targetDeclarationResult == null) {

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateful_widget.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateful_widget.dart
@@ -117,10 +117,10 @@ class FlutterConvertToStatefulWidget extends ResolvedCorrectionProducer {
       return SourceEdit.applySequence(text, visitor.edits.reversed);
     }
 
-    var statefulWidgetClass = await sessionHelper.getFlutterClass2(
+    var statefulWidgetClass = await sessionHelper.getFlutterClass(
       'StatefulWidget',
     );
-    var stateClass = await sessionHelper.getFlutterClass2('State');
+    var stateClass = await sessionHelper.getFlutterClass('State');
     if (statefulWidgetClass == null || stateClass == null) {
       return;
     }

diff --git a/...analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateless_widget.dart b/...analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateless_widget.dart
@@ -139,7 +139,7 @@ class FlutterConvertToStatelessWidget extends ResolvedCorrectionProducer {
       return SourceEdit.applySequence(text, visitor.edits.reversed);
     }
 
-    var statelessWidgetClass = await sessionHelper.getFlutterClass2(
+    var statelessWidgetClass = await sessionHelper.getFlutterClass(
       'StatelessWidget',
     );
     if (statelessWidgetClass == null) {

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart
@@ -272,11 +272,11 @@ abstract class _WrapMultipleWidgets extends ResolvedCorrectionProducer {
   Future<void> compute(ChangeBuilder builder) async {
     var selectedRange = range.startEnd(firstWidget, lastWidget);
     var src = utils.getRangeText(selectedRange);
-    var parentClassElement = await sessionHelper.getClass2(
+    var parentClassElement = await sessionHelper.getClass(
       _parentLibraryUri,
       _parentClassName,
     );
-    var widgetClassElement = await sessionHelper.getFlutterClass2('Widget');
+    var widgetClassElement = await sessionHelper.getFlutterClass('Widget');
     if (parentClassElement == null || widgetClassElement == null) {
       return;
     }
@@ -341,7 +341,7 @@ abstract class _WrapSingleWidget extends ResolvedCorrectionProducer {
     var parentClassName = _parentClassName;
     ClassElement2? parentClassElement;
     if (parentLibraryUri != null && parentClassName != null) {
-      parentClassElement = await sessionHelper.getClass2(
+      parentClassElement = await sessionHelper.getClass(
         parentLibraryUri,
         parentClassName,
       );

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap_builder.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap_builder.dart
@@ -33,7 +33,7 @@ class FlutterWrapBuilder extends ResolvedCorrectionProducer {
     }
     var widgetSrc = utils.getNodeText(widgetExpr);
 
-    var builderElement = await sessionHelper.getFlutterClass2('Builder');
+    var builderElement = await sessionHelper.getFlutterClass('Builder');
     if (builderElement == null) {
       return;
     }

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap_stream_builder.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap_stream_builder.dart
@@ -33,7 +33,7 @@ class FlutterWrapStreamBuilder extends ResolvedCorrectionProducer {
     }
     var widgetSrc = utils.getNodeText(widgetExpr);
 
-    var streamBuilderElement = await sessionHelper.getFlutterClass2(
+    var streamBuilderElement = await sessionHelper.getFlutterClass(
       'StreamBuilder',
     );
     if (streamBuilderElement == null) {

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/make_field_not_final.dart b/pkg/analysis_server/lib/src/services/correction/dart/make_field_not_final.dart
@@ -57,7 +57,7 @@ class MakeFieldNotFinal extends ResolvedCorrectionProducer {
       return;
     }
 
-    var declaration = await sessionHelper.getElementDeclaration2(
+    var declaration = await sessionHelper.getElementDeclaration(
       variable.firstFragment,
     );
     var variableNode = declaration?.node;

diff --git a/pkg/analysis_server/lib/src/services/correction/executable_parameters.dart b/pkg/analysis_server/lib/src/services/correction/executable_parameters.dart
@@ -43,7 +43,7 @@ class ExecutableParameters {
   /// Return the [FormalParameterList] of the [executable], or `null` if it
   /// can't be found.
   Future<FormalParameterList?> getParameterList() async {
-    var result = await sessionHelper.getElementDeclaration2(firstFragment);
+    var result = await sessionHelper.getElementDeclaration(firstFragment);
     var targetDeclaration = result?.node;
     if (targetDeclaration is ConstructorDeclaration) {
       return targetDeclaration.parameters;
@@ -61,7 +61,7 @@ class ExecutableParameters {
   Future<FormalParameter?> getParameterNode2(
     FormalParameterFragment fragment,
   ) async {
-    var result = await sessionHelper.getElementDeclaration2(fragment);
+    var result = await sessionHelper.getElementDeclaration(fragment);
     var declaration = result?.node;
     for (var node = declaration; node != null; node = node.parent) {
       if (node is FormalParameter && node.parent is FormalParameterList) {

diff --git a/pkg/analysis_server/lib/src/services/flutter/property.dart b/pkg/analysis_server/lib/src/services/flutter/property.dart
@@ -110,11 +110,11 @@ class PropertyDescription {
     var enumValue = value.enumValue;
     if (enumValue != null) {
       var helper = AnalysisSessionHelper(resolvedUnit.session);
-      enumElement = await helper.getClass2(
+      enumElement = await helper.getClass(
         enumValue.libraryUri,
         enumValue.className,
       );
-      enumElement ??= await helper.getEnum2(
+      enumElement ??= await helper.getEnum(
         enumValue.libraryUri,
         enumValue.className,
       );

diff --git a/pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart b/pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart
@@ -421,12 +421,12 @@ class _WidgetDescriptionComputer {
 
   Future<void> _fetchClassElements() async {
     var sessionHelper = AnalysisSessionHelper(resolvedUnit.session);
-    _classAlignment = await sessionHelper.getFlutterClass2('Alignment');
-    _classAlignmentDirectional = await sessionHelper.getFlutterClass2(
+    _classAlignment = await sessionHelper.getFlutterClass('Alignment');
+    _classAlignmentDirectional = await sessionHelper.getFlutterClass(
       'AlignmentDirectional',
     );
-    _classContainer = await sessionHelper.getFlutterClass2('Container');
-    _classEdgeInsets = await sessionHelper.getFlutterClass2('EdgeInsets');
+    _classContainer = await sessionHelper.getFlutterClass('Container');
+    _classEdgeInsets = await sessionHelper.getFlutterClass('EdgeInsets');
   }
 
   protocol.FlutterWidgetPropertyEditor? _getEditor(DartType type) {

diff --git a/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart b/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart
@@ -595,7 +595,7 @@ class _SelectionAnalyzer {
 
   Future<AstNode?> _elementDeclaration(ExecutableElement2 element) async {
     var helper = refactoringContext.sessionHelper;
-    var nodeResult = await helper.getElementDeclaration2(element.firstFragment);
+    var nodeResult = await helper.getElementDeclaration(element.firstFragment);
     return nodeResult?.node;
   }
 }
@@ -668,7 +668,7 @@ class _SignatureUpdater {
   /// Returns the [MethodDeclaration] for a [MethodElement2].
   Future<AstNode?> elementDeclaration(ExecutableElement2 element) async {
     var helper = sessionHelper;
-    var result = await helper.getElementDeclaration2(element.firstFragment);
+    var result = await helper.getElementDeclaration(element.firstFragment);
     return result?.node;
   }
 
@@ -685,7 +685,7 @@ class _SignatureUpdater {
   /// Returns the resolved unit with [reference].
   Future<ResolvedUnitResult?> referenceUnitResult(SearchMatch reference) async {
     var element = reference.element2;
-    return await sessionHelper.getResolvedUnitByElement2(element);
+    return await sessionHelper.getResolvedUnitByElement(element);
   }
 
   /// Replaces [argumentList] with new code that has arguments as requested
@@ -745,7 +745,7 @@ class _SignatureUpdater {
   }) async {
     var path = element.firstFragment.libraryFragment.source.fullName;
 
-    var unitResult = await sessionHelper.getResolvedUnitByElement2(element);
+    var unitResult = await sessionHelper.getResolvedUnitByElement(element);
     if (unitResult == null) {
       return ChangeStatusFailure();
     }

diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart
@@ -113,7 +113,7 @@ class ConvertGetterToMethodRefactoringImpl extends RefactoringImpl
         return;
       }
       var sessionHelper = AnalysisSessionHelper(session);
-      var result = await sessionHelper.getElementDeclaration2(fragment);
+      var result = await sessionHelper.getElementDeclaration(fragment);
       var declaration = result?.node;
       if (declaration is MethodDeclaration) {
         getKeyword = declaration.propertyKeyword;

diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart
@@ -112,7 +112,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
       fragment != null;
       fragment = fragment.nextFragment as GetterFragment?
     ) {
-      var result = await sessionHelper.getElementDeclaration2(fragment);
+      var result = await sessionHelper.getElementDeclaration(fragment);
       var declaration = result?.node;
       if (declaration is MethodDeclaration) {
         parameters = declaration.parameters;
@@ -148,7 +148,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
       var refRange = reference.range;
       // prepare invocation
 
-      var resolvedUnit = await sessionHelper.getResolvedUnitByElement2(
+      var resolvedUnit = await sessionHelper.getResolvedUnitByElement(
         refElement,
       );
       var refUnit = resolvedUnit?.unit;

diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_widget.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_widget.dart
@@ -248,7 +248,7 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
     var result = RefactoringStatus();
 
     Future<ClassElement2?> getClass(String name) async {
-      var element = await sessionHelper.getFlutterClass2(name);
+      var element = await sessionHelper.getFlutterClass(name);
       if (element == null) {
         result.addFatalError("Unable to find '$name' in $widgetsUri");
       }
@@ -259,7 +259,7 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
       String uri,
       String name,
     ) async {
-      var element = await sessionHelper.getTopLevelPropertyAccessor2(uri, name);
+      var element = await sessionHelper.getTopLevelPropertyAccessor(uri, name);
       if (element == null) {
         result.addFatalError("Unable to find 'required' in $uri");
       }

diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_local.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_local.dart
@@ -66,7 +66,7 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
     }
 
     var helper = AnalysisSessionHelper(resolveResult.session);
-    var declarationResult = await helper.getElementDeclaration2(
+    var declarationResult = await helper.getElementDeclaration(
       element.firstFragment,
     );
     var node = declarationResult?.node;

diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart
@@ -417,7 +417,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
     }
     _methodElement = element;
 
-    var declaration = await sessionHelper.getElementDeclaration2(
+    var declaration = await sessionHelper.getElementDeclaration(
       element.firstFragment,
     );
     var methodNode = declaration!.node;
@@ -512,7 +512,7 @@ class _ReferenceProcessor {
     refElement = reference.element2;
 
     // prepare CorrectionUtils
-    var result = await ref.sessionHelper.getResolvedUnitByElement2(refElement);
+    var result = await ref.sessionHelper.getResolvedUnitByElement(refElement);
     _refUtils = CorrectionUtils(result!);
 
     // prepare node and environment

diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart
@@ -146,7 +146,7 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
   ) async {
     FieldFormalParameterFragment? fragment = element.firstFragment;
     while (fragment != null) {
-      var result = await sessionHelper.getElementDeclaration2(fragment);
+      var result = await sessionHelper.getElementDeclaration(fragment);
       var node = result?.node;
       if (node is! DefaultFormalParameter) return;
       var parameter = node.parameter as FieldFormalParameter;
@@ -439,7 +439,7 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
       var localElements = localElementMap[unitFragment];
 
       if (localElements == null) {
-        var result = await sessionHelper.getResolvedUnitByElement2(element);
+        var result = await sessionHelper.getResolvedUnitByElement(element);
         if (result == null) {
           return const [];
         }