From 762f38a394efea3c78bcfdcf3f5d7771701f34ad Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Sat, 9 May 2020 05:31:36 +0300 Subject: [PATCH] KT-38832 Add additional check to RemoveCurlyBracesFromTemplateInspection - Expression in curly braces can change between the report of inspection and quickfix application - ^KT-38832 Fixed --- .../inspections/RemoveCurlyBracesFromTemplateInspection.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveCurlyBracesFromTemplateInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveCurlyBracesFromTemplateInspection.kt index 90eeecae940..687368ca96f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveCurlyBracesFromTemplateInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveCurlyBracesFromTemplateInspection.kt @@ -29,7 +29,9 @@ class RemoveCurlyBracesFromTemplateInspection(@JvmField var reportWithoutWhitesp override fun isApplicable(element: KtBlockStringTemplateEntry): Boolean = element.canDropBraces() override fun applyTo(element: KtBlockStringTemplateEntry, project: Project, editor: Editor?) { - element.dropBraces() + if (element.canDropBraces()) { + element.dropBraces() + } } override fun createOptionsPanel() = MultipleCheckboxOptionsPanel(this).apply {