[DAS] Fixes closure cases for inline method refactor

[email protected], [email protected]

Fixes: #60160
Change-Id: Ie6313a92d5e4326b81ad0f277c5a8ff2c264ca39
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/410603
Commit-Queue: Phil Quitslund <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: FMorschel

pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart

@@ -826,6 +826,11 @@ class _ReturnsValidatorVisitor extends RecursiveAstVisitor<void> {
 
   _ReturnsValidatorVisitor(this.result);
 
+  @override
+  void visitFunctionExpression(FunctionExpression node) {
+    // Return statements within closures aren't counted.
+  }
+
   @override
   void visitReturnStatement(ReturnStatement node) {
     _numReturns++;

pkg/analysis_server/test/services/refactoring/legacy/inline_method_test.dart

@@ -1163,6 +1163,48 @@ void f() {
     expect(refactoring.inlineAll, false);
   }
 
+  Future<void> test_inner_bodyClosure() async {
+    await indexTestUnit('''
+int test() {
+  var c = () {
+    return 1;
+  };
+  return c();
+}
+void f() {
+  var res = test();
+}
+''');
+    _createRefactoring('test() {');
+    return _assertSuccessfulRefactoring('''
+void f() {
+  var c = () {
+    return 1;
+  };
+  var res = c();
+}
+''');
+  }
+
+  Future<void> test_inner_expressionClosure() async {
+    await indexTestUnit('''
+int test() {
+  var c = () => 1;
+  return c();
+}
+void f() {
+  var res = test();
+}
+''');
+    _createRefactoring('test() {');
+    return _assertSuccessfulRefactoring('''
+void f() {
+  var c = () => 1;
+  var res = c();
+}
+''');
+  }
+
   Future<void> test_intoStringInterpolation2_integerLiteral() async {
     await indexTestUnit(r'''
 void f() {