Fix for 'Replace if-else with conditional expression' in case of mixed expression/return branches.

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 185 matching lines @@
 }
 ''');
     assertHasAssistAt('item in', AssistKind.ADD_TYPE_ANNOTATION, '''
 main(List<String> items) {
   for (final String item in items) {
   }
 }
 ''');
   }
 
-  void test_addTypeAnnotation_local_OK_onVariableDeclarationStatement() {
-    _indexTestUnit('''
-main() {
-  var v = 123; // marker
-}
-''');
-    assertHasAssistAt(' // marker', AssistKind.ADD_TYPE_ANNOTATION, '''
-main() {
-  int v = 123; // marker
-}
-''');
-  }
-
   void test_addTypeAnnotation_local_OK_Function() {
     _indexTestUnit('''
 main() {
   var v = () => 1;
 }
 ''');
     assertHasAssistAt('v =', AssistKind.ADD_TYPE_ANNOTATION, '''
 main() {
   Function v = () => 1;
 }
@@ skipping 58 matching lines @@
   var v = 0;
 }
 ''');
     assertHasAssistAt('var ', AssistKind.ADD_TYPE_ANNOTATION, '''
 main() {
   int v = 0;
 }
 ''');
   }
 
+  void test_addTypeAnnotation_local_OK_onVariableDeclarationStatement() {
+    _indexTestUnit('''
+main() {
+  var v = 123; // marker
+}
+''');
+    assertHasAssistAt(' // marker', AssistKind.ADD_TYPE_ANNOTATION, '''
+main() {
+  int v = 123; // marker
+}
+''');
+  }
+
   void test_addTypeAnnotation_local_wrong_hasTypeAnnotation() {
     _indexTestUnit('''
 main() {
   int v = 42;
 }
 ''');
     assertNoAssistAt(' = 42', AssistKind.ADD_TYPE_ANNOTATION);
   }
 
   void test_addTypeAnnotation_local_wrong_multiple() {
@@ skipping 1666 matching lines @@
     assertHasAssistAt(
         'if (true)',
         AssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL,
         '''
 main() {
   return true ? 111 : 222;
 }
 ''');
   }
 
+  void test_replaceIfElseWithConditional_wrong_expressionVsReturn() {
+    _indexTestUnit('''
+main() {
+  if (true) {
+    print(42);
+  } else {
+    return;
+  }
+}
+''');
+    assertNoAssistAt('else', AssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
+  }
+
   void test_replaceIfElseWithConditional_wrong_notIfStatement() {
     _indexTestUnit('''
 main() {
   print(0);
 }
 ''');
     assertNoAssistAt('print', AssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
   }
 
   void test_replaceIfElseWithConditional_wrong_notSingleStatememt() {
@@ skipping 440 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;
   }
 }