Merge branch 'master' into vplyashkun/inplace_rename_lags

GitOrigin-RevId: aaecc2a32e4e42de827efb45b8df733874a722e4

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