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

Array equality: replace Arrays.equals with contentEquals in intention

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-09-25 16:27:51 +03:00
parent 32531b3afc
commit 253ae10e5f
7 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceArrayEqualityOpWithArraysEqualsIntention.kt
+3 -10
View File
@@ -18,11 +18,8 @@ package org.jetbrains.kotlin.idea.intentions
import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
import org.jetbrains.kotlin.idea.util.ImportInsertHelper
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtBinaryExpression
import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.psi.createExpressionByPattern
@@ -33,7 +30,7 @@ class ReplaceArrayEqualityOpWithArraysEqualsInspection :
class ReplaceArrayEqualityOpWithArraysEqualsIntention : SelfTargetingOffsetIndependentIntention<KtBinaryExpression>(
KtBinaryExpression::class.java,
"Replace '==' with 'Arrays.equals'"
"Replace '==' with 'contentEquals'"
) {
override fun applyTo(element: KtBinaryExpression, editor: Editor?) {
@@ -41,13 +38,9 @@ class ReplaceArrayEqualityOpWithArraysEqualsIntention : SelfTargetingOffsetIndep
val right = element.right ?: return
val left = element.left ?: return
val factory = KtPsiFactory(project)
val ktFile = element.containingKtFile
ktFile.resolveImportReference(FqName("java.util.Arrays")).firstOrNull()?.let {
ImportInsertHelper.getInstance(project).importDescriptor(ktFile, it)
}
val template = buildString {
if (element.operationToken == KtTokens.EXCLEQ) append("!")
append("Arrays.equals($0, $1)")
append("$0.contentEquals($1)")
}
val expression = factory.createExpressionByPattern(template, left, right)
element.replace(expression)
@@ -56,7 +49,7 @@ class ReplaceArrayEqualityOpWithArraysEqualsIntention : SelfTargetingOffsetIndep
override fun isApplicableTo(element: KtBinaryExpression): Boolean {
val operationToken = element.operationToken
if (operationToken != KtTokens.EQEQ && operationToken != KtTokens.EXCLEQ) return false
if (operationToken == KtTokens.EXCLEQ) text = "Replace '!=' with 'Arrays.equals'"
if (operationToken == KtTokens.EXCLEQ) text = "Replace '!=' with 'contentEquals'"
val right = element.right ?: return false
val left = element.left ?: return false
val rightResolvedCall = right.getResolvedCall(right.analyze()) ?: return false
idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/arrayEQEQ.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: Replace '==' with 'Arrays.equals'
// INTENTION_TEXT: Replace '==' with 'contentEquals'
fun foo() {
val a = arrayOf("a", "b", "c")
val b = arrayOf("a", "b", "c")
idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/arrayEQEQ.kt.after
Vendored
+2 -4
View File
@@ -1,10 +1,8 @@
import java.util.Arrays
// WITH_RUNTIME
// INTENTION_TEXT: Replace '==' with 'Arrays.equals'
// INTENTION_TEXT: Replace '==' with 'contentEquals'
fun foo() {
val a = arrayOf("a", "b", "c")
val b = arrayOf("a", "b", "c")
if (Arrays.equals(a, b)) {
if (a.contentEquals(b)) {
}
}
idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/arrayEXCLEQ.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: Replace '!=' with 'Arrays.equals'
// INTENTION_TEXT: Replace '!=' with 'contentEquals'
fun foo() {
val a = arrayOf("a", "b", "c")
val b = arrayOf("a", "b", "c")
idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/arrayEXCLEQ.kt.after
Vendored
+2 -4
View File
@@ -1,10 +1,8 @@
import java.util.Arrays
// WITH_RUNTIME
// INTENTION_TEXT: Replace '!=' with 'Arrays.equals'
// INTENTION_TEXT: Replace '!=' with 'contentEquals'
fun foo() {
val a = arrayOf("a", "b", "c")
val b = arrayOf("a", "b", "c")
if (!Arrays.equals(a, b)) {
if (!a.contentEquals(b)) {
}
}
idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/primitiveArrayEQEQ.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: Replace '==' with 'Arrays.equals'
// INTENTION_TEXT: Replace '==' with 'contentEquals'
fun foo() {
val a = charArrayOf('a', 'b', 'c')
val b = charArrayOf('a', 'b', 'c')
idea/testData/intentions/replaceArrayEqualityOpWithArraysEquals/primitiveArrayEQEQ.kt.after
Vendored
+2 -4
View File
@@ -1,10 +1,8 @@
import java.util.Arrays
// WITH_RUNTIME
// INTENTION_TEXT: Replace '==' with 'Arrays.equals'
// INTENTION_TEXT: Replace '==' with 'contentEquals'
fun foo() {
val a = charArrayOf('a', 'b', 'c')
val b = charArrayOf('a', 'b', 'c')
if (Arrays.equals(a, b)) {
if (a.contentEquals(b)) {
}
}