Recover after problematic merge

This commit reverts 65a557bb38f6ac03afa9aabaf02cb8d99fc68a91
                    3f5cfd958d9b6b54393c15983ac94f519c37fe61

GitOrigin-RevId: 8fb8ccbb17d0e217a83f265c185a943b0f5a7ed6

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterIterableForEach.java

@@ -43,4 +43,14 @@ public class Main {
 
     interface Visitor { }
   }
+  
+  class X implements Iterable<String> {
+    class Y {
+      void test() {
+          for (String s : X.this) {
+              System.out.println(s);
+          }
+      }
+    }
+  }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterMapForEach.java

@@ -31,4 +31,15 @@ public class Main {
       }
   }
 
+  class X implements Map<String, String> {
+    class Y {
+      void test() {
+          for (Entry<String, String> entry : X.this.entrySet()) {
+              String k = entry.getKey();
+              String v = entry.getValue();
+              System.out.println(k + "-" + v);
+          }
+      }
+    }
+  }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/beforeIterableForEach.java

@@ -33,4 +33,12 @@ public class Main {
 
     interface Visitor { }
   }
+  
+  class X implements Iterable<String> {
+    class Y {
+      void test() {
+        forEach(System.out::println);
+      }
+    }
+  }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/beforeMapForEach.java

@@ -21,4 +21,11 @@ public class Main {
     map.forEach(otherMap::putIfAbsent);
   }
 
+  class X implements Map<String, String> {
+    class Y {
+      void test() {
+        forEach((k, v) -> System.out.println(k + "-" + v));
+      }
+    }
+  }
 }