Fix two exceptions in "Convert concatenation to template
So #KT-23045 Fixed So #KT-23045 Fixed
This commit is contained in:
committed by
Mikhail Glukhikh
parent
7328f75103
commit
26dc5840f1
@@ -87,13 +87,12 @@ open class ConvertToStringTemplateIntention : SelfTargetingOffsetIndependentInte
|
||||
val type = bindingContext.getType(expression)!!
|
||||
|
||||
if (KotlinBuiltIns.isChar(type)) {
|
||||
val value = expressionText.removePrefix("'").removeSuffix("'")
|
||||
return when (value) { // escape double quote and unescape single one and $
|
||||
"\"" -> "\\\""
|
||||
"\\'" -> "'"
|
||||
"$" -> if (forceBraces) "\\$" else "$"
|
||||
else -> value
|
||||
}
|
||||
return expressionText
|
||||
.removePrefix("'")
|
||||
.removeSuffix("'")
|
||||
.replace("\"", "\\\"")
|
||||
.replace("\\'", "'")
|
||||
.run { if (forceBraces) replace("$", "\\$") else this }
|
||||
}
|
||||
|
||||
val constant = ConstantExpressionEvaluator.getConstant(expression, bindingContext)
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
// DISABLE-ERRORS
|
||||
val foo = "foo" + ' "' + "bar" + ' ""'<caret>
|
||||
@@ -0,0 +1,2 @@
|
||||
// DISABLE-ERRORS
|
||||
val foo = "foo \"bar \"\""<caret>
|
||||
@@ -6858,6 +6858,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("invalidChar.kt")
|
||||
public void testInvalidChar() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/invalidChar.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("kt11295.kt")
|
||||
public void testKt11295() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/kt11295.kt");
|
||||
|
||||
Reference in New Issue
Block a user