Issue 25616. Support for extracting methods with function-typed parameters.

pkg/analysis_server/test/services/refactoring/extract_method_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library test.services.refactoring.extract_method;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/services/correction/status.dart';
@@ skipping 157 matching lines @@
 }
 ''');
     _createRefactoringForString('super()');
     return _assertConditionsFatal(
         'Cannot extract a constructor initializer. Select expression part of initializer.');
   }
 
   test_bad_doWhile_body() {
     indexTestUnit('''
 main() {
-  do 
+  do
 // start
-  { 
+  {
   }
 // end
   while (true);
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Operation not applicable to a 'do' statement's body and expression.");
   }
 
   test_bad_emptySelection() {
     indexTestUnit('''
 main() {
 // start
 // end
   print(0);
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Can only extract a single expression or a set of statements.");
   }
 
   test_bad_forLoop_conditionAndUpdaters() {
     indexTestUnit('''
 main() {
-  for ( 
+  for (
     int i = 0;
 // start
-    i < 10; 
+    i < 10;
     i++
 // end
   ) {}
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Operation not applicable to a 'for' statement's condition and updaters.");
   }
 
   test_bad_forLoop_init() {
     indexTestUnit('''
 main() {
-  for ( 
+  for (
 // start
     int i = 0
 // end
     ; i < 10;
     i++
   ) {}
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Cannot extract initialization part of a 'for' statement.");
   }
 
   test_bad_forLoop_initAndCondition() {
     indexTestUnit('''
 main() {
-  for ( 
+  for (
 // start
     int i = 0;
     i < 10;
 // end
     i++
   ) {}
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Operation not applicable to a 'for' statement's initializer and condition.");
   }
 
   test_bad_forLoop_updaters() {
     indexTestUnit('''
 main() {
-  for ( 
+  for (
     int i = 0;
     i < 10;
 // start
     i++
 // end
   ) {}
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Cannot extract increment part of a 'for' statement.");
   }
 
   test_bad_forLoop_updatersAndBody() {
     indexTestUnit('''
 main() {
-  for ( 
+  for (
     int i = 0;
     i < 10;
 // start
     i++
   ) {}
 // end
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
@@ skipping 56 matching lines @@
 ''');
     _createRefactoringForStartEndComments();
     refactoring.name = 'bad-name';
     // check conditions
     return _assertConditionsFatal("Method name must not contain '-'.");
   }
 
   test_bad_notSameParent() {
     indexTestUnit('''
 main() {
-  while (false) 
+  while (false)
 // start
-  { 
-  } 
+  {
+  }
   print(0);
 // end
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         'Not all selected statements are enclosed by the same parent statement.');
   }
 
   test_bad_parameterName_duplicate() async {
@@ skipping 134 matching lines @@
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Ambiguous return value: Selected block contains assignment(s) to "
         "local variables and return statement.");
   }
 
   test_bad_switchCase() {
     indexTestUnit('''
 main() {
-  switch (1) { 
+  switch (1) {
 // start
     case 0: break;
 // end
   }
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Selection must either cover whole switch statement "
         "or parts of a single case block.");
@@ skipping 24 matching lines @@
 ''');
     _createRefactoringForStartEndString('); // marker', '// end');
     return _assertConditionsFatal(
         "The beginning of the selection contains characters that do not belong to a statement.");
   }
 
   test_bad_try_catchBlock_block() {
     indexTestUnit('''
 main() {
   try
-  {} 
+  {}
   catch (e)
 // start
   {}
 // end
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Selection must either cover whole try statement or "
         "parts of try, catch, or finally block.");
   }
 
   test_bad_try_catchBlock_complete() {
     indexTestUnit('''
 main() {
   try
-  {} 
+  {}
 // start
   catch (e)
   {}
 // end
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Selection must either cover whole try statement or "
         "parts of try, catch, or finally block.");
   }
 
   test_bad_try_catchBlock_exception() {
     indexTestUnit('''
 main() {
   try {
-  } catch ( 
+  } catch (
 // start
   e
 // end
   ) {
   }
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         'Cannot extract the name part of a declaration.');
   }
 
   test_bad_try_finallyBlock() {
     indexTestUnit('''
 main() {
   try
-  {} 
+  {}
   finally
 // start
   {}
 // end
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Selection must either cover whole try statement or "
         "parts of try, catch, or finally block.");
   }
 
   test_bad_try_tryBlock() {
     indexTestUnit('''
 main() {
   try
 // start
-  {} 
+  {}
 // end
   finally
   {}
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Selection must either cover whole try statement or "
         "parts of try, catch, or finally block.");
   }
 
   test_bad_typeReference() {
     indexTestUnit('''
 main() {
   int a = 0;
 }
 ''');
     _createRefactoringForString("int");
     return _assertConditionsFatal("Cannot extract a single type reference.");
   }
 
   test_bad_variableDeclarationFragment() {
     indexTestUnit('''
 main() {
-  int 
+  int
 // start
     a = 1
 // end
     ,b = 2;
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Cannot extract a variable declaration fragment. Select whole declaration statement.");
   }
 
   test_bad_while_conditionAndBody() {
     indexTestUnit('''
 main() {
-  while 
+  while
 // start
-    (false) 
-  { 
-  } 
+    (false)
+  {
+  }
 // end
 }
 ''');
     _createRefactoringForStartEndComments();
     return _assertConditionsFatal(
         "Operation not applicable to a while statement's expression and body.");
   }
 
   test_canExtractGetter_false_closure() async {
     indexTestUnit('''
@@ skipping 1781 matching lines @@
   res(v);
 // end
 }
 
 void res(Future<int> v) {
   print(v);
 }
 ''');
   }
 
+  test_statements_parameters_localFunction() {
+    _addLibraryReturningAsync();
+    indexTestUnit('''
+class C {
+  int f(int a) {
+    int callback(int x, int y) => x + a;
+    int b = a + 1;
+// start
+    int c = callback(b, 2);
+// end
+    int d = c + 1;
+    return d;
+  }
+}''');
+    _createRefactoringForStartEndComments();
+    // apply refactoring
+    return _assertSuccessfulRefactoring('''
+class C {
+  int f(int a) {
+    int callback(int x, int y) => x + a;
+    int b = a + 1;
+// start
+    int c = res(callback, b);
+// end
+    int d = c + 1;
+    return d;
+  }
+
+  int res(int callback(int x, int y), int b) {
+    int c = callback(b, 2);
+    return c;
+  }
+}''');
+  }
+
   test_statements_parameters_noLocalVariableConflict() async {
     indexTestUnit('''
 int f(int x) {
   int y = x + 1;
 // start
   if (y % 2 == 0) {
     int y = x + 2;
     return y;
   } else {
     return y;
@@ skipping 320 matching lines @@
    * Returns a deep copy of [refactoring] parameters.
    * There was a bug masked by updating parameter instances shared between the
    * refactoring and the test.
    */
   List<RefactoringMethodParameter> _getParametersCopy() {
     return refactoring.parameters.map((p) {
       return new RefactoringMethodParameter(p.kind, p.type, p.name, id: p.id);
     }).toList();
   }
 }