J2K: no redundant type casts

valentinkip · valentinkip · commit 555ae1ebd35c · 2015-03-31T16:10:21.000+03:00
#KT-6794 Fixed
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
@@ -17,22 +17,34 @@
 package org.jetbrains.kotlin.idea.j2k
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.diagnostics.Errors
 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.idea.quickfix.RemoveRightPartOfBinaryExpressionFix
 import org.jetbrains.kotlin.j2k.PostProcessor
-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.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.utils.printAndReturn
 import java.util.ArrayList
 
 public class J2kPostProcessor(override val contextToAnalyzeIn: PsiElement) : PostProcessor {
     override fun analyzeFile(file: JetFile): BindingContext {
         return file.analyzeFullyAndGetResult().bindingContext
     }
 
+    override fun fixForProblem(problem: Diagnostic): (() -> Unit)? {
+        val psiElement = problem.getPsiElement()
+        return when (problem.getFactory()) {
+            Errors.USELESS_CAST, Errors.USELESS_CAST_STATIC_ASSERT_IS_FINE -> { ->
+                RemoveRightPartOfBinaryExpressionFix(psiElement as JetBinaryExpressionWithTypeRHS, "").invoke()
+            }
+
+            else -> super.fixForProblem(problem)
+        }
+    }
+
     override fun doAdditionalProcessing(file: JetFile) {
         val redundantTypeArgs = ArrayList<JetTypeArgumentList>()
         file.accept(object : JetTreeVisitorVoid(){
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java
@@ -45,6 +45,10 @@ public String getFamilyName() {
 
     @Override
     public void invoke(@NotNull Project project, Editor editor, JetFile file) throws IncorrectOperationException {
+        invoke();
+    }
+
+    public void invoke() throws IncorrectOperationException {
         PsiElement newElement = null;
 
         if (element instanceof JetBinaryExpression) {
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt b/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt
@@ -32,7 +32,7 @@ class AfterConversionPass(val project: Project, val postProcessor: PostProcessor
         val bindingContext = postProcessor.analyzeFile(kotlinFile)
 
         val fixes = bindingContext.getDiagnostics().map {
-            val fix = fixForProblem(it)
+            val fix = postProcessor.fixForProblem(it)
             if (fix != null) it.getPsiElement() to fix else null
         }.filterNotNull()
 
@@ -46,24 +46,4 @@ class AfterConversionPass(val project: Project, val postProcessor: PostProcessor
 
         return kotlinFile.getText()!!
     }
-
-    private fun fixForProblem(problem: Diagnostic): (() -> Unit)? {
-        val psiElement = problem.getPsiElement()
-        return when (problem.getFactory()) {
-            Errors.UNNECESSARY_NOT_NULL_ASSERTION -> { ->
-                val exclExclOp = psiElement as JetSimpleNameExpression
-                val exclExclExpr = exclExclOp.getParent() as JetUnaryExpression
-                exclExclExpr.replace(exclExclExpr.getBaseExpression()!!)
-            }
-
-            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()!!)
-                }
-            }
-
-            else -> null
-        }
-    }
 }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
@@ -16,16 +16,18 @@
 
 package org.jetbrains.kotlin.j2k
 
-import com.intellij.psi.PsiElement
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.progress.ProcessCanceledException
-import org.jetbrains.kotlin.j2k.ast.Element
 import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiJavaFile
-import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.j2k.ast.Element
+import org.jetbrains.kotlin.j2k.usageProcessing.UsageProcessing
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
-import com.intellij.openapi.diagnostic.Logger
 import java.util.ArrayList
-import org.jetbrains.kotlin.j2k.usageProcessing.UsageProcessing
 import java.util.HashMap
 
 public trait ConversionScope {
@@ -39,6 +41,28 @@ public class FilesConversionScope(val files: Collection<PsiJavaFile>) : Conversi
 public trait PostProcessor {
     public val contextToAnalyzeIn: PsiElement
     public fun analyzeFile(file: JetFile): BindingContext
+
+    public open fun fixForProblem(problem: Diagnostic): (() -> Unit)? {
+        val psiElement = problem.getPsiElement()
+        return when (problem.getFactory()) {
+            Errors.UNNECESSARY_NOT_NULL_ASSERTION -> { ->
+                val exclExclOp = psiElement as JetSimpleNameExpression
+                val exclExclExpr = exclExclOp.getParent() as JetUnaryExpression
+                exclExclExpr.replace(exclExclExpr.getBaseExpression()!!)
+            }
+
+            Errors.VAL_REASSIGNMENT -> { ->
+                val property = (psiElement as? JetSimpleNameExpression)?.getReference()?.resolve() as? JetProperty
+                if (property != null && !property.isVar()) {
+                    val factory = JetPsiFactory(contextToAnalyzeIn.getProject())
+                    property.getValOrVarNode().getPsi()!!.replace(factory.createVarNode().getPsi()!!)
+                }
+            }
+
+            else -> null
+        }
+    }
+
     public fun doAdditionalProcessing(file: JetFile)
 }
 
diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java b/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java
@@ -0,0 +1,7 @@
+class C {
+    void foo(Object o) {
+        if (o instanceof String) {
+            int l = ((String) o).length();
+        }
+    }
+}
diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt b/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt
@@ -0,0 +1,7 @@
+class C {
+    fun foo(o: Any) {
+        if (o is String) {
+            val l = o.length()
+        }
+    }
+}
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
@@ -987,6 +987,12 @@ public void testNotIs() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java");
             doTest(fileName);
         }
+
+        @TestMetadata("RedundantTypeCast.java")
+        public void testRedundantTypeCast() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java");
+            doTest(fileName);
+        }
     }
 
     @TestMetadata("j2k/testData/fileOrElement/comments")
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
@@ -987,6 +987,12 @@ public void testNotIs() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java");
             doTest(fileName);
         }
+
+        @TestMetadata("RedundantTypeCast.java")
+        public void testRedundantTypeCast() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java");
+            doTest(fileName);
+        }
     }
 
     @TestMetadata("j2k/testData/fileOrElement/comments")

Original file line number	Diff line number	Diff line change
`@@ -987,6 +987,12 @@ public void testNotIs() throws Exception {`
`987`	`987`	`String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java");`
`988`	`988`	`doTest(fileName);`
`989`	`989`	`}`
	`990`	`+`
	`991`	`+ @TestMetadata("RedundantTypeCast.java")`
	`992`	`+ public void testRedundantTypeCast() throws Exception {`
	`993`	`+ String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java");`
	`994`	`+ doTest(fileName);`
	`995`	`+ }`
`990`	`996`	`}`
`991`	`997`
`992`	`998`	`@TestMetadata("j2k/testData/fileOrElement/comments")`