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

Show warning also if arrays are compared by '!=' #KT-20259 Fixed

Browse Source
This commit is contained in:
Toshiaki Kameyama
2017-09-17 17:44:51 +03:00
committed by Mikhail Glukhikh
parent 93252926ba
commit f08e9832a6
8 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/inspectionDescriptions/ReplaceArrayEqualityOpWithArraysEquals.html
+1 -1
View File
@@ -1,5 +1,5 @@
<html> <html>
<body> <body>
This inspection detects '==' operator for arrays that should be replaced with 'Arrays.equals' This inspection detects '==' or '!=' operator for arrays that should be replaced with 'Arrays.equals'
</body> </body>
</html> </html>
idea/resources/intentionDescriptions/ReplaceArrayEqualityOpWithArraysEqualsIntention/description.html
+1 -1
View File
@@ -1,5 +1,5 @@
<html> <html>
<body> <body>
This intention replace '==' operator for arrays with 'Arrays.equals' This intention replace '==' or '!=' operator for arrays with 'Arrays.equals'
</body> </body>
</html> </html>
idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceArrayEqualityOpWithArraysEqualsIntention.kt
+9 -2
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtBinaryExpression import org.jetbrains.kotlin.psi.KtBinaryExpression
import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.psi.createExpressionByPattern
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
class ReplaceArrayEqualityOpWithArraysEqualsInspection : class ReplaceArrayEqualityOpWithArraysEqualsInspection :
@@ -44,12 +45,18 @@ class ReplaceArrayEqualityOpWithArraysEqualsIntention : SelfTargetingOffsetIndep
ktFile.resolveImportReference(FqName("java.util.Arrays")).firstOrNull()?.let { ktFile.resolveImportReference(FqName("java.util.Arrays")).firstOrNull()?.let {
ImportInsertHelper.getInstance(project).importDescriptor(ktFile, it) ImportInsertHelper.getInstance(project).importDescriptor(ktFile, it)
} }
val expression = factory.createExpression("Arrays.equals(${left.text}, ${right.text})") val template = buildString {
if (element.operationToken == KtTokens.EXCLEQ) append("!")
append("Arrays.equals($0, $1)")
}
val expression = factory.createExpressionByPattern(template, left, right)
element.replace(expression) element.replace(expression)
} }
override fun isApplicableTo(element: KtBinaryExpression): Boolean { override fun isApplicableTo(element: KtBinaryExpression): Boolean {
if (element.operationToken != KtTokens.EQEQ) return false val operationToken = element.operationToken
if (operationToken != KtTokens.EQEQ && operationToken != KtTokens.EXCLEQ) return false
if (operationToken == KtTokens.EXCLEQ) text = "Replace '!=' with 'Arrays.equals'"
val right = element.right ?: return false val right = element.right ?: return false
val left = element.left ?: return false val left = element.left ?: return false
val rightResolvedCall = right.getResolvedCall(right.analyze()) ?: return false val rightResolvedCall = right.getResolvedCall(right.analyze()) ?: return false
idea/testData/inspections/replaceArrayEqualityOpWithArraysEquals/inspectionData/expected.xml
Vendored
+8
View File
@@ -7,4 +7,12 @@
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Replace '==' with 'Arrays.equals'</problem_class> <problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Replace '==' with 'Arrays.equals'</problem_class>
<description>Replace '==' with 'Arrays.equals'</description> <description>Replace '==' with 'Arrays.equals'</description>
</problem> </problem>
<problem>
<file>test.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/test.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Replace '!=' with 'Arrays.equals'</problem_class>
<description>Replace '!=' with 'Arrays.equals'</description>
</problem>
</problems> </problems>
idea/testData/inspections/replaceArrayEqualityOpWithArraysEquals/test.kt
Vendored
+1
View File
@@ -4,4 +4,5 @@ fun foo() {
val c: Any? = null val c: Any? = null
a == b // YES a == b // YES
a == c // NO a == c // NO
a != b
} }
idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/arrayEXCLEQ.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// WITH_RUNTIME
// INTENTION_TEXT: Replace '!=' with 'Arrays.equals'
fun foo() {
val a = arrayOf("a", "b", "c")
val b = arrayOf("a", "b", "c")
if (a <caret>!= b) {
}
}
idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/arrayEXCLEQ.kt.after
Vendored
+10
View File
@@ -0,0 +1,10 @@
import java.util.Arrays
// WITH_RUNTIME
// INTENTION_TEXT: Replace '!=' with 'Arrays.equals'
fun foo() {
val a = arrayOf("a", "b", "c")
val b = arrayOf("a", "b", "c")
if (!Arrays.equals(a, b)) {
}
}
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+6
View File
@@ -13562,6 +13562,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName); doTest(fileName);
} }
@TestMetadata("arrayEXCLEQ.kt")
public void testArrayEXCLEQ() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/arrayEXCLEQ.kt");
doTest(fileName);
}
@TestMetadata("primitiveArrayEQEQ.kt") @TestMetadata("primitiveArrayEQEQ.kt")
public void testPrimitiveArrayEQEQ() throws Exception { public void testPrimitiveArrayEQEQ() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/primitiveArrayEQEQ.kt"); String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/primitiveArrayEQEQ.kt");