fix remove unused assignment fix in return statement (IDEA-132349)

java/java-impl/src/com/intellij/codeInspection/RemoveAssignmentFix.java

@@ -40,7 +40,7 @@ public class RemoveAssignmentFix extends RemoveInitializerFix {
     if (!(parent instanceof PsiAssignmentExpression)) return;
     final PsiExpression rExpression = ((PsiAssignmentExpression)parent).getRExpression();
     final PsiElement gParent = parent.getParent();
-    if ((gParent instanceof PsiExpression || gParent instanceof PsiExpressionList) && rExpression != null) {
+    if ((gParent instanceof PsiExpression || gParent instanceof PsiExpressionList || gParent instanceof PsiReturnStatement) && rExpression != null) {
       if (!FileModificationService.getInstance().prepareFileForWrite(gParent.getContainingFile())) return;
       if (gParent instanceof PsiParenthesizedExpression) {
         gParent.replace(rExpression);

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unusedAssignment/afterInReturnStatement.java

@@ -0,0 +1,11 @@
+// "Remove redundant assignment" "true"
+class A {
+  int v() {
+        int x;
+        return getValue();
+    }
+
+    private int getValue() {
+        return 0;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unusedAssignment/beforeInReturnStatement.java

@@ -0,0 +1,11 @@
+// "Remove redundant assignment" "true"
+class A {
+  int v() {
+        int x;
+        return <caret>x = getValue();
+    }
+
+    private int getValue() {
+        return 0;
+    }
+}