Migrate snippet support

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

Author: bwilkerson

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -533,6 +533,9 @@ lib/src/services/refactoring/legacy/naming_conventions.dart
 lib/src/services/refactoring/move_selected_formal_parameters_left.dart
 lib/src/services/snippets/dart/class_declaration.dart
 lib/src/services/snippets/dart/do_statement.dart
+lib/src/services/snippets/dart/flutter_stateful_widget.dart
+lib/src/services/snippets/dart/flutter_stateful_widget_with_animation.dart
+lib/src/services/snippets/dart/flutter_stateless_widget.dart
 lib/src/services/snippets/dart/for_in_statement.dart
 lib/src/services/snippets/dart/for_statement.dart
 lib/src/services/snippets/dart/function_declaration.dart
@@ -548,6 +551,8 @@ lib/src/services/snippets/dart/while_statement.dart
 lib/src/services/snippets/dart_snippet_request.dart
 lib/src/services/snippets/snippet.dart
 lib/src/services/snippets/snippet_context.dart
+lib/src/services/snippets/snippet_manager.dart
+lib/src/services/snippets/snippet_producer.dart
 lib/src/services/user_prompts/dart_fix_prompt_manager.dart
 lib/src/services/user_prompts/survey_manager.dart
 lib/src/services/user_prompts/user_prompts.dart
@@ -962,6 +967,7 @@ test/services/snippets/dart/test_definition_test.dart
 test/services/snippets/dart/test_group_definition_test.dart
 test/services/snippets/dart/try_catch_statement_test.dart
 test/services/snippets/dart/while_statement_test.dart
+test/services/snippets/snippet_manager_test.dart
 test/services/snippets/snippet_request_test.dart
 test/services/snippets/test_all.dart
 test/services/test_all.dart

pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget.dart

@@ -4,7 +4,7 @@
 
 import 'package:analysis_server/src/services/snippets/snippet.dart';
 import 'package:analysis_server/src/services/snippets/snippet_producer.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';
 
 /// Produces a [Snippet] that creates a Flutter StatefulWidget and related State
@@ -14,12 +14,12 @@ class FlutterStatefulWidget extends FlutterSnippetProducer
   static const prefix = 'stful';
   static const label = 'Flutter Stateful Widget';
 
-  late ClassElement? classStatefulWidget;
-  late ClassElement? classState;
+  late ClassElement2? classStatefulWidget;
+  late ClassElement2? classState;
   @override
-  late ClassElement? classBuildContext;
+  late ClassElement2? classBuildContext;
   @override
-  late ClassElement? classKey;
+  late ClassElement2? classKey;
 
   FlutterStatefulWidget(super.request, {required super.elementImportCache});
 
@@ -58,7 +58,7 @@ class FlutterStatefulWidget extends FlutterSnippetProducer
         builder.write('class _');
         builder.addSimpleLinkedEdit('name', widgetClassName);
         builder.write('State extends ');
-        builder.writeReference(classState);
+        builder.writeReference2(classState);
         builder.write('<');
         builder.addSimpleLinkedEdit('name', widgetClassName);
         builder.writeln('> {');

pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget_with_animation.dart

@@ -4,7 +4,7 @@
 
 import 'package:analysis_server/src/services/snippets/snippet.dart';
 import 'package:analysis_server/src/services/snippets/snippet_producer.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 
@@ -15,14 +15,14 @@ class FlutterStatefulWidgetWithAnimationController
   static const prefix = 'stanim';
   static const label = 'Flutter Widget with AnimationController';
 
-  late ClassElement? classStatefulWidget;
-  late ClassElement? classState;
+  late ClassElement2? classStatefulWidget;
+  late ClassElement2? classState;
   @override
-  late ClassElement? classBuildContext;
+  late ClassElement2? classBuildContext;
   @override
-  late ClassElement? classKey;
-  late ClassElement? classAnimationController;
-  late MixinElement? classSingleTickerProviderStateMixin;
+  late ClassElement2? classKey;
+  late ClassElement2? classAnimationController;
+  late MixinElement2? classSingleTickerProviderStateMixin;
 
   FlutterStatefulWidgetWithAnimationController(super.request,
       {required super.elementImportCache});
@@ -65,15 +65,15 @@ class FlutterStatefulWidgetWithAnimationController
         builder.write('class _');
         builder.addSimpleLinkedEdit('name', widgetClassName);
         builder.write('State extends ');
-        builder.writeReference(classState);
+        builder.writeReference2(classState);
         builder.write('<');
         builder.addSimpleLinkedEdit('name', widgetClassName);
         builder.writeln('>');
         builder.write('    with ');
-        builder.writeReference(classSingleTickerProviderStateMixin);
+        builder.writeReference2(classSingleTickerProviderStateMixin);
         builder.writeln(' {');
         builder.write('  late ');
-        builder.writeReference(classAnimationController);
+        builder.writeReference2(classAnimationController);
         builder.writeln(' _controller;');
         builder.writeln();
         {
@@ -87,7 +87,7 @@ class FlutterStatefulWidgetWithAnimationController
               builder.writeln('{');
               builder.writeln('    super.initState();');
               builder.write('    _controller = ');
-              builder.writeReference(classAnimationController);
+              builder.writeReference2(classAnimationController);
               builder.writeln('(vsync: this);');
               builder.writeln('  }');
             },

pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateless_widget.dart

@@ -4,7 +4,7 @@
 
 import 'package:analysis_server/src/services/snippets/snippet.dart';
 import 'package:analysis_server/src/services/snippets/snippet_producer.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';
 
 /// Produces a [Snippet] that creates a Flutter StatelessWidget.
@@ -13,11 +13,13 @@ class FlutterStatelessWidget extends FlutterSnippetProducer
   static const prefix = 'stless';
   static const label = 'Flutter Stateless Widget';
 
-  late ClassElement? classStatelessWidget;
+  late ClassElement2? classStatelessWidget;
+
   @override
-  late ClassElement? classBuildContext;
+  late ClassElement2? classBuildContext;
+
   @override
-  late ClassElement? classKey;
+  late ClassElement2? classKey;
 
   FlutterStatelessWidget(super.request, {required super.elementImportCache});
 

pkg/analysis_server/lib/src/services/snippets/snippet_manager.dart

@@ -25,11 +25,11 @@ import 'package:analysis_server/src/services/snippets/snippet.dart';
 import 'package:analysis_server/src/services/snippets/snippet_context.dart';
 import 'package:analysis_server/src/services/snippets/snippet_producer.dart';
 import 'package:analyzer/dart/analysis/session.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
 
 typedef SnippetProducerGenerator = SnippetProducer Function(DartSnippetRequest,
-    {required Map<Element, LibraryElement?> elementImportCache});
+    {required Map<Element2, LibraryElement2?> elementImportCache});
 
 /// [DartSnippetManager] determines if a snippet request is Dart specific
 /// and forwards those requests to all Snippet Producers that return `true` from
@@ -81,7 +81,7 @@ class DartSnippetManager {
       if (generators == null) {
         return snippets;
       }
-      var elementImportCache = <Element, LibraryElement?>{};
+      var elementImportCache = <Element2, LibraryElement2?>{};
       for (var generator in generators) {
         var producer =
             generator(request, elementImportCache: elementImportCache);

pkg/analysis_server/lib/src/services/snippets/snippet_producer.dart

@@ -8,7 +8,7 @@ import 'package:analysis_server/src/utilities/extensions/flutter.dart';
 import 'package:analysis_server_plugin/edit/correction_utils.dart';
 import 'package:analyzer/dart/analysis/code_style_options.dart';
 import 'package:analyzer/dart/analysis/features.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/analysis/session_helper.dart';
@@ -21,27 +21,27 @@ import 'package:meta/meta.dart';
 abstract class DartSnippetProducer extends SnippetProducer {
   final AnalysisSessionHelper sessionHelper;
   final CorrectionUtils utils;
-  final LibraryElement libraryElement;
+  final LibraryElement2 libraryElement;
   final bool useSuperParams;
 
   /// Elements that need to be imported for generated code to be valid.
   ///
   /// Calling [addImports] will add any required imports to the supplied
   /// builder.
-  final Set<Element> requiredElementImports = {};
+  final Set<Element2> requiredElementImports = {};
 
   /// A cache of mappings from Elements to their public Library Elements.
   ///
   /// Callers can share this cache across multiple snippet producers to avoid
   /// repeated searches where they may add imports for the same elements.
-  final Map<Element, LibraryElement?> _elementImportCache;
+  final Map<Element2, LibraryElement2?> _elementImportCache;
 
   DartSnippetProducer(super.request,
-      {required Map<Element, LibraryElement?> elementImportCache})
+      {required Map<Element2, LibraryElement2?> elementImportCache})
       : sessionHelper = AnalysisSessionHelper(request.analysisSession),
         utils = CorrectionUtils(request.unit),
-        libraryElement = request.unit.libraryElement,
-        useSuperParams = request.unit.libraryElement.featureSet
+        libraryElement = request.unit.libraryElement2,
+        useSuperParams = request.unit.libraryElement2.featureSet
             .isEnabled(Feature.super_parameters),
         _elementImportCache = elementImportCache;
 
@@ -56,34 +56,34 @@ abstract class DartSnippetProducer extends SnippetProducer {
   Future<void> addImports(DartFileEditBuilder builder) async {
     var dartBuilder = builder as DartFileEditBuilderImpl;
     await Future.wait(requiredElementImports.map((element) => dartBuilder
-        .importElementLibrary(element, resultCache: _elementImportCache)));
+        .importElementLibrary2(element, resultCache: _elementImportCache)));
   }
 }
 
 abstract class FlutterSnippetProducer extends DartSnippetProducer {
-  late ClassElement? classWidget;
-  late ClassElement? classPlaceholder;
+  late ClassElement2? classWidget;
+  late ClassElement2? classPlaceholder;
 
   FlutterSnippetProducer(super.request, {required super.elementImportCache});
 
-  Future<ClassElement?> getClass(String name) async {
-    var class_ = await sessionHelper.getFlutterClass(name);
+  Future<ClassElement2?> getClass(String name) async {
+    var class_ = await sessionHelper.getFlutterClass2(name);
     if (class_ != null) {
       requiredElementImports.add(class_);
     }
     return class_;
   }
 
-  Future<MixinElement?> getMixin(String name) async {
-    var mixin = await sessionHelper.getMixin(widgetsUri, name);
+  Future<MixinElement2?> getMixin(String name) async {
+    var mixin = await sessionHelper.getMixin2(widgetsUri, name);
     if (mixin != null) {
       requiredElementImports.add(mixin);
     }
     return mixin;
   }
 
   DartType getType(
-    InterfaceElement classElement, [
+    InterfaceElement2 classElement, [
     NullabilitySuffix nullabilitySuffix = NullabilitySuffix.none,
   ]) =>
       classElement.instantiate(
@@ -109,8 +109,8 @@ abstract class FlutterSnippetProducer extends DartSnippetProducer {
 /// A mixin that provides some common methods for producers that build snippets
 /// for Flutter widget classes.
 mixin FlutterWidgetSnippetProducerMixin on FlutterSnippetProducer {
-  ClassElement? get classBuildContext;
-  ClassElement? get classKey;
+  ClassElement2? get classBuildContext;
+  ClassElement2? get classKey;
   String get widgetClassName => 'MyWidget';
 
   void writeBuildMethod(DartEditBuilder builder) {

pkg/analysis_server/test/services/snippets/snippet_manager_test.dart

@@ -7,7 +7,7 @@ import 'package:analysis_server/src/services/snippets/snippet.dart';
 import 'package:analysis_server/src/services/snippets/snippet_context.dart';
 import 'package:analysis_server/src/services/snippets/snippet_manager.dart';
 import 'package:analysis_server/src/services/snippets/snippet_producer.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -78,7 +78,7 @@ class SnippetManagerTest extends AbstractSingleUnitTest {
       SnippetContext.inClass: [
         (
           context, {
-          required Map<Element, LibraryElement?> elementImportCache,
+          required Map<Element2, LibraryElement2?> elementImportCache,
         }) =>
             throw 'Tried to create producer for wrong context',
       ]
@@ -125,7 +125,7 @@ class _NotValidSnippetProducer extends SnippetProducer {
   Future<bool> isValid() async => false;
 
   static _NotValidSnippetProducer newInstance(DartSnippetRequest request,
-          {required Map<Element, LibraryElement?> elementImportCache}) =>
+          {required Map<Element2, LibraryElement2?> elementImportCache}) =>
       _NotValidSnippetProducer._(request);
 }
 
@@ -158,6 +158,6 @@ class _ValidSnippetProducer extends SnippetProducer {
   Future<bool> isValid() async => true;
 
   static _ValidSnippetProducer newInstance(DartSnippetRequest request,
-          {required Map<Element, LibraryElement?> elementImportCache}) =>
+          {required Map<Element2, LibraryElement2?> elementImportCache}) =>
       _ValidSnippetProducer._(request);
 }

pkg/analyzer/lib/src/dart/analysis/session_helper.dart

@@ -107,6 +107,20 @@ class AnalysisSessionHelper {
     return null;
   }
 
+  /// Return the [MixinElement] with the given [name] that is exported
+  /// from the library with the given [libraryUri], or `null` if the library
+  /// does not export a class with such name.
+  Future<MixinElement2?> getMixin2(String libraryUri, String name) async {
+    var libraryResult = await session.getLibraryByUri(libraryUri);
+    if (libraryResult is LibraryElementResult) {
+      var element = libraryResult.element2.exportNamespace.get2(name);
+      if (element is MixinElement2) {
+        return element;
+      }
+    }
+    return null;
+  }
+
   /// Return the resolved unit that declares the given [element].
   Future<ResolvedUnitResult?> getResolvedUnitByElement(Element element) async {
     var libraryPath = element.library!.source.fullName;