[DAS] New assists for wrap with Expanded/Flexible

[email protected]

Fixes #56648

Change-Id: I34a697d914e3a480105a4388d77178a96425893a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/390622
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: FMorschel

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

@@ -287,6 +287,16 @@ abstract final class DartAssistKind {
     DartAssistKindPriority.FLUTTER_WRAP_SPECIFIC,
     'Wrap with Container',
   );
+  static const FLUTTER_WRAP_EXPANDED = AssistKind(
+    'dart.assist.flutter.wrap.expanded',
+    DartAssistKindPriority.FLUTTER_WRAP_SPECIFIC,
+    'Wrap with Expanded',
+  );
+  static const FLUTTER_WRAP_FLEXIBLE = AssistKind(
+    'dart.assist.flutter.wrap.flexible',
+    DartAssistKindPriority.FLUTTER_WRAP_SPECIFIC,
+    'Wrap with Flexible',
+  );
   static const FLUTTER_WRAP_PADDING = AssistKind(
     'dart.assist.flutter.wrap.padding',
     DartAssistKindPriority.FLUTTER_WRAP_SPECIFIC,

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

@@ -7,6 +7,7 @@ import 'package:analysis_server/src/services/correction/selection_analyzer.dart'
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/utilities/extensions/flutter.dart';
@@ -30,6 +31,14 @@ class FlutterWrap extends MultiCorrectionProducer {
       if (!widgetType.isExactWidgetTypeContainer) {
         producers.add(_FlutterWrapContainer(widgetExpr, context: context));
       }
+      if (!widgetType.isExactWidgetTypeExpanded &&
+          (widgetExpr.isParentFlexWidget || !widgetExpr.isParentWidget)) {
+        producers.add(_FlutterWrapExpanded(widgetExpr, context: context));
+      }
+      if (!widgetType.isExactWidgetTypeFlexible &&
+          (widgetExpr.isParentFlexWidget || !widgetExpr.isParentWidget)) {
+        producers.add(_FlutterWrapFlexible(widgetExpr, context: context));
+      }
       if (!widgetType.isExactWidgetTypePadding) {
         producers.add(_FlutterWrapPadding(widgetExpr, context: context));
       }
@@ -138,6 +147,36 @@ class _FlutterWrapContainer extends _WrapSingleWidget {
   String get _parentLibraryUri => widgetsUri;
 }
 
+/// A correction processor that can make one of the possible changes computed by
+/// the [FlutterWrap] producer.
+class _FlutterWrapExpanded extends _WrapSingleWidget {
+  _FlutterWrapExpanded(super.widgetExpr, {required super.context});
+
+  @override
+  AssistKind get assistKind => DartAssistKind.FLUTTER_WRAP_EXPANDED;
+
+  @override
+  String get _parentClassName => 'Expanded';
+
+  @override
+  String get _parentLibraryUri => widgetsUri;
+}
+
+/// A correction processor that can make one of the possible changes computed by
+/// the [FlutterWrap] producer.
+class _FlutterWrapFlexible extends _WrapSingleWidget {
+  _FlutterWrapFlexible(super.widgetExpr, {required super.context});
+
+  @override
+  AssistKind get assistKind => DartAssistKind.FLUTTER_WRAP_FLEXIBLE;
+
+  @override
+  String get _parentClassName => 'Flexible';
+
+  @override
+  String get _parentLibraryUri => widgetsUri;
+}
+
 /// A correction processor that can make one of the possible changes computed by
 /// the [FlutterWrap] producer.
 class _FlutterWrapGeneric extends _WrapSingleWidget {
@@ -350,3 +389,53 @@ abstract class _WrapSingleWidget extends ResolvedCorrectionProducer {
     });
   }
 }
+
+extension on Expression {
+  /// Return `true` if the parent is a `Flex` widget creation.
+  ///
+  /// This is used to determine if the widget is wrapped in a `Row`, `Column`,
+  /// or `Flex` widget.
+  bool get isParentFlexWidget {
+    var parent = _getParentInstanceCreationExpression();
+    if (parent == null || !parent.isWidgetCreation) {
+      return false;
+    }
+    return parent.staticType.isWidgetFlexType;
+  }
+
+  /// Return `true` if the parent is a widget creation.
+  ///
+  /// This tells if this is a direct child of a widget creation.
+  /// It will return `false` if we are assigning this to a variable or
+  /// returning it from a function or other similar cases.
+  bool get isParentWidget {
+    var parent = _getParentInstanceCreationExpression();
+    return parent != null && parent.isWidgetCreation;
+  }
+
+  /// Return the parent `InstanceCreationExpression` if it exists.
+  ///
+  /// This is used to find the parent widget creation if it exists.
+  InstanceCreationExpression? _getParentInstanceCreationExpression() {
+    var self = this;
+    NamedExpression? namedExpression;
+    if (self.parent case ListLiteral listLiteral) {
+      if (listLiteral.parent case NamedExpression parent) {
+        namedExpression = parent;
+      }
+    }
+    // NamedExpression (child:), ArgumentList, InstanceCreationExpression
+    if ((namedExpression ?? self.parent)?.parent?.parent
+        case InstanceCreationExpression parent?) {
+      return parent;
+    }
+    return null;
+  }
+}
+
+extension on DartType? {
+  bool get isWidgetFlexType {
+    var self = this;
+    return self is InterfaceType && self.element3.isFlexWidget;
+  }
+}