Simplify comparison fix introduced #KT-10509 Fixed

2016-03-15 18:19:44 +03:00
parent 02d4376b85
commit 214e1d3015
11 changed files with 149 additions and 0 deletions
@@ -179,6 +179,8 @@ class QuickFixRegistrar : QuickFixContributor {

        UNUSED_VARIABLE.registerFactory(RemovePsiElementSimpleFix.RemoveVariableFactory)

+        SENSELESS_COMPARISON.registerFactory(SimplifyComparisonFix)
+
        UNNECESSARY_SAFE_CALL.registerFactory(ReplaceWithDotCallFix)
        UNSAFE_CALL.registerFactory(ReplaceWithSafeCallFix)

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.quickfix
+
+import com.intellij.codeInsight.intention.IntentionAction
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2
+import org.jetbrains.kotlin.idea.intentions.SimplifyBooleanWithConstantsIntention
+import org.jetbrains.kotlin.psi.KtBinaryExpression
+import org.jetbrains.kotlin.psi.KtExpression
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtPsiFactory
+import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
+
+class SimplifyComparisonFix(element: KtExpression, val value: Boolean) : KotlinQuickFixAction<KtExpression>(element) {
+    override fun getFamilyName() = "Simplify $element to '$value'"
+
+    override fun getText() = "Simplify comparison"
+
+    override fun invoke(project: Project, editor: Editor?, file: KtFile) {
+        val parent = element.parent
+        val replacement = KtPsiFactory(element).createExpression("$value")
+        element.replace(replacement)
+
+        val booleanExpression = parent.getNonStrictParentOfType<KtBinaryExpression>() ?: return
+        val simplifyIntention = SimplifyBooleanWithConstantsIntention()
+        if (simplifyIntention.isApplicableTo(booleanExpression)) {
+            simplifyIntention.applyTo(booleanExpression, editor)
+        }
+    }
+
+    companion object : KotlinSingleIntentionActionFactory() {
+        override fun createAction(diagnostic: Diagnostic): IntentionAction? {
+            val expression = diagnostic.psiElement as? KtExpression ?: return null
+            val value = (diagnostic as? DiagnosticWithParameters2<*, *, *>)?.b as? Boolean ?: return null
+            return SimplifyComparisonFix(expression, value)
+        }
+    }
+}
@@ -0,0 +1,11 @@
+// "Simplify comparison" "true"
+fun foo(x: String?) {
+    if (x == null) {
+
+    }
+    else {
+        if (<caret>x == null) {
+
+        }
+    }
+}
@@ -0,0 +1,11 @@
+// "Simplify comparison" "true"
+fun foo(x: String?) {
+    if (x == null) {
+
+    }
+    else {
+        if (false) {
+
+        }
+    }
+}
@@ -0,0 +1,6 @@
+// "Simplify comparison" "true"
+fun foo(x: Int) {
+    if (<caret>x != null) {
+
+    }
+}
@@ -0,0 +1,6 @@
+// "Simplify comparison" "true"
+fun foo(x: Int) {
+    if (true) {
+
+    }
+}
@@ -0,0 +1,6 @@
+// "Simplify comparison" "true"
+fun foo(x: Int) {
+    if (<caret>x != null || x == null) {
+
+    }
+}
@@ -0,0 +1,6 @@
+// "Simplify comparison" "true"
+fun foo(x: Int) {
+    if (true) {
+
+    }
+}
@@ -0,0 +1,6 @@
+// "Simplify comparison" "true"
+fun foo(x: Int, arg: Boolean) {
+    if (arg && <caret>x != null) {
+
+    }
+}
@@ -0,0 +1,6 @@
+// "Simplify comparison" "true"
+fun foo(x: Int, arg: Boolean) {
+    if (arg) {
+
+    }
+}
@@ -6194,6 +6194,39 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
        }
    }

+    @TestMetadata("idea/testData/quickfix/simplifyComparison")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SimplifyComparison extends AbstractQuickFixTest {
+        public void testAllFilesPresentInSimplifyComparison() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/simplifyComparison"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+        }
+
+        @TestMetadata("doubleNull.kt")
+        public void testDoubleNull() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/simplifyComparison/doubleNull.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("notNull.kt")
+        public void testNotNull() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/simplifyComparison/notNull.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("nullOrNotNull.kt")
+        public void testNullOrNotNull() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/simplifyComparison/nullOrNotNull.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("somethingAndNotNull.kt")
+        public void testSomethingAndNotNull() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/simplifyComparison/somethingAndNotNull.kt");
+            doTest(fileName);
+        }
+    }
+
    @TestMetadata("idea/testData/quickfix/supercalls")
    @TestDataPath("$PROJECT_ROOT")
    @RunWith(JUnit3RunnerWithInners.class)