[java-completion] Allow .opt template in non-top expressions

IDEA-193857 Postfix completion doesn't show up in return expression

GitOrigin-RevId: 64dc758c7741d05457ef55c0ee425b053544dab5

java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/OptionalPostfixTemplate.java

@@ -22,7 +22,7 @@ public class OptionalPostfixTemplate extends JavaEditablePostfixTemplate {
           "java.util.$OPTIONAL_CLASS$.$OPTIONAL_METHOD$($EXPR$)",
           "Optional.ofNullable(expr)",
           Collections.singleton(new JavaPostfixTemplateExpressionCondition.JavaPostfixTemplateNonVoidExpressionCondition()),
-          LanguageLevel.JDK_1_8, true, provider);
+          LanguageLevel.JDK_1_8, false, provider);
   }
 
   @Override

java/java-tests/testData/codeInsight/template/postfix/templates/opt/inReturn.java

@@ -0,0 +1,7 @@
+import java.util.Optional;
+
+class Demo {
+  Optional<String> test(String s) {
+    return s.opt<caret>
+  }
+}

java/java-tests/testData/codeInsight/template/postfix/templates/opt/inReturn_after.java

@@ -0,0 +1,7 @@
+import java.util.Optional;
+
+class Demo {
+  Optional<String> test(String s) {
+    return java.util.Optional.ofNullable(s)<caret>
+  }
+}

java/java-tests/testSrc/com/intellij/java/codeInsight/template/postfix/templates/OptionalPostfixTemplateTest.java

@@ -83,6 +83,10 @@ public class OptionalPostfixTemplateTest extends PostfixTemplateTestCase {
     doTest();
   }
 
+  public void testInReturn() {
+    doTest();
+  }
+
   public void testNotNullMethodCall() {
     myFixture.addClass("package org.jetbrains.annotations;" +
                        "public @interface NotNull {}");