commit ddd4f08bf41220b2568a850de2c69a7318c8a7f9
author Konstantin Shcheglov <scheglov@google.com> Thu Oct 10 20:34:03 2024 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 10 20:34:03 2024 +0000
tree 4174eda62bacac9127e0e0330ac3110a18323eab
parent 020427ad6b6b2127f9de9ecd59d2cf91b36db0d4

Elements. Migrate FlutterWrap and subclasses.

Change-Id: I0289719c1de376405a4c2fcb037484e39332ef15
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389406
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Phil Quitslund <pquitslund@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 2fa682d..3056585 100644
--- a/pkg/analysis_server/analyzer_use_new_elements.txt
+++ b/pkg/analysis_server/analyzer_use_new_elements.txt
@@ -326,6 +326,7 @@
 lib/src/services/correction/dart/flutter_remove_widget.dart
 lib/src/services/correction/dart/flutter_swap_with_child.dart
 lib/src/services/correction/dart/flutter_swap_with_parent.dart
+lib/src/services/correction/dart/flutter_wrap.dart
 lib/src/services/correction/dart/flutter_wrap_builder.dart
 lib/src/services/correction/dart/flutter_wrap_generic.dart
 lib/src/services/correction/dart/flutter_wrap_stream_builder.dart

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

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
index fe52584..334d3dc 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart
@@ -7,7 +7,7 @@
 import 'package:analysis_server/src/utilities/extensions/flutter.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/source/source_range.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer_plugin/utilities/assist/assist.dart';
@@ -228,15 +228,15 @@
     var selectedRange = range.startEnd(firstWidget, lastWidget);
     var src = utils.getRangeText(selectedRange);
     var parentClassElement =
-        await sessionHelper.getClass(_parentLibraryUri, _parentClassName);
-    var widgetClassElement = await sessionHelper.getFlutterClass('Widget');
+        await sessionHelper.getClass2(_parentLibraryUri, _parentClassName);
+    var widgetClassElement = await sessionHelper.getFlutterClass2('Widget');
     if (parentClassElement == null || widgetClassElement == null) {
       return;
     }
 
     await builder.addDartFileEdit(file, (builder) {
       builder.addReplacement(selectedRange, (builder) {
-        builder.writeReference(parentClassElement);
+        builder.writeReference2(parentClassElement);
         builder.write('(');
 
         var indentOld = utils.getLinePrefix(firstWidget.offset);
@@ -295,10 +295,10 @@
     // If the wrapper class is specified, find its element.
     var parentLibraryUri = _parentLibraryUri;
     var parentClassName = _parentClassName;
-    ClassElement? parentClassElement;
+    ClassElement2? parentClassElement;
     if (parentLibraryUri != null && parentClassName != null) {
       parentClassElement =
-          await sessionHelper.getClass(parentLibraryUri, parentClassName);
+          await sessionHelper.getClass2(parentLibraryUri, parentClassName);
       if (parentClassElement == null) {
         return;
       }
@@ -309,7 +309,7 @@
         if (parentClassElement == null) {
           builder.addSimpleLinkedEdit('WIDGET', 'widget');
         } else {
-          builder.writeReference(parentClassElement);
+          builder.writeReference2(parentClassElement);
         }
         builder.write('(');
         // When there's no linked edit for the widget name, leave the selection