Java inspection: Updated messages for "Move return to computation", added tests for 'switch' (IDEA-121153)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterBreakFromLoopInTryWithResources.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 's'" "true"
+// "Move 'return' closer to computation of the value of 's'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterDoWhileTrue.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f() {
         String r = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterForBreakComment.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int a[]) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterForWithoutCondition.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f() {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterIfComment.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 's'" "true"
+// "Move 'return' closer to computation of the value of 's'" "true"
 class T {
     int f(String a) {
         String s = a;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterIfElseThrow.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterIfElseWriteInBoth.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterIfElseWriteInElse.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterIfElseWriteInIf.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterIfThrowElse.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterIfTryCatch.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b, boolean c) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterLabeledBlock.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterLabeledFor.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int[] a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterLabeledFor2.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int[] a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterLabeledIf.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterNestedBlock.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f() {
         int n;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterNestedBlockSideEffect.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f() {
         int n;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterNestedIf.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean a, boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterNestedIfInnerElse.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean a, boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterNestedIfOuterElse.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean a, boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterReturnOutsideTryWithResources.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 's'" "true"
+// "Move 'return' closer to computation of the value of 's'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleDoWhile.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f(String a) {
         String r = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleFor.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int[] a, int b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleForeach.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f(String[] a) {
         String r = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleIf.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleIfDefaultValueComputed.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = g();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleIfDefaultValueParameter.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b, int d) {
         int n = d;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleWhile.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f() {
         String r = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSwitch1.java

@@ -0,0 +1,13 @@
+// "Move 'return' closer to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        switch (a) {
+            case 1:
+                return 2;
+            case 2:
+                return 4;
+        }
+        return n;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSwitch2.java

@@ -0,0 +1,13 @@
+// "Move 'return' closer to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        switch (a) {
+            case 1:
+                return 2;
+            case 2:
+                return 4;
+        }
+        return n;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSwitch3.java

@@ -0,0 +1,14 @@
+// "Move 'return' closer to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        switch (a) {
+            case 1:
+                return 2;
+            case 2:
+                return 4;
+            default:
+                return 0;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSwitch4.java

@@ -0,0 +1,16 @@
+// "Move 'return' closer to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        switch (a) {
+            case 1:
+                return 2;
+            case 2:
+                return 4;
+            default:
+                return 0;
+            case 0:
+        }
+        return n;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSwitch5.java

@@ -0,0 +1,14 @@
+// "Move 'return' closer to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        switch (a) {
+            case 1:
+                return 2;
+            default:
+                return 0;
+            case 2:
+                return 4;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterTryCatchAssign.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterTryCatchFinally1.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterTryCatchFinally2.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterTryCatchFinally5.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterTryCatchFinally6.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterTryCatchRethrow.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterTryCatchReturn.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterTryWhile1.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f(String p) {
         String r = null;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterTryWhile2.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f(String p) {
         String r = null;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterWhileBreak1.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterWhileBreak2.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterWhileContinue.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterWhileContinue1.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterWhileContinue2.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterWhileTrue.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     long f() {
         long r;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeAssert.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "false"
+// "Move 'return' closer to computation of the value of 'n'" "false"
 class T {
     int f(int a) {
         int n = a;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeAssignmentChainUnderIf.java

@@ -0,0 +1,15 @@
+// "Move 'return' closer to computation of the value of 'n'" "false"
+class T {
+  int x;
+  int y;
+
+  int f(int a) {
+    int n = -1;
+    if (a != 0) {
+      n = a;
+      n = 31 * x + n;
+      n = 31 * y + n;
+    }
+    re<caret>turn n;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeBreakFromLoopInTryWithResources.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 's'" "true"
+// "Move 'return' closer to computation of the value of 's'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeDoWhileTrue.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f() {
         String r = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeForBreakComment.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int a[]) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeForWithoutCondition.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f() {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeHashCode.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'result'" "false"
+// "Move 'return' closer to computation of the value of 'result'" "false"
 class T {
     int size;
     int width;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeIfComment.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 's'" "true"
+// "Move 'return' closer to computation of the value of 's'" "true"
 class T {
     int f(String a) {
         String s = a;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeIfElseNoWrite.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "false"
+// "Move 'return' closer to computation of the value of 'n'" "false"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeIfElseThrow.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeIfElseWriteInBoth.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeIfElseWriteInElse.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeIfElseWriteInIf.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeIfThrow.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "false"
+// "Move 'return' closer to computation of the value of 'n'" "false"
 class T {
   int f(boolean b) {
     int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeIfThrowElse.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeIfTryCatch.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b, boolean c) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeLabeledBlock.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeLabeledFor.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int[] a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeLabeledFor2.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int[] a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeLabeledIf.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedBlock.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f() {
         int n;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedBlockSideEffect.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f() {
         int n;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIf.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean a, boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIfInnerElse.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean a, boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIfOuterElse.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean a, boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeReturnOutsideTryWithResources.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 's'" "true"
+// "Move 'return' closer to computation of the value of 's'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleDoWhile.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f(String a) {
         String r = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleFor.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int[] a, int b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleForeach.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f(String[] a) {
         String r = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleIf.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleIfDefaultValueComputed.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = g();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleIfDefaultValueParameter.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b, int d) {
         int n = d;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleWhile.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f() {
         String r = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSwitch1.java

@@ -0,0 +1,15 @@
+// "Move 'return' closer to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        switch (a) {
+            case 1:
+                n = 2;
+                break;
+            case 2:
+                n = 4;
+                break;
+        }
+        r<caret>eturn n;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSwitch2.java

@@ -0,0 +1,14 @@
+// "Move 'return' closer to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        switch (a) {
+            case 1:
+                n = 2;
+                break;
+            case 2:
+                n = 4;
+        }
+        ret<caret>urn n;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSwitch3.java

@@ -0,0 +1,17 @@
+// "Move 'return' closer to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        switch (a) {
+            case 1:
+                n = 2;
+                break;
+            case 2:
+                n = 4;
+                break;
+            default:
+                n = 0;
+        }
+        ret<caret>urn n;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSwitch4.java

@@ -0,0 +1,19 @@
+// "Move 'return' closer to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        switch (a) {
+            case 1:
+                n = 2;
+                break;
+            case 2:
+                n = 4;
+                break;
+            default:
+                n = 0;
+                break;
+            case 0:
+        }
+        re<caret>turn n;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSwitch5.java

@@ -0,0 +1,17 @@
+// "Move 'return' closer to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        switch (a) {
+            case 1:
+                n = 2;
+                break;
+            default:
+                n = 0;
+                break;
+            case 2:
+                n = 4;
+        }
+        ret<caret>urn n;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryCatchAssign.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryCatchFinally1.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryCatchFinally2.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryCatchFinally3.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "false"
+// "Move 'return' closer to computation of the value of 'n'" "false"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryCatchFinally4.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "false"
+// "Move 'return' closer to computation of the value of 'n'" "false"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryCatchFinally5.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryCatchFinally6.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 import java.io.*;
 
 class T {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryCatchRethrow.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryCatchReturn.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(boolean b) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryWhile1.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f(String p) {
         String r = null;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeTryWhile2.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'r'" "true"
+// "Move 'return' closer to computation of the value of 'r'" "true"
 class T {
     String f(String p) {
         String r = null;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeWhileBreak1.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeWhileBreak2.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int a) {
         int n = -1;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeWhileContinue.java

@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' closer to computation of the value of 'n'" "true"
 class T {
     int f(int a) {
         int n = -1;