diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt index 480e6f48757..6349ddf4a05 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt @@ -52,7 +52,9 @@ public class ConvertToStringTemplateIntention : SelfTargetingOffsetIndependentIn public fun shouldSuggestToConvert(expression: KtBinaryExpression): Boolean { val entries = buildReplacement(expression).entries - return entries.none { it is KtBlockStringTemplateEntry } && entries.count { it is KtLiteralStringTemplateEntry } > 1 + return entries.none { it is KtBlockStringTemplateEntry } && + !entries.all { it is KtLiteralStringTemplateEntry || it is KtEscapeStringTemplateEntry } + && entries.count { it is KtLiteralStringTemplateEntry } > 1 } private fun isApplicableToNoParentCheck(expression: KtBinaryExpression): Boolean { diff --git a/idea/testData/intentions/convertToStringTemplate/inspectionData/expected.xml b/idea/testData/intentions/convertToStringTemplate/inspectionData/expected.xml index 7d7fe184033..124d5c466eb 100644 --- a/idea/testData/intentions/convertToStringTemplate/inspectionData/expected.xml +++ b/idea/testData/intentions/convertToStringTemplate/inspectionData/expected.xml @@ -7,13 +7,4 @@ Convert string concatenation to string template Convert concatenation to template - - - backslashNMultilineString.kt - 2 - light_idea_test_case - - Convert string concatenation to string template - Convert concatenation to template - \ No newline at end of file