From 14fcbcacacea1f2b49030517da2cabfbd266e1a6 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Wed, 6 May 2020 16:31:51 +0200
Subject: [PATCH] Escape string characters (EA-231511)

in "Incorrect string capitalization" inspection quick fix

GitOrigin-RevId: 50be278cfa1d9ce15d1ea9f0287e214fd5a5a961
---
 .../capitalization/TitleCapitalizationInspection.java         | 4 ++--
 .../inspections/capitalization/TitleCapitalization.java       | 3 ++-
 .../inspections/capitalization/TitleCapitalization_after.java | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java
index 68bd02e63815..61a0723457b5 100644
--- a/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java
+++ b/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.codeInspection.capitalization;
 
 import com.intellij.codeInspection.*;
@@ -166,7 +166,7 @@ public class TitleCapitalizationInspection extends AbstractBaseJavaLocalInspecti
         if (value == null) return;
         final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
         final PsiExpression newExpression =
-          factory.createExpressionFromText('"' + value.fixCapitalization(myCapitalization) + '"', element);
+          factory.createExpressionFromText('"' + StringUtil.escapeStringCharacters(value.fixCapitalization(myCapitalization)) + '"', element);
         element.replace(newExpression);
       }
       else if (element instanceof PsiMethodCallExpression) {
diff --git a/plugins/java-i18n/testData/inspections/capitalization/TitleCapitalization.java b/plugins/java-i18n/testData/inspections/capitalization/TitleCapitalization.java
index 52cd70518e5b..98037a8576b5 100644
--- a/plugins/java-i18n/testData/inspections/capitalization/TitleCapitalization.java
+++ b/plugins/java-i18n/testData/inspections/capitalization/TitleCapitalization.java
@@ -3,6 +3,7 @@ import org.jetbrains.annotations.Nls;
 class TitleCapitalization  {
     @Nls(capitalization = Nls.Capitalization.Title)
     public String getName() {
-        return <warning descr="String 'Foo bar' is not properly capitalized. It should have title capitalization">"Foo b<caret>ar"</warning>;
+        return <warning descr="String 'Foo
+bar' is not properly capitalized. It should have title capitalization">"Foo\nb<caret>ar"</warning>;
     }
 }
diff --git a/plugins/java-i18n/testData/inspections/capitalization/TitleCapitalization_after.java b/plugins/java-i18n/testData/inspections/capitalization/TitleCapitalization_after.java
index 15831e2b3152..db18cfa9e0f8 100644
--- a/plugins/java-i18n/testData/inspections/capitalization/TitleCapitalization_after.java
+++ b/plugins/java-i18n/testData/inspections/capitalization/TitleCapitalization_after.java
@@ -3,6 +3,6 @@ import org.jetbrains.annotations.Nls;
 class TitleCapitalization  {
     @Nls(capitalization = Nls.Capitalization.Title)
     public String getName() {
-        return "Foo Bar";
+        return "Foo\nBar";
     }
 }