IDEA-168343 Suggest to change called method return type when used in return statement

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightFixUtil.java

@@ -231,11 +231,15 @@ public class HighlightFixUtil {
     for (IntentionAction action : getChangeVariableTypeFixes(parameter, itemType)) {
       QuickFixAction.registerQuickFixAction(highlightInfo, action);
     }
+    registerChangeReturnTypeFix(highlightInfo, expr, parameter.getType());
+  }
+
+  static void registerChangeReturnTypeFix(@NotNull HighlightInfo highlightInfo, @Nullable PsiExpression expr, @NotNull PsiType toType) {
     if (expr instanceof PsiMethodCallExpression) {
       final PsiMethod method = ((PsiMethodCallExpression)expr).resolveMethod();
       if (method != null) {
         QuickFixAction.registerQuickFixAction(highlightInfo, PriorityActionWrapper
-          .lowPriority(method, QUICK_FIX_FACTORY.createMethodReturnFix(method, parameter.getType(), true)));
+          .lowPriority(method, QUICK_FIX_FACTORY.createMethodReturnFix(method, toType, true)));
       }
     }
   }

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java

@@ -499,6 +499,7 @@ public class HighlightUtil extends HighlightUtilBase {
       QuickFixAction.registerQuickFixAction(highlightInfo, QUICK_FIX_FACTORY.createWrapWithAdapterFix(lType, expression));
       AddTypeArgumentsConditionalFix.register(highlightInfo, expression, lType);
       HighlightFixUtil.registerCollectionToArrayFixAction(highlightInfo, rType, lType, expression);
+      HighlightFixUtil.registerChangeReturnTypeFix(highlightInfo, expression, lType);
     }
     ChangeNewOperatorTypeFix.register(highlightInfo, expression, lType);
     return highlightInfo;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn/afterReturnAnotherMethod.java

@@ -0,0 +1,10 @@
+// "Make 'bar' return 'java.lang.String'" "true"
+public class Foo {
+  String foo() {
+    return bar();
+  }
+
+  String bar() {
+      return null;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn/beforeReturnAnotherMethod.java

@@ -0,0 +1,9 @@
+// "Make 'bar' return 'java.lang.String'" "true"
+public class Foo {
+  String foo() {
+    return <caret>bar();
+  }
+
+  void bar() {
+  }
+}