Java: correctly escape for text block (IDEA-331523)

in Replace concatenation with formatted output" intention"

GitOrigin-RevId: b3e57b2cc62bbbcdca3fe357d8a6896837ca3f73

java/java-impl/src/com/intellij/codeInsight/intention/impl/ConcatenationToMessageFormatAction.java

@@ -43,14 +43,15 @@ public class ConcatenationToMessageFormatAction extends PsiUpdateModCommandActio
     PsiPolyadicExpression concatenation = getEnclosingLiteralConcatenation(element);
     if (concatenation == null) return;
     List<PsiExpression> args = new ArrayList<>();
-    final String formatString = PsiConcatenationUtil.buildUnescapedFormatString(concatenation, false, args);
+    final String formatString =
+      StringUtil.escapeStringCharacters(PsiConcatenationUtil.buildUnescapedFormatString(concatenation, false, args));
 
     Project project = context.project();
     final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
     PsiMethodCallExpression call = (PsiMethodCallExpression)
       factory.createExpressionFromText("java.text.MessageFormat.format()", concatenation);
     PsiExpressionList argumentList = call.getArgumentList();
-    boolean textBlocks = ContainerUtil.exists(concatenation.getOperands(), 
+    boolean textBlocks = ContainerUtil.exists(concatenation.getOperands(),
                                               operand -> operand instanceof PsiLiteralExpression literal && literal.isTextBlock());
     final String expressionText;
     if (textBlocks) {
@@ -59,7 +60,7 @@ public class ConcatenationToMessageFormatAction extends PsiUpdateModCommandActio
         .collect(Collectors.joining("\n", "\"\"\"\n", "\"\"\""));
     }
     else {
-      expressionText = "\"" + StringUtil.escapeStringCharacters(formatString) + "\"";
+      expressionText = "\"" + formatString + "\"";
     }
     PsiExpression formatArgument = factory.createExpressionFromText(expressionText, null);
     argumentList.add(formatArgument);

java/java-tests/testData/codeInsight/concatenationToMessageFormat/textblock.after.java

@@ -5,7 +5,7 @@ class C {
       String s = java.text.MessageFormat.format("""
               the text\s
                block
-              line2
+              \\line2
               {0}{1} "to" be""", a, b);
   }
 }

java/java-tests/testData/codeInsight/concatenationToMessageFormat/textblock.java

@@ -3,7 +3,7 @@ class C {
   void x(int a, int b) {
     String s = """
       the text \n block
-      line2
+      \\line2
       """ +
                a + b + <caret>//keep me
                " \"to\" be";