Support for 'Wrap with Xyz' for expressions in ExpressionFunctionBody.

[email protected]

Bug: flutter/flutter-intellij#3500
Change-Id: I9e14d6cd1a79070fd489740a881199707be83e90
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/103563
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/utilities/flutter.dart

@@ -284,6 +284,7 @@ class Flutter {
       if (isWidgetExpression(node)) {
         var parent = node.parent;
         if (parent is ArgumentList ||
+            parent is ExpressionFunctionBody && parent.expression == node ||
             parent is ListLiteral ||
             parent is NamedExpression && parent.expression == node ||
             parent is Statement) {

pkg/analysis_server/test/src/services/correction/assist/flutter_wrap_center_test.dart

@@ -79,6 +79,22 @@ class MyWidget extends StatelessWidget {
 main() {
   return Center(child: MyWidget.named());
 }
+''');
+  }
+
+  test_expressionFunctionBody() async {
+    addFlutterPackage();
+    await resolveTestUnit('''
+import 'package:flutter/widgets.dart';
+class FakeFlutter {
+  main() => /*caret*/Container();
+}
+''');
+    await assertHasAssist('''
+import 'package:flutter/widgets.dart';
+class FakeFlutter {
+  main() => Center(child: Container());
+}
 ''');
   }
 }

pkg/analysis_server/test/src/utilities/flutter_test.dart

@@ -279,6 +279,16 @@ void useWidget(Widget w) {}
     expect(flutter.identifyWidgetExpression(expression), expression);
   }
 
+  test_identifyWidgetExpression_parent_expressionFunctionBody() async {
+    await resolveTestUnit('''
+import 'package:flutter/widgets.dart';
+
+main(Widget widget) => widget; // ref
+''');
+    Expression expression = findNodeAtString("widget; // ref");
+    expect(flutter.identifyWidgetExpression(expression), expression);
+  }
+
   test_identifyWidgetExpression_parent_expressionStatement() async {
     await resolveTestUnit('''
 import 'package:flutter/widgets.dart';