From 983611a75f380eac8ada2f88318c573f408f7918 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 13 Apr 2017 17:42:35 +0300 Subject: [PATCH] Fix in createBlockStringTemplateEntry (use createExpressionByPattern) This fixes one more broken test for inlining --- compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt index acd20840b5e..dce1aa4fff0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt @@ -376,7 +376,8 @@ class KtPsiFactory @JvmOverloads constructor(private val project: Project, val m } fun createBlockStringTemplateEntry(expression: KtExpression): KtStringTemplateEntryWithExpression { - val stringTemplateExpression = createExpression("\"\${" + expression.text + "}\"") as KtStringTemplateExpression + // We don't want reformatting here as it can potentially change something in raw strings + val stringTemplateExpression = createExpressionByPattern("\"$\${$0}\"", expression, reformat = false) as KtStringTemplateExpression return stringTemplateExpression.entries[0] as KtStringTemplateEntryWithExpression }