MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

[uast-inspections] KTIJ-29797 support escape symbols when string literal is created

Browse Source 
GitOrigin-RevId: a1dc2cf91d81991fac6442e57b2e5b65addeb987
This commit is contained in:
Mikhail Pyltsin
2024-05-21 19:10:18 +02:00
committed by intellij-monorepo-bot
parent e9fac5fa6d
commit 22fac7715b
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jvm/jvm-analysis-kotlin-tests/testData/codeInspection/logging/stringTemplateAsArgument/StringTemplateAsArgumentFix.after.kt
View File

@@ -4,6 +4,17 @@ import java.lang.RuntimeException
class StringTemplateAsArgumentFix { class StringTemplateAsArgumentFix {
private val loggerSlf4J = LoggerFactory.getLogger() private val loggerSlf4J = LoggerFactory.getLogger()
val x = 1
val y = 2
fun testWithEscape() {
loggerSlf4J.debug("{}\n{}", x, y)
loggerSlf4J.debug("{}\t{}", x, y)
loggerSlf4J.debug("{}\"{}", x, y)
loggerSlf4J.debug("{}\${}", x, y)
}
fun testLoggerSlf4J() { fun testLoggerSlf4J() {
val variable1 = "test" val variable1 = "test"
val variable2 = 1 val variable2 = 1

11
jvm/jvm-analysis-kotlin-tests/testData/codeInspection/logging/stringTemplateAsArgument/StringTemplateAsArgumentFix.kt
View File

@@ -4,6 +4,17 @@ import java.lang.RuntimeException
class StringTemplateAsArgumentFix { class StringTemplateAsArgumentFix {
private val loggerSlf4J = LoggerFactory.getLogger() private val loggerSlf4J = LoggerFactory.getLogger()
val x = 1
val y = 2
fun testWithEscape() {
loggerSlf4J.debug("$x\n$y")
loggerSlf4J.debug("$x\t$y")
loggerSlf4J.debug("$x\"$y")
loggerSlf4J.debug("$x$$y")
}
fun testLoggerSlf4J() { fun testLoggerSlf4J() {
val variable1 = "test" val variable1 = "test"
val variable2 = 1 val variable2 = 1

8
plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/generate/KotlinUastBaseCodeGenerationPlugin.kt
View File

@@ -274,10 +274,16 @@ abstract class KotlinUastElementFactory(project: Project) : UastElementFactory {
} }
override fun createStringLiteralExpression(text: String, context: PsiElement?): UExpression { override fun createStringLiteralExpression(text: String, context: PsiElement?): UExpression {
val literal = psiFactory(context).createExpression(StringUtil.wrapWithDoubleQuote(text)) as KtStringTemplateExpression val literal = psiFactory(context).createExpression(StringUtil.wrapWithDoubleQuote(text.escape())) as KtStringTemplateExpression
return KotlinStringTemplateUPolyadicExpression(literal, null) return KotlinStringTemplateUPolyadicExpression(literal, null)
} }
private fun String.escape(): String {
val stringBuilder = StringBuilder()
StringUtil.escapeStringCharacters(this.length, this, "\"$", stringBuilder)
return stringBuilder.toString()
}
override fun createLongConstantExpression(long: Long, context: PsiElement?): UExpression? { override fun createLongConstantExpression(long: Long, context: PsiElement?): UExpression? {
return when (val literalExpr = psiFactory(context).createExpression(long.toString() + "L")) { return when (val literalExpr = psiFactory(context).createExpression(long.toString() + "L")) {
is KtConstantExpression -> KotlinULiteralExpression(literalExpr, null) is KtConstantExpression -> KotlinULiteralExpression(literalExpr, null)