Disable merging of 'if' statements when there are other staments in the outer one.

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 'dart:async';
 
 import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
 import 'package:analysis_server/plugin/protocol/protocol.dart';
@@ skipping 2666 matching lines @@
       print(0);
     } else {
       print(1);
     }
   }
 }
 ''');
     await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
   }
 
+  test_joinIfStatementInner_wrong_statementAfterInner() async {
+    resolveTestUnit('''
+main() {
+  if (1 == 1) {
+    if (2 == 2) {
+      print(2);
+    }
+    print(1);
+  }
+}
+''');
+    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+  }
+
+  test_joinIfStatementInner_wrong_statementBeforeInner() async {
+    resolveTestUnit('''
+main() {
+  if (1 == 1) {
+    print(1);
+    if (2 == 2) {
+      print(2);
+    }
+  }
+}
+''');
+    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+  }
+
   test_joinIfStatementInner_wrong_targetNotIf() async {
     resolveTestUnit('''
 main() {
   print(0);
 }
 ''');
     await assertNoAssistAt('print', DartAssistKind.JOIN_IF_WITH_INNER);
   }
 
   test_joinIfStatementInner_wrong_targetWithElse() async {
@@ skipping 210 matching lines @@
       print(0);
     }
   } else {
     print(1);
   }
 }
 ''');
     await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
   }
 
+  test_joinIfStatementOuter_wrong_statementAfterInner() async {
+    resolveTestUnit('''
+main() {
+  if (1 == 1) {
+    if (2 == 2) {
+      print(2);
+    }
+    print(1);
+  }
+}
+''');
+    await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
+  }
+
+  test_joinIfStatementOuter_wrong_statementBeforeInner() async {
+    resolveTestUnit('''
+main() {
+  if (1 == 1) {
+    print(1);
+    if (2 == 2) {
+      print(2);
+    }
+  }
+}
+''');
+    await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
+  }
+
   test_joinIfStatementOuter_wrong_targetNotIf() async {
     resolveTestUnit('''
 main() {
   print(0);
 }
 ''');
     await assertNoAssistAt('print', DartAssistKind.JOIN_IF_WITH_OUTER);
   }
 
   test_joinIfStatementOuter_wrong_targetWithElse() async {
@@ skipping 927 matching lines @@
       positions.add(new Position(testFile, offset));
     }
     return positions;
   }
 
   void _setStartEndSelection() {
     offset = findOffset('// start\n') + '// start\n'.length;
     length = findOffset('// end') - offset;
   }
 }