Disable 'Split && condition' if there is an 'else' statement.

pkg/analysis_server/test/services/correction/assist_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.correction.assist;
 
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/local_memory_index.dart';
@@ skipping 2202 matching lines @@
       print(0);
       if (3 == 3) {
         print(1);
       }
     }
   }
 }
 ''');
   }
 
-  void test_splitAndCondition_OK_thenBlock_elseBlock() {
-    _indexTestUnit('''
-main() {
-  if (true && false) {
-    print(0);
-  } else {
-    print(1);
-    if (2 == 2) {
-      print(2);
-    }
-  }
-}
-''');
-    assertHasAssistAt('&& false', AssistKind.SPLIT_AND_CONDITION, '''
-main() {
-  if (true) {
-    if (false) {
-      print(0);
-    } else {
-      print(1);
-      if (2 == 2) {
-        print(2);
-      }
-    }
-  }
-}
-''');
-  }
-
   void test_splitAndCondition_OK_thenStatement() {
     _indexTestUnit('''
 main() {
   if (true && false)
     print(0);
 }
 ''');
     assertHasAssistAt('&& false', AssistKind.SPLIT_AND_CONDITION, '''
 main() {
   if (true)
     if (false)
       print(0);
 }
 ''');
   }
 
-  void test_splitAndCondition_OK_thenStatement_elseStatement() {
-    _indexTestUnit('''
-main() {
-  if (true && false)
-    print(0);
-  else
-    print(1);
-}
-''');
-    assertHasAssistAt('&& false', AssistKind.SPLIT_AND_CONDITION, '''
-main() {
-  if (true)
-    if (false)
-      print(0);
-    else
-      print(1);
-}
-''');
-  }
-
   void test_splitAndCondition_wrong() {
     _indexTestUnit('''
 main() {
   if (1 == 1 && 2 == 2) {
     print(0);
   }
   print(3 == 3 && 4 == 4);
 }
 ''');
     // not binary expression
     assertNoAssistAt('main() {', AssistKind.SPLIT_AND_CONDITION);
     // selection is not empty and includes more than just operator
     {
       length = 5;
       assertNoAssistAt('&& 2 == 2', AssistKind.SPLIT_AND_CONDITION);
     }
   }
 
   void test_splitAndCondition_wrong_notAnd() {
     _indexTestUnit('''
 main() {
   if (1 == 1 || 2 == 2) {
     print(0);
   }
 }
 ''');
     assertNoAssistAt('|| 2', AssistKind.SPLIT_AND_CONDITION);
   }
 
+  void test_splitAndCondition_wrong_hasElse() {
+    _indexTestUnit('''
+main() {
+  if (1 == 1 && 2 == 2) {
+    print(1);
+  } else {
+    print(2);
+  }
+}
+''');
+    assertNoAssistAt('&& 2', AssistKind.SPLIT_AND_CONDITION);
+  }
+
   void test_splitAndCondition_wrong_notPartOfIf() {
     _indexTestUnit('''
 main() {
   print(1 == 1 && 2 == 2);
 }
 ''');
     assertNoAssistAt('&& 2', AssistKind.SPLIT_AND_CONDITION);
   }
 
   void test_splitAndCondition_wrong_notTopLevelAnd() {
@@ skipping 277 matching lines @@
   void _indexTestUnit(String code) {
     resolveTestUnit(code);
     index.indexUnit(context, testUnit);
   }
 
   void _setStartEndSelection() {
     offset = findOffset('// start\n') + '// start\n'.length;
     length = findOffset('// end') - offset;
   }
 }