From 2466aa64fe11d45fe8a228ddff209ff92660f1d8 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 16 Apr 2015 14:17:42 +0300 Subject: [PATCH] InsertCurlyBracesToTemplateIntention - no i18n --- .../src/org/jetbrains/kotlin/idea/JetBundle.properties | 2 -- .../idea/intentions/InsertCurlyBracesToTemplateIntention.kt | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties index 0d6c57507b3..0445b332203 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties @@ -290,8 +290,6 @@ remove.unnecessary.parentheses=Remove unnecessary parentheses remove.unnecessary.parentheses.family=Remove Unnecessary Parentheses remove.unnecessary.curly.brackets.from.string.template=Remove curly braces from variable remove.unnecessary.curly.brackets.from.string.template.family=Remove Curly Braces From Variable -insert.curly.brackets.to.string.template=Insert curly braces around variable -insert.curly.brackets.to.string.template.family=Insert Curly Braces Around Variable add.name.to.argument.family=Add Name to Argument add.name.to.argument.single=Add name to argument\: ''{0}'' add.name.to.argument.multiple=Add name to argument... diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.kt index f7a4b81dd77..6df0c18c775 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.kt @@ -21,13 +21,12 @@ import org.jetbrains.kotlin.psi.JetSimpleNameStringTemplateEntry import org.jetbrains.kotlin.psi.JetPsiFactory public class InsertCurlyBracesToTemplateIntention : JetSelfTargetingOffsetIndependentIntention( - "insert.curly.brackets.to.string.template", javaClass()) { + javaClass(), "Insert curly braces around variable") { override fun isApplicableTo(element: JetSimpleNameStringTemplateEntry): Boolean = true override fun applyTo(element: JetSimpleNameStringTemplateEntry, editor: Editor) { - val expression = element.getExpression() - if (expression == null) return + val expression = element.getExpression() ?: return element.replace(JetPsiFactory(element).createBlockStringTemplateEntry(expression)) } }