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

Do not suggest replacing comparison to null with function call

Browse Source 
So #KT-20620 Fixed
This commit is contained in:
Toshiaki Kameyama
2017-12-25 04:23:19 +03:00
committed by Mikhail Glukhikh
parent d7807b5ae3
commit 52df70a576
6 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+3 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea.intentions
import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.KtNodeTypes
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyze
@@ -58,7 +59,8 @@ class OperatorToFunctionIntention : SelfTargetingIntention<KtExpression>(KtExpre
val opRef = element.operationReference
if (!opRef.textRange.containsOffset(caretOffset)) return false
return when (opRef.getReferencedNameElementType()) {
KtTokens.PLUS, KtTokens.MINUS, KtTokens.MUL, KtTokens.DIV, KtTokens.PERC, KtTokens.RANGE, KtTokens.IN_KEYWORD, KtTokens.NOT_IN, KtTokens.PLUSEQ, KtTokens.MINUSEQ, KtTokens.MULTEQ, KtTokens.DIVEQ, KtTokens.PERCEQ, KtTokens.EQEQ, KtTokens.EXCLEQ, KtTokens.GT, KtTokens.LT, KtTokens.GTEQ, KtTokens.LTEQ -> true
KtTokens.PLUS, KtTokens.MINUS, KtTokens.MUL, KtTokens.DIV, KtTokens.PERC, KtTokens.RANGE, KtTokens.IN_KEYWORD, KtTokens.NOT_IN, KtTokens.PLUSEQ, KtTokens.MINUSEQ, KtTokens.MULTEQ, KtTokens.DIVEQ, KtTokens.PERCEQ, KtTokens.GT, KtTokens.LT, KtTokens.GTEQ, KtTokens.LTEQ -> true
KtTokens.EQEQ, KtTokens.EXCLEQ -> listOf(element.left, element.right).none { it?.node?.elementType == KtNodeTypes.NULL }
KtTokens.EQ -> element.left is KtArrayAccessExpression
else -> false
}
idea/testData/intentions/operatorToFunction/binaryEqEqNotNullInLeftSide.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// IS_APPLICABLE: false
fun test(x: String?) {
if (null <caret>!= x) {
x.length
}
}
idea/testData/intentions/operatorToFunction/binaryEqEqNotNullInRightSide.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// IS_APPLICABLE: false
fun test(x: String?) {
if (x <caret>!= null) {
x.length
}
}
idea/testData/intentions/operatorToFunction/binaryEqEqNullInLeftSide.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// IS_APPLICABLE: false
fun test(x: String?) {
null <caret>== x
}
idea/testData/intentions/operatorToFunction/binaryEqEqNullInRightSide.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// IS_APPLICABLE: false
fun test(x: String?) {
x <caret>== null
}
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+24
View File
@@ -11807,6 +11807,30 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName);
}
@TestMetadata("binaryEqEqNotNullInLeftSide.kt")
public void testBinaryEqEqNotNullInLeftSide() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryEqEqNotNullInLeftSide.kt");
doTest(fileName);
}
@TestMetadata("binaryEqEqNotNullInRightSide.kt")
public void testBinaryEqEqNotNullInRightSide() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryEqEqNotNullInRightSide.kt");
doTest(fileName);
}
@TestMetadata("binaryEqEqNullInLeftSide.kt")
public void testBinaryEqEqNullInLeftSide() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryEqEqNullInLeftSide.kt");
doTest(fileName);
}
@TestMetadata("binaryEqEqNullInRightSide.kt")
public void testBinaryEqEqNullInRightSide() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryEqEqNullInRightSide.kt");
doTest(fileName);
}
@TestMetadata("binaryEqEqNullable.kt")
public void testBinaryEqEqNullable() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryEqEqNullable.kt");