J2K: generating "!is" instead of !(.. is ..)

valentinkip · valentinkip · commit 7d92559d1306 · 2015-03-31T16:10:21.000+03:00
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
@@ -69,6 +69,10 @@ public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntentio
     }
 
     override fun applyTo(element: JetPrefixExpression, editor: Editor) {
+        applyTo(element)
+    }
+
+    public fun applyTo(element: JetPrefixExpression) {
         // Guaranteed to succeed (by isApplicableTo)
         val expression = element.unparenthesize()!!
         val invertedOperation = JetPsiUtil.getOperationToken(expression as JetOperationExpression)!!.negate()!!
@@ -87,7 +91,7 @@ public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntentio
                             expression.getRight()
                     )
                     else -> throw IllegalStateException(
-                         "Expression is neither a JetIsExpression or JetBinaryExpression (checked by isApplicableTo): ${expression.getText()}"
+                            "Expression is neither a JetIsExpression or JetBinaryExpression (checked by isApplicableTo): ${expression.getText()}"
                     )
                 }
         )
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
@@ -16,13 +16,17 @@
 
 package org.jetbrains.kotlin.idea.j2k
 
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
+import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArguments
+import org.jetbrains.kotlin.idea.intentions.SimplifyNegatedBinaryExpressionIntention
 import org.jetbrains.kotlin.j2k.PostProcessor
-import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.JetPrefixExpression
+import org.jetbrains.kotlin.psi.JetTreeVisitorVoid
+import org.jetbrains.kotlin.psi.JetTypeArgumentList
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArguments
-import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
 import java.util.ArrayList
-import com.intellij.psi.PsiElement
 
 public class J2kPostProcessor(override val contextToAnalyzeIn: PsiElement) : PostProcessor {
     override fun analyzeFile(file: JetFile): BindingContext {
@@ -40,6 +44,15 @@ public class J2kPostProcessor(override val contextToAnalyzeIn: PsiElement) : Pos
 
                 super.visitTypeArgumentList(typeArgumentList)
             }
+
+            override fun visitPrefixExpression(expression: JetPrefixExpression) {
+                super.visitPrefixExpression(expression)
+
+                val intention = SimplifyNegatedBinaryExpressionIntention()
+                if (intention.isApplicableTo(expression)) {
+                    intention.applyTo(expression)
+                }
+            }
         })
 
         for (typeArgs in redundantTypeArgs) {
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt b/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt
@@ -50,13 +50,13 @@ class AfterConversionPass(val project: Project, val postProcessor: PostProcessor
     private fun fixForProblem(problem: Diagnostic): (() -> Unit)? {
         val psiElement = problem.getPsiElement()
         return when (problem.getFactory()) {
-            Errors.UNNECESSARY_NOT_NULL_ASSERTION -> { () ->
+            Errors.UNNECESSARY_NOT_NULL_ASSERTION -> { ->
                 val exclExclOp = psiElement as JetSimpleNameExpression
                 val exclExclExpr = exclExclOp.getParent() as JetUnaryExpression
                 exclExclExpr.replace(exclExclExpr.getBaseExpression()!!)
             }
 
-            Errors.VAL_REASSIGNMENT -> { () ->
+            Errors.VAL_REASSIGNMENT -> { ->
                 val property = (psiElement as? JetSimpleNameExpression)?.getReference()?.resolve() as? JetProperty
                 if (property != null && !property.isVar()) {
                     property.getValOrVarNode().getPsi()!!.replace(JetPsiFactory(project).createVarNode().getPsi()!!)
diff --git a/j2k/testData/fileOrElement/codeSimplifications/NotIs.java b/j2k/testData/fileOrElement/codeSimplifications/NotIs.java
@@ -0,0 +1,6 @@
+class C {
+    void foo(Object o) {
+        if (!(o instanceof String)) return;
+        System.out.println("String");
+    }
+}
diff --git a/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt b/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt
@@ -0,0 +1,6 @@
+class C {
+    fun foo(o: Any) {
+        if (o !is String) return
+        System.out.println("String")
+    }
+}
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
@@ -45,6 +45,7 @@
         JavaToKotlinConverterForWebDemoTestGenerated.CallChainExpression.class,
         JavaToKotlinConverterForWebDemoTestGenerated.Class.class,
         JavaToKotlinConverterForWebDemoTestGenerated.ClassExpression.class,
+        JavaToKotlinConverterForWebDemoTestGenerated.CodeSimplifications.class,
         JavaToKotlinConverterForWebDemoTestGenerated.Comments.class,
         JavaToKotlinConverterForWebDemoTestGenerated.ConditionalExpression.class,
         JavaToKotlinConverterForWebDemoTestGenerated.Constructors.class,
@@ -973,6 +974,21 @@ public void testStringClass() throws Exception {
         }
     }
 
+    @TestMetadata("j2k/testData/fileOrElement/codeSimplifications")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class CodeSimplifications extends AbstractJavaToKotlinConverterForWebDemoTest {
+        public void testAllFilesPresentInCodeSimplifications() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true);
+        }
+
+        @TestMetadata("NotIs.java")
+        public void testNotIs() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("j2k/testData/fileOrElement/comments")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
@@ -45,6 +45,7 @@
         JavaToKotlinConverterSingleFileTestGenerated.CallChainExpression.class,
         JavaToKotlinConverterSingleFileTestGenerated.Class.class,
         JavaToKotlinConverterSingleFileTestGenerated.ClassExpression.class,
+        JavaToKotlinConverterSingleFileTestGenerated.CodeSimplifications.class,
         JavaToKotlinConverterSingleFileTestGenerated.Comments.class,
         JavaToKotlinConverterSingleFileTestGenerated.ConditionalExpression.class,
         JavaToKotlinConverterSingleFileTestGenerated.Constructors.class,
@@ -973,6 +974,21 @@ public void testStringClass() throws Exception {
         }
     }
 
+    @TestMetadata("j2k/testData/fileOrElement/codeSimplifications")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class CodeSimplifications extends AbstractJavaToKotlinConverterSingleFileTest {
+        public void testAllFilesPresentInCodeSimplifications() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true);
+        }
+
+        @TestMetadata("NotIs.java")
+        public void testNotIs() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("j2k/testData/fileOrElement/comments")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,10 @@ public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntentio`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`override fun applyTo(element: JetPrefixExpression, editor: Editor) {`
	`72`	`+ applyTo(element)`
	`73`	`+ }`
	`74`	`+`
	`75`	`+ public fun applyTo(element: JetPrefixExpression) {`
`72`	`76`	`// Guaranteed to succeed (by isApplicableTo)`
`73`	`77`	`val expression = element.unparenthesize()!!`
`74`	`78`	`val invertedOperation = JetPsiUtil.getOperationToken(expression as JetOperationExpression)!!.negate()!!`
`@@ -87,7 +91,7 @@ public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntentio`
`87`	`91`	`expression.getRight()`
`88`	`92`	`)`
`89`	`93`	`else -> throw IllegalStateException(`
`90`		`- "Expression is neither a JetIsExpression or JetBinaryExpression (checked by isApplicableTo): ${expression.getText()}"`
	`94`	`+ "Expression is neither a JetIsExpression or JetBinaryExpression (checked by isApplicableTo): ${expression.getText()}"`
`91`	`95`	`)`
`92`	`96`	`}`
`93`	`97`	`)`