Fix two exceptions in "Convert concatenation to template

So #KT-23045 Fixed So #KT-23045 Fixed
2018-03-22 11:30:21 +03:00
parent 7328f75103
commit 26dc5840f1
4 changed files with 16 additions and 7 deletions
@@ -87,13 +87,12 @@ open class ConvertToStringTemplateIntention : SelfTargetingOffsetIndependentInte
                    val type = bindingContext.getType(expression)!!

                    if (KotlinBuiltIns.isChar(type)) {
-                        val value = expressionText.removePrefix("'").removeSuffix("'")
-                        return when (value) { // escape double quote and unescape single one and $
-                            "\"" -> "\\\""
-                            "\\'" -> "'"
-                            "$" -> if (forceBraces) "\\$" else "$"
-                            else -> value
-                        }
+                        return expressionText
+                            .removePrefix("'")
+                            .removeSuffix("'")
+                            .replace("\"", "\\\"")
+                            .replace("\\'", "'")
+                            .run { if (forceBraces) replace("$", "\\$") else this }
                    }

                    val constant = ConstantExpressionEvaluator.getConstant(expression, bindingContext)