From 0b5b4c438acc3b1e1cee8b8f05604ba0b9841606 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 20 Jan 2020 20:39:46 +0100 Subject: [PATCH] more specific uast generation api IDEA-CR-57459 GitOrigin-RevId: 87b1559ff968f98ee0f732a8406273335ef6f762 --- .../intellij/codeInspection/i18n/I18nizeBatchQuickFix.java | 2 +- .../org/jetbrains/uast/generate/UastCodeGenerationPlugin.kt | 2 +- .../uast/java/generate/JavaUastCodeGenerationPlugin.kt | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeBatchQuickFix.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeBatchQuickFix.java index 517dbd40be45..b4634880cbf2 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeBatchQuickFix.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeBatchQuickFix.java @@ -119,7 +119,7 @@ public class I18nizeBatchQuickFix extends I18nizeQuickFix implements BatchQuickF } UastElementFactory pluginElementFactory = generationPlugin.getElementFactory(project); List arguments = new ArrayList<>(); - arguments.add(pluginElementFactory.createULiteralExpression("\"" + bean.getKey() + "\"", psiElement)); + arguments.add(pluginElementFactory.createStringLiteralExpression(bean.getKey(), psiElement)); arguments.addAll(bean.getArgs()); UCallExpression callExpression = pluginElementFactory .createCallExpression(pluginElementFactory.createQualifiedReference(bundleName, uExpression), diff --git a/uast/uast-common/src/org/jetbrains/uast/generate/UastCodeGenerationPlugin.kt b/uast/uast-common/src/org/jetbrains/uast/generate/UastCodeGenerationPlugin.kt index 9c9f23632b93..2819d0069634 100644 --- a/uast/uast-common/src/org/jetbrains/uast/generate/UastCodeGenerationPlugin.kt +++ b/uast/uast-common/src/org/jetbrains/uast/generate/UastCodeGenerationPlugin.kt @@ -69,7 +69,7 @@ interface UastElementFactory { fun createIfExpression(condition: UExpression, thenBranch: UExpression, elseBranch: UExpression? = null): UIfExpression? - fun createULiteralExpression(text: String, context: PsiElement?): ULiteralExpression? + fun createStringLiteralExpression(text: String, context: PsiElement?): ULiteralExpression? } @ApiStatus.Experimental diff --git a/uast/uast-java/src/org/jetbrains/uast/java/generate/JavaUastCodeGenerationPlugin.kt b/uast/uast-java/src/org/jetbrains/uast/java/generate/JavaUastCodeGenerationPlugin.kt index 88fe1c99aa4c..5a14758b74f2 100644 --- a/uast/uast-java/src/org/jetbrains/uast/java/generate/JavaUastCodeGenerationPlugin.kt +++ b/uast/uast-java/src/org/jetbrains/uast/java/generate/JavaUastCodeGenerationPlugin.kt @@ -6,6 +6,7 @@ import com.intellij.lang.Language import com.intellij.lang.java.JavaLanguage import com.intellij.lang.jvm.JvmModifier import com.intellij.openapi.project.Project +import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.* import com.intellij.psi.codeStyle.JavaCodeStyleManager import com.intellij.psi.codeStyle.VariableKind @@ -144,8 +145,8 @@ class JavaUastElementFactory(private val project: Project) : UastElementFactory ?.let { JavaUCallExpression(it, null) } } - override fun createULiteralExpression(text: String, context: PsiElement?): ULiteralExpression? { - val literalExpr = psiFactory.createExpressionFromText(text, context) + override fun createStringLiteralExpression(text: String, context: PsiElement?): ULiteralExpression? { + val literalExpr = psiFactory.createExpressionFromText(StringUtil.wrapWithDoubleQuote(text), context) if (literalExpr !is PsiLiteralExpressionImpl) return null return JavaULiteralExpression(literalExpr, null) }