Simplify rules for extracting getters.

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

Index: pkg/analysis_server/test/services/refactoring/extract_method_test.dart
diff --git a/pkg/analysis_server/test/services/refactoring/extract_method_test.dart b/pkg/analysis_server/test/services/refactoring/extract_method_test.dart
index 13e7ed79872e0dedabc6ee7b7fa26316278d49e0..bec57bd0ada21e4e92346f8ed7261eb9ba881b41 100644
--- a/pkg/analysis_server/test/services/refactoring/extract_method_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/extract_method_test.dart
@@ -860,97 +860,72 @@ num res() => 1 + X;
 ''');
   }
 
-  test_getExtractGetter_false_do() async {
+  test_getExtractGetter_expression_true_binaryExpression() async {
     indexTestUnit('''
 main() {
-// start
-  int v = 0;
-  do {
-    v++;
-  } while (v < 10);
-// end
-  print(v);
+  print(1 + 2);
 }
 ''');
-    _createRefactoringForStartEndComments();
+    _createRefactoringForString('1 + 2');
     // apply refactoring
     await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, false);
+    expect(refactoring.createGetter, true);
   }
 
-  test_getExtractGetter_false_for() async {
+  test_getExtractGetter_expression_true_literal() async {
     indexTestUnit('''
 main() {
-// start
-  int v = 0;
-  for (int i = 0; i < 10; i++) {
-    v += i;
-  }
-// end
-  print(v);
+  print(42);
 }
 ''');
-    _createRefactoringForStartEndComments();
+    _createRefactoringForString('42');
     // apply refactoring
     await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, false);
+    expect(refactoring.createGetter, true);
   }
 
-  test_getExtractGetter_false_forEach() async {
+  test_getExtractGetter_expression_true_prefixedExpression() async {
     indexTestUnit('''
 main() {
-// start
-  int v = 0;
-  for (int i in [1, 2, 3]) {
-    v += i;
-  }
-// end
-  print(v);
+  print(!true);
 }
 ''');
-    _createRefactoringForStartEndComments();
+    _createRefactoringForString('!true');
     // apply refactoring
     await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, false);
+    expect(refactoring.createGetter, true);
   }
 
-  test_getExtractGetter_false_methodInvocation_expression() async {
+  test_getExtractGetter_expression_true_prefixedIdentifier() async {
     indexTestUnit('''
 main() {
-  int v = calculateSomething() + 5;
+  print(myValue.isEven);
 }
-int calculateSomething() => 42;
+int get myValue => 42;
 ''');
-    _createRefactoringForString('calculateSomething() + 5');
+    _createRefactoringForString('myValue.isEven');
     // apply refactoring
     await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, false);
+    expect(refactoring.createGetter, true);
   }
 
-  test_getExtractGetter_false_methodInvocation_statements() async {
+  test_getExtractGetter_expression_true_propertyAccess() async {
     indexTestUnit('''
 main() {
-// start
-  int v = calculateSomething();
-// end
-  print(v);
+  print(1.isEven);
 }
-int calculateSomething() => 42;
 ''');
-    _createRefactoringForStartEndComments();
+    _createRefactoringForString('1.isEven');
     // apply refactoring
     await assertRefactoringConditionsOK();
-    expect(refactoring.createGetter, false);
+    expect(refactoring.createGetter, true);
   }
 
-  test_getExtractGetter_false_while() async {
+  test_getExtractGetter_statements() async {
     indexTestUnit('''
 main() {
 // start
   int v = 0;
-  while (v < 10) {
-    v++;
-  }
 // end
   print(v);
 }
@@ -961,36 +936,6 @@ main() {
     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() {
@@ -1045,6 +990,19 @@ main() {
     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() {
@@ -1072,19 +1030,6 @@ main() {
     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) {