diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterReturnOutsideTryWithResources.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterReturnOutsideTryWithResources.java
index a6e1106622b0..962a80e516d4 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterReturnOutsideTryWithResources.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterReturnOutsideTryWithResources.java
@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' to computation of the value of 's'" "true"
 import java.io.*;
 
 class T {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleForeach.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleForeach.java
index 4b7b632f265b..fb1d378f6f1e 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleForeach.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterSimpleForeach.java
@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' to computation of the value of 'r'" "true"
 class T {
     String f(String[] a) {
         String r = "";
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterWhileContinue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterWhileContinue.java
new file mode 100644
index 000000000000..828ce91c85ad
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/afterWhileContinue.java
@@ -0,0 +1,21 @@
+// "Move 'return' to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        int t = a;
+        while (t != null) {
+            if (t == 1) {
+                n = 10;
+            }
+            else if (t == 2) {
+                n = 20;
+            }
+            else {
+                t = t + 1;
+                continue;
+            }
+            break;
+        }
+        return n;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedBlockSideEffect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedBlockSideEffect.java
index 850e6b084971..6b0d43a15d31 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedBlockSideEffect.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedBlockSideEffect.java
@@ -6,6 +6,6 @@ class T {
             n = 1;
             System.out.println();
         }
-        return n;
+        re<caret>turn n;
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIfInnerElse.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIfInnerElse.java
index 09f985c4089a..25cd63fb4012 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIfInnerElse.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIfInnerElse.java
@@ -6,6 +6,6 @@ class T {
             if (b) n = 1;
             else n = 2;
         }
-        r<return>eturn n;
+        r<caret>eturn n;
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIfOuterElse.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIfOuterElse.java
index b93c3d4fb8ca..4cdbfe1c05ef 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIfOuterElse.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeNestedIfOuterElse.java
@@ -6,6 +6,6 @@ class T {
             if (b) n = 1;
         }
         else n = 2;
-        re<before>turn n;
+        re<caret>turn n;
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeReturnOutsideTryWithResources.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeReturnOutsideTryWithResources.java
index fada06089426..49737e9aeb3a 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeReturnOutsideTryWithResources.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeReturnOutsideTryWithResources.java
@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' to computation of the value of 's'" "true"
 import java.io.*;
 
 class T {
@@ -7,7 +7,7 @@ class T {
         try (BufferedReader r = open()) {
             s = r.readLine();
         }
-        re<return>turn s;
+        re<caret>turn s;
     }
 
     private static BufferedReader open() throws FileNotFoundException {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleForeach.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleForeach.java
index b11d745bf6f4..b27e8485f32c 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleForeach.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeSimpleForeach.java
@@ -1,4 +1,4 @@
-// "Move 'return' to computation of the value of 'n'" "true"
+// "Move 'return' to computation of the value of 'r'" "true"
 class T {
     String f(String[] a) {
         String r = "";
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeWhileContinue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeWhileContinue.java
new file mode 100644
index 000000000000..84857d271bbe
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/returnSeparatedFromComputation/beforeWhileContinue.java
@@ -0,0 +1,21 @@
+// "Move 'return' to computation of the value of 'n'" "true"
+class T {
+    int f(int a) {
+        int n = -1;
+        int t = a;
+        while (t != null) {
+            if (t == 1) {
+                n = 10;
+            }
+            else if (t == 2) {
+                n = 20;
+            }
+            else {
+                t = t + 1;
+                continue;
+            }
+            break;
+        }
+        ret<caret>urn n;
+    }
+}
\ No newline at end of file