Simplify rules for extracting getters.

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/src/protocol.dart';
 import 'package:analysis_server/src/services/correction/status.dart';
@@ skipping 842 matching lines @@
 var X = 1;
 
 var Y = () {
   return res();
 };
 
 num res() => 1 + X;
 ''');
   }
 
-  test_getExtractGetter_false_do() async {
+  test_getExtractGetter_expression_true_binaryExpression() async {
+    indexTestUnit('''
+main() {
+  print(1 + 2);
+}
+''');
+    _createRefactoringForString('1 + 2');
+    // apply refactoring
+    await assertRefactoringConditionsOK();
+    expect(refactoring.createGetter, true);
+  }
+
+  test_getExtractGetter_expression_true_literal() async {
+    indexTestUnit('''
+main() {
+  print(42);
+}
+''');
+    _createRefactoringForString('42');
+    // apply refactoring
+    await assertRefactoringConditionsOK();
+    expect(refactoring.createGetter, true);
+  }
+
+  test_getExtractGetter_expression_true_prefixedExpression() async {
+    indexTestUnit('''
+main() {
+  print(!true);
+}
+''');
+    _createRefactoringForString('!true');
+    // apply refactoring
+    await assertRefactoringConditionsOK();
+    expect(refactoring.createGetter, true);
+  }
+
+  test_getExtractGetter_expression_true_prefixedIdentifier() async {
+    indexTestUnit('''
+main() {
+  print(myValue.isEven);
+}
+int get myValue => 42;
+''');
+    _createRefactoringForString('myValue.isEven');
+    // apply refactoring
+    await assertRefactoringConditionsOK();
+    expect(refactoring.createGetter, true);
+  }
+
+  test_getExtractGetter_expression_true_propertyAccess() async {
+    indexTestUnit('''
+main() {
+  print(1.isEven);
+}
+''');
+    _createRefactoringForString('1.isEven');
+    // apply refactoring
+    await assertRefactoringConditionsOK();
+    expect(refactoring.createGetter, true);
+  }
+
+  test_getExtractGetter_statements() async {
     indexTestUnit('''
 main() {
 // start
   int v = 0;
-  do {
-    v++;
-  } while (v < 10);
 // end
   print(v);
 }
-''');
-    _createRefactoringForStartEndComments();
-    // apply refactoring
-    await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, false);
-  }
-
-  test_getExtractGetter_false_for() async {
-    indexTestUnit('''
-main() {
-// start
-  int v = 0;
-  for (int i = 0; i < 10; i++) {
-    v += i;
-  }
-// end
-  print(v);
-}
-''');
-    _createRefactoringForStartEndComments();
-    // apply refactoring
-    await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, false);
-  }
-
-  test_getExtractGetter_false_forEach() async {
-    indexTestUnit('''
-main() {
-// start
-  int v = 0;
-  for (int i in [1, 2, 3]) {
-    v += i;
-  }
-// end
-  print(v);
-}
-''');
-    _createRefactoringForStartEndComments();
-    // apply refactoring
-    await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, false);
-  }
-
-  test_getExtractGetter_false_methodInvocation_expression() async {
-    indexTestUnit('''
-main() {
-  int v = calculateSomething() + 5;
-}
-int calculateSomething() => 42;
-''');
-    _createRefactoringForString('calculateSomething() + 5');
-    // apply refactoring
-    await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, false);
-  }
-
-  test_getExtractGetter_false_methodInvocation_statements() async {
-    indexTestUnit('''
-main() {
-// start
-  int v = calculateSomething();
-// end
-  print(v);
-}
-int calculateSomething() => 42;
-''');
-    _createRefactoringForStartEndComments();
-    // apply refactoring
-    await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, false);
-  }
-
-  test_getExtractGetter_false_while() async {
-    indexTestUnit('''
-main() {
-// start
-  int v = 0;
-  while (v < 10) {
-    v++;
-  }
-// end
-  print(v);
-}
 ''');
     _createRefactoringForStartEndComments();
     // apply refactoring
     await assertRefactoringConditionsOK();
     expect(refactoring.createGetter, false);
   }
 
-  test_getExtractGetter_true_simpleBlock() async {
-    indexTestUnit('''
-main() {
-// start
-  int v = 1 + 2;
-// end
-  print(v);
-}
-''');
-    _createRefactoringForStartEndComments();
-    // apply refactoring
-    await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, true);
-  }
-
-  test_getExtractGetter_true_singleExpression() async {
-    indexTestUnit('''
-main() {
-// start
-  int v = 1 + 2;
-// end
-  print(v);
-}
-''');
-    _createRefactoringForString('1 + 2');
-    // apply refactoring
-    await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, true);
-  }
-
   test_getRefactoringName_function() {
     indexTestUnit('''
 main() {
   print(1 + 2);
 }
 ''');
     _createRefactoringForString('1 + 2');
     expect(refactoring.refactoringName, 'Extract Function');
   }
 
@@ skipping 34 matching lines @@
 }
 ''');
     _createRefactoringForString('1 +  2');
     // apply refactoring
     await refactoring.checkInitialConditions();
     expect(refactoring.offsets,
         unorderedEquals([findOffset('1 + 2'), findOffset('1 +  2')]));
     expect(refactoring.lengths, unorderedEquals([5, 6]));
   }
 
+  test_returnType_closure() async {
+    indexTestUnit('''
+process(f(x)) {}
+main() {
+  process((x) => x * 2);
+}
+''');
+    _createRefactoringForString('(x) => x * 2');
+    // do check
+    await refactoring.checkInitialConditions();
+    expect(refactoring.returnType, '');
+  }
+
   test_returnType_expression() async {
     indexTestUnit('''
 main() {
   int a = 1 + 2;
 }
 ''');
     _createRefactoringForString('1 + 2');
     // do check
     await refactoring.checkInitialConditions();
     expect(refactoring.returnType, 'int');
   }
 
   test_returnType_statements() async {
     indexTestUnit('''
 main() {
 // start
   double v = 5.0;
 // end
   print(v);
 }
 ''');
     _createRefactoringForStartEndComments();
     // do check
     await refactoring.checkInitialConditions();
     expect(refactoring.returnType, 'double');
   }
 
-  test_returnType_closure() async {
-    indexTestUnit('''
-process(f(x)) {}
-main() {
-  process((x) => x * 2);
-}
-''');
-    _createRefactoringForString('(x) => x * 2');
-    // do check
-    await refactoring.checkInitialConditions();
-    expect(refactoring.returnType, '');
-  }
-
   test_returnType_statements_nullMix() async {
     indexTestUnit('''
 main(bool p) {
 // start
   if (p) {
     return 42;
   }
   return null;
 // end
 }
@@ skipping 1454 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();
   }
 }