[DAS] Refactors all wrap with builders to the same implementation

R=pquitslund@google.com

Fixes: #60075
Change-Id: I177830361f080e11321f8bd0c85929ab9b3871ae
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/408860
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Phil Quitslund <pquitslund@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Auto-Submit: Felipe Morschel <git@fmorschel.dev>

Author: FMorschel

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

@@ -56,10 +56,7 @@ import 'package:analysis_server/src/services/correction/dart/flutter_swap_with_c
 import 'package:analysis_server/src/services/correction/dart/flutter_swap_with_parent.dart';
 import 'package:analysis_server/src/services/correction/dart/flutter_wrap.dart';
 import 'package:analysis_server/src/services/correction/dart/flutter_wrap_builder.dart';
-import 'package:analysis_server/src/services/correction/dart/flutter_wrap_future_builder.dart';
 import 'package:analysis_server/src/services/correction/dart/flutter_wrap_generic.dart';
-import 'package:analysis_server/src/services/correction/dart/flutter_wrap_stream_builder.dart';
-import 'package:analysis_server/src/services/correction/dart/flutter_wrap_value_listenable_builder.dart';
 import 'package:analysis_server/src/services/correction/dart/import_add_show.dart';
 import 'package:analysis_server/src/services/correction/dart/inline_invocation.dart';
 import 'package:analysis_server/src/services/correction/dart/invert_conditional_expression.dart';
@@ -142,11 +139,7 @@ const Set<ProducerGenerator> _builtInGenerators = {
   FlutterRemoveWidget.new,
   FlutterSwapWithChild.new,
   FlutterSwapWithParent.new,
-  FlutterWrapBuilder.new,
-  FlutterWrapFutureBuilder.new,
   FlutterWrapGeneric.new,
-  FlutterWrapStreamBuilder.new,
-  FlutterWrapValueListenableBuilder.new,
   ImportAddShow.new,
   InlineInvocation.new,
   InvertConditionalExpression.new,
@@ -171,6 +164,7 @@ const Set<ProducerGenerator> _builtInGenerators = {
 /// The set of built-in multi-generators used to produce assists.
 const Set<MultiProducerGenerator> _builtInMultiGenerators = {
   FlutterWrap.new,
+  FlutterWrapBuilders.new,
   SurroundWith.new,
 };
 

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

@@ -5,41 +5,68 @@
 import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
+import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/utilities/extensions/flutter.dart';
 import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
-// TODO(bkonyi): share common implementation between the various builder wrappers
-// See https://github.com/dart-lang/sdk/issues/60075
-class FlutterWrapBuilder extends ResolvedCorrectionProducer {
-  FlutterWrapBuilder({required super.context});
+class FlutterWrapBuilders extends MultiCorrectionProducer {
+  FlutterWrapBuilders({required super.context});
 
   @override
-  CorrectionApplicability get applicability =>
-          // TODO(applicability): comment on why.
-          CorrectionApplicability
-          .singleLocation;
+  Future<List<ResolvedCorrectionProducer>> get producers async {
+    var producers = <ResolvedCorrectionProducer>[];
+    var widgetExpr = node.findWidgetExpression;
+    if (widgetExpr != null) {
+      producers.add(_FlutterWrapBuilder(context: context));
+      producers.add(_FlutterWrapValueListenableBuilder(context: context));
+      producers.add(_FlutterWrapStreamBuilder(context: context));
+      producers.add(_FlutterWrapFutureBuilder(context: context));
+    }
+    return producers;
+  }
+}
+
+abstract class _FlutterBaseWrapBuilder extends ResolvedCorrectionProducer {
+  final List<String> extraBuilderParams;
+  final List<String> extraNamedParams;
+  final String builderName;
+
+  _FlutterBaseWrapBuilder({
+    required super.context,
+    required this.builderName,
+    required this.extraNamedParams,
+    required this.extraBuilderParams,
+  });
 
   @override
-  AssistKind get assistKind => DartAssistKind.FLUTTER_WRAP_BUILDER;
+  CorrectionApplicability get applicability =>
+      // TODO(applicability): comment on why.
+      CorrectionApplicability.singleLocation;
+
+  bool canWrapOn(TypeImpl typeOrThrow) {
+    return !typeOrThrow.isExactWidgetTypeBuilder;
+  }
 
   @override
   Future<void> compute(ChangeBuilder builder) async {
     var widgetExpr = node.findWidgetExpression;
     if (widgetExpr == null) {
       return;
     }
-    if (widgetExpr.typeOrThrow.isExactWidgetTypeBuilder) {
+    if (!canWrapOn(widgetExpr.typeOrThrow)) {
       return;
     }
     var widgetSrc = utils.getNodeText(widgetExpr);
 
-    var builderElement = await sessionHelper.getFlutterClass('Builder');
+    var builderElement = await sessionHelper.getFlutterClass(builderName);
     if (builderElement == null) {
       return;
     }
 
+    var params = ['context', ...extraBuilderParams];
+
     await builder.addDartFileEdit(file, (builder) {
       builder.addReplacement(range.node(widgetExpr), (builder) {
         builder.writeReference(builderElement);
@@ -50,8 +77,17 @@ class FlutterWrapBuilder extends ResolvedCorrectionProducer {
         var indentNew1 = indentOld + utils.oneIndent;
         var indentNew2 = indentOld + utils.twoIndents;
 
+        var namedParams = extraNamedParams.join(', ');
+
+        if (namedParams.isNotEmpty) {
+          builder.write(indentNew1);
+          builder.write('$namedParams: ');
+          builder.addSimpleLinkedEdit('variable', namedParams);
+          builder.writeln(',');
+        }
+
         builder.write(indentNew1);
-        builder.writeln('builder: (context) {');
+        builder.writeln('builder: (${params.join(', ')}) {');
 
         widgetSrc = utils.replaceSourceIndent(widgetSrc, indentOld, indentNew2);
         builder.write(indentNew2);
@@ -69,3 +105,52 @@ class FlutterWrapBuilder extends ResolvedCorrectionProducer {
     });
   }
 }
+
+class _FlutterWrapBuilder extends _FlutterBaseWrapBuilder {
+  _FlutterWrapBuilder({required super.context})
+    : super(
+        builderName: 'Builder',
+        extraNamedParams: const [],
+        extraBuilderParams: const [],
+      );
+
+  @override
+  AssistKind get assistKind => DartAssistKind.FLUTTER_WRAP_BUILDER;
+}
+
+class _FlutterWrapFutureBuilder extends _FlutterBaseWrapBuilder {
+  _FlutterWrapFutureBuilder({required super.context})
+    : super(
+        builderName: 'FutureBuilder',
+        extraNamedParams: const ['future'],
+        extraBuilderParams: const ['asyncSnapshot'],
+      );
+
+  @override
+  AssistKind get assistKind => DartAssistKind.FLUTTER_WRAP_FUTURE_BUILDER;
+}
+
+class _FlutterWrapStreamBuilder extends _FlutterBaseWrapBuilder {
+  _FlutterWrapStreamBuilder({required super.context})
+    : super(
+        builderName: 'StreamBuilder',
+        extraNamedParams: const ['stream'],
+        extraBuilderParams: const ['asyncSnapshot'],
+      );
+
+  @override
+  AssistKind get assistKind => DartAssistKind.FLUTTER_WRAP_STREAM_BUILDER;
+}
+
+class _FlutterWrapValueListenableBuilder extends _FlutterBaseWrapBuilder {
+  _FlutterWrapValueListenableBuilder({required super.context})
+    : super(
+        builderName: 'ValueListenableBuilder',
+        extraNamedParams: const ['valueListenable'],
+        extraBuilderParams: const ['value', 'child'],
+      );
+
+  @override
+  AssistKind get assistKind =>
+      DartAssistKind.FLUTTER_WRAP_VALUE_LISTENABLE_BUILDER;
+}