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

Propose convert to string template as inspection more frequent

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-02-22 15:10:47 +03:00
committed by Stanislav Erokhin
parent 4c15642e2c
commit 57e47d1830
11 changed files with 60 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
+3 -3
View File
@@ -51,9 +51,9 @@ open class ConvertToStringTemplateIntention : SelfTargetingOffsetIndependentInte
fun shouldSuggestToConvert(expression: KtBinaryExpression): Boolean {
val entries = buildReplacement(expression).entries
return entries.none { it is KtBlockStringTemplateEntry }
&& !entries.all { it is KtLiteralStringTemplateEntry || it is KtEscapeStringTemplateEntry }
&& entries.count { it is KtLiteralStringTemplateEntry } > 1
&& !expression.textContains('\n')
&& !entries.all { it is KtLiteralStringTemplateEntry || it is KtEscapeStringTemplateEntry }
&& entries.count { it is KtLiteralStringTemplateEntry } >= 1
&& !expression.textContains('\n')
}
@JvmStatic
idea/testData/intentions/convertToStringTemplate/inspectionData/expected.xml
Vendored
+40
View File
@@ -7,4 +7,44 @@
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
<description>Convert concatenation to template</description>
</problem>
<problem>
<file>noBracesSimpleFollowedByDot.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="noBracesSimpleFollowedByDot.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">String concatenation that can be converted to string template</problem_class>
<description>Convert concatenation to template</description>
</problem>
<problem>
<file>specialCharsInCharLiteral.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="specialCharsInCharLiteral.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">String concatenation that can be converted to string template</problem_class>
<description>Convert concatenation to template</description>
</problem>
<problem>
<file>doesNotCorruptExistingTemplate.kt</file>
<line>4</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="doesNotCorruptExistingTemplate.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">String concatenation that can be converted to string template</problem_class>
<description>Convert concatenation to template</description>
</problem>
<problem>
<file>unescapeSingleQuote.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="unescapeSingleQuote.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">String concatenation that can be converted to string template</problem_class>
<description>Convert concatenation to template</description>
</problem>
<problem>
<file>noBracesForLastSimpleExpression.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="noBracesForLastSimpleExpression.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">String concatenation that can be converted to string template</problem_class>
<description>Convert concatenation to template</description>
</problem>
</problems>