Merge branch 'master' into vplyashkun/inplace_rename_lags

GitOrigin-RevId: aaecc2a32e4e42de827efb45b8df733874a722e4

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2var/afterAnonymous.java

@@ -0,0 +1,9 @@
+// "Replace explicit type with 'var'" "true"
+class MyTest {
+  private void m() {
+      var r = new Runnable() {
+      @Override
+      public void run() {}
+    };
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2var/beforeAnonymous.java

@@ -0,0 +1,9 @@
+// "Replace explicit type with 'var'" "true"
+class MyTest {
+  private void m() {
+    Ru<caret>nnable r = new Runnable() {
+      @Override
+      public void run() {}
+    };
+  }
+}

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

@@ -0,0 +1,25 @@
+// "Make 'b' return 'java.lang.Integer'" "true"
+
+class MyClass {
+    interface BaseInterface {
+
+        Object b();
+    }
+
+    class BooleanImpl implements BaseInterface {
+
+        @Override
+        public Boolean b() {
+            return true;
+        }
+    }
+
+
+    class IntegerImpl implements BaseInterface {
+
+        @Override
+        public Integer b() {
+            return 1;
+        }
+    }
+}

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

@@ -0,0 +1,25 @@
+// "Make 'b' return 'java.lang.Integer'" "true"
+
+class MyClass {
+    interface BaseInterface {
+
+        Object b();
+    }
+
+    class BooleanImpl implements BaseInterface {
+
+        @Override
+        public Boolean b() {
+            return true;
+        }
+    }
+
+
+    class IntegerImpl implements BaseInterface {
+
+        @Override
+        public String b() {
+            return <caret>1;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalIsPresent/beforeDifferentReturnTypes.java

@@ -0,0 +1,14 @@
+// "Replace Optional.isPresent() condition with functional style expression" "false"
+import java.util.Optional;
+
+class Test {
+  Object get() {
+    Optional<String> obj = Stream.of("one", "two").filter(s -> Math.sqrt(s.length()) > 100).findFirst();
+    if (obj.<caret>isPresent()) {
+      return obj.get();
+    } else {
+      return 7;
+    }
+  }
+
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/simplifyBooleanExpression/afterPolyadicParens.java

@@ -0,0 +1,13 @@
+// "Simplify boolean expression" "true"
+class X {
+
+    void test(int a, int b) {
+        if (a + 1 + foo(a, b) > 5) {
+        }
+
+    }
+
+    private int foo(int a, int b) {
+        return a+b;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/simplifyBooleanExpression/beforePolyadicParens.java

@@ -0,0 +1,13 @@
+// "Simplify boolean expression" "true"
+class X {
+
+    void test(int a, int b) {
+        if (<caret>true && (a + 1) + foo((a), b) > 5) {
+        }
+
+    }
+
+    private int foo(int a, int b) {
+        return a+b;
+    }
+}

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));
+      }
+    }
+  }
 }