azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

J2K: Do not convert string literal with escaped symbols automaticaly during java to kotlin conversion

Browse Source 
#KT-9942 Fixed
This commit is contained in:
Natalia Ukhorskaya
2015-11-11 18:39:00 +03:00
parent 68101eeffa
commit a983e6cf60
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
+3 -1
View File
@@ -52,7 +52,9 @@ public class ConvertToStringTemplateIntention : SelfTargetingOffsetIndependentIn
public fun shouldSuggestToConvert(expression: KtBinaryExpression): Boolean { public fun shouldSuggestToConvert(expression: KtBinaryExpression): Boolean {
val entries = buildReplacement(expression).entries val entries = buildReplacement(expression).entries
return entries.none { it is KtBlockStringTemplateEntry } && entries.count { it is KtLiteralStringTemplateEntry } > 1 return entries.none { it is KtBlockStringTemplateEntry } &&
!entries.all { it is KtLiteralStringTemplateEntry || it is KtEscapeStringTemplateEntry }
&& entries.count { it is KtLiteralStringTemplateEntry } > 1
} }
private fun isApplicableToNoParentCheck(expression: KtBinaryExpression): Boolean { private fun isApplicableToNoParentCheck(expression: KtBinaryExpression): Boolean {
idea/testData/intentions/convertToStringTemplate/inspectionData/expected.xml
Vendored
-9
View File
@@ -7,13 +7,4 @@
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
<description>Convert concatenation to template</description> <description>Convert concatenation to template</description>
</problem> </problem>
<problem>
<file>backslashNMultilineString.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="backslashNMultilineString.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
<description>Convert concatenation to template</description>
</problem>
</problems> </problems>