[java-typing] fix typing { inside a Java string in switch-case expression adding } outside the string literal

fix IDEA-368266

Merge-request: IJ-MR-156690
Merged-by: Bartek Pacia <bartek.pacia@jetbrains.com>

GitOrigin-RevId: 68b837ddad0bc7e614ee51fa1934e86b13df69b4

java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/AbstractBasicJavaTypedHandler.java

@@ -17,6 +17,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.impl.source.BasicJavaAstTreeUtil;
+import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.ParentAwareTokenSet;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.text.CharArrayUtil;
@@ -129,7 +130,7 @@ public abstract class AbstractBasicJavaTypedHandler extends TypedHandlerDelegate
       }
     }
     if (fileType instanceof JavaFileType && c == '{') {
-      int offset = editor.getCaretModel().getOffset();
+      final int offset = editor.getCaretModel().getOffset();
       if (offset == 0) {
         return Result.CONTINUE;
       }
@@ -234,6 +235,12 @@ public abstract class AbstractBasicJavaTypedHandler extends TypedHandlerDelegate
 
   private static boolean afterArrowInCase(@Nullable PsiElement leaf) {
     if (leaf == null) return false;
+    IElementType leafElementType = leaf.getNode().getElementType();
+    if (leafElementType == JavaTokenType.STRING_LITERAL ||
+        leafElementType == JavaTokenType.TEXT_BLOCK_LITERAL ||
+        leafElementType == JavaTokenType.CHARACTER_LITERAL) {
+      return false;
+    }
     PsiElement prevLeaf = PsiTreeUtil.prevVisibleLeaf(leaf);
     if (prevLeaf == null) return false;
     if (prevLeaf.getNode().getElementType() != JavaTokenType.ARROW) return false;

java/java-tests/testData/codeInsight/typing/openBracesAfterSwitchRuleExpressionAssignmentInStringLiteral_after.java

@@ -0,0 +1,10 @@
+class X {
+  public static String foo(int bar) {
+    String path1 = null;
+    switch (foo) {
+      case 1 -> path1 = "bar{<caret>";
+      case 2 -> path1 = "Hello";
+    }
+    return path1;
+  }
+}

java/java-tests/testData/codeInsight/typing/openBracesAfterSwitchRuleExpressionAssignmentInStringLiteral_before.java

@@ -0,0 +1,10 @@
+class X {
+  public static String foo(int bar) {
+    String path1 = null;
+    switch (foo) {
+      case 1 -> path1 = "bar<caret>";
+      case 2 -> path1 = "Hello";
+    }
+    return path1;
+  }
+}

java/java-tests/testData/codeInsight/typing/openBracesAfterSwitchRuleExpressionInCharLiteral_after.java

@@ -0,0 +1,7 @@
+class X {
+  public static void main(String[] args) {
+    var a = switch (new Object()){
+      case Object object -> '{<caret>';
+    };
+  }
+}

java/java-tests/testData/codeInsight/typing/openBracesAfterSwitchRuleExpressionInCharLiteral_before.java

@@ -0,0 +1,7 @@
+class X {
+  public static void main(String[] args) {
+    var a = switch (new Object()){
+      case Object object -> '<caret>';
+    };
+  }
+}

java/java-tests/testData/codeInsight/typing/openBracesAfterSwitchRuleExpressionInStringLiteral_after.java

@@ -0,0 +1,7 @@
+class X {
+  public static void main(String[] args) {
+    var a = switch (new Object()){
+      case Object object -> "here{<caret>";
+    };
+  }
+}

java/java-tests/testData/codeInsight/typing/openBracesAfterSwitchRuleExpressionInStringLiteral_before.java

@@ -0,0 +1,7 @@
+class X {
+  public static void main(String[] args) {
+    var a = switch (new Object()){
+      case Object object -> "here<caret>";
+    };
+  }
+}

java/java-tests/testData/codeInsight/typing/openBracesAfterSwitchRuleExpressionInTextBlockLiteral_after.java

@@ -0,0 +1,9 @@
+class X {
+  public static void main(String[] args) {
+    var a = switch (new Object()){
+      case Object object -> """
+        hello{<caret>
+        """;
+    };
+  }
+}

java/java-tests/testData/codeInsight/typing/openBracesAfterSwitchRuleExpressionInTextBlockLiteral_before.java

@@ -0,0 +1,9 @@
+class X {
+  public static void main(String[] args) {
+    var a = switch (new Object()){
+      case Object object -> """
+        hello<caret>
+        """;
+    };
+  }
+}

java/java-tests/testData/codeInsight/typing/openBracesAfterSwitchRuleStatementInStringLiteral_after.java

@@ -0,0 +1,10 @@
+class X {
+  public static String foo(int bar) {
+    switch (bar) {
+      case 10:
+        return "matched{<caret>";
+      default:
+        return "default";
+    }
+  }
+}

java/java-tests/testData/codeInsight/typing/openBracesAfterSwitchRuleStatementInStringLiteral_before.java

@@ -0,0 +1,10 @@
+class X {
+  public static String foo(int bar) {
+    switch (bar) {
+      case 10:
+        return "matched<caret>";
+      default:
+        return "default";
+    }
+  }
+}

java/java-tests/testSrc/com/intellij/java/codeInsight/JavaTypingTest.java

@@ -105,4 +105,29 @@ public class JavaTypingTest extends AbstractBasicJavaTypingTest {
     setLanguageLevel(LanguageLevel.JDK_21);
     doTest('{');
   }
+
+  public void testOpenBracesAfterSwitchRuleStatementInStringLiteral() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
+
+  public void testOpenBracesAfterSwitchRuleExpressionAssignmentInStringLiteral() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
+
+  public void testOpenBracesAfterSwitchRuleExpressionInStringLiteral() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
+
+  public void testOpenBracesAfterSwitchRuleExpressionInTextBlockLiteral() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
+
+  public void testOpenBracesAfterSwitchRuleExpressionInCharLiteral() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
 }