From f1cc7cecceeffdfbc3a9ae5f4cbdf14a5245324d Mon Sep 17 00:00:00 2001
From: "hisaaki.sioiri" <hisaaki.shioiri@uzabase.com>
Date: Wed, 13 Feb 2019 04:56:41 +0300
Subject: [PATCH] Escaping quotes in live-templates (KT-2387)

 #KT-2387 Fixed
---
 idea/idea-live-templates/testData/soutv.exp.kt                  | 2 +-
 .../jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt    | 2 +-
 idea/resources/liveTemplates/Kotlin.xml                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/idea-live-templates/testData/soutv.exp.kt b/idea/idea-live-templates/testData/soutv.exp.kt
index 48cc752b70f..361c6e76882 100644
--- a/idea/idea-live-templates/testData/soutv.exp.kt
+++ b/idea/idea-live-templates/testData/soutv.exp.kt
@@ -1,5 +1,5 @@
 fun main(args : Array<String>) {
     val x = 5
     val y = "str"
-    println("y = ${y}")<caret>
+    println("y.plus(\"test\") = ${y.plus("test")}")<caret>
 }
diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
index 58593f69010..afcdb6d4803 100644
--- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
+++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
@@ -80,7 +80,7 @@ class LiveTemplatesTest : KotlinLightCodeInsightFixtureTestCase() {
         start()
 
         assertStringItems("DEFAULT_BUFFER_SIZE", "args", "x", "y")
-        typeAndNextTab("y")
+        typeAndNextTab("y.plus(\"test\")")
 
         checkAfter()
     }
diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml
index 0f29ed7bf59..7603ba815f5 100644
--- a/idea/resources/liveTemplates/Kotlin.xml
+++ b/idea/resources/liveTemplates/Kotlin.xml
@@ -43,7 +43,7 @@
               value="println(&quot;$EXPR_COPY$ = $DOLLAR${$EXPR$}&quot;)">
         <variable alwaysStopAt="false" defaultValue="&quot;$&quot;" expression="" name="DOLLAR" />
         <variable alwaysStopAt="true" defaultValue="&quot;expr&quot;" expression="kotlinVariable()" name="EXPR" />
-        <variable alwaysStopAt="false" defaultValue="" expression="EXPR" name="EXPR_COPY" />
+        <variable alwaysStopAt="false" defaultValue="" expression="escapeString(EXPR)" name="EXPR_COPY" />
         <context>
             <option name="KOTLIN_STATEMENT" value="true" />
         </context>