commit 434d6bc168db8101efc5a1332fbf1111deb0818e
author Konstantin Shcheglov <scheglov@google.com> Thu Oct 10 20:25:09 2024 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 10 20:25:09 2024 +0000
tree 189ac53c7708cb9bf9885a97ca002d5421d599b4
parent 8a868ed3684bf51f9374a742047ff221f773edb8

Elements. Migrate ChangeToStaticAccess.

Change-Id: I1c5b9fa8e0cbab50ab418c3a6cbdaafbe2dbbe6f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389563
Reviewed-by: Phil Quitslund <pquitslund@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

pkg/analysis_server/analyzer_use_new_elements.txt

diff --git a/pkg/analysis_server/analyzer_use_new_elements.txt b/pkg/analysis_server/analyzer_use_new_elements.txt
index 965b061..2fa682d 100644
--- a/pkg/analysis_server/analyzer_use_new_elements.txt
+++ b/pkg/analysis_server/analyzer_use_new_elements.txt
@@ -251,6 +251,7 @@
 lib/src/services/correction/dart/assign_to_local_variable.dart
 lib/src/services/correction/dart/change_argument_name.dart
 lib/src/services/correction/dart/change_to_nearest_precise_value.dart
+lib/src/services/correction/dart/change_to_static_access.dart
 lib/src/services/correction/dart/change_type_annotation.dart
 lib/src/services/correction/dart/convert_add_all_to_spread.dart
 lib/src/services/correction/dart/convert_class_to_enum.dart

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

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/change_to_static_access.dart b/pkg/analysis_server/lib/src/services/correction/dart/change_to_static_access.dart
index bdbe265..ce1ad27 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/change_to_static_access.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/change_to_static_access.dart
@@ -5,7 +5,7 @@
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -29,43 +29,43 @@
   @override
   Future<void> compute(ChangeBuilder builder) async {
     Expression? target;
-    Element? invokedElement;
+    Element2? invokedElement;
     var identifier = node;
     if (identifier is SimpleIdentifier) {
       var parent = identifier.parent;
       if (parent is MethodInvocation) {
         if (parent.methodName == identifier) {
           target = parent.target;
-          invokedElement = identifier.staticElement;
+          invokedElement = identifier.element;
         }
       } else if (parent is PrefixedIdentifier) {
         if (parent.identifier == identifier) {
           target = parent.prefix;
-          invokedElement = identifier.staticElement;
+          invokedElement = identifier.element;
         }
       }
     }
-    if (target == null || invokedElement is! ExecutableElement) {
+    if (target == null || invokedElement is! ExecutableElement2) {
       return;
     }
 
     var target_final = target;
-    var declaringElement = invokedElement.enclosingElement3;
+    var declaringElement = invokedElement.enclosingElement2;
 
-    if (declaringElement is InterfaceElement) {
+    if (declaringElement is InterfaceElement2) {
       _className = declaringElement.name;
       await builder.addDartFileEdit(file, (builder) {
         builder.addReplacement(range.node(target_final), (builder) {
-          builder.writeReference(declaringElement);
+          builder.writeReference2(declaringElement);
         });
       });
-    } else if (declaringElement is ExtensionElement) {
+    } else if (declaringElement is ExtensionElement2) {
       var extensionName = declaringElement.name;
       if (extensionName != null) {
         _className = extensionName;
         await builder.addDartFileEdit(file, (builder) {
           builder.addReplacement(range.node(target_final), (builder) {
-            builder.writeReference(declaringElement);
+            builder.writeReference2(declaringElement);
           });
         });
       }