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

J2K: no redundant type casts

Browse Source 
#KT-6794 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-03-25 20:05:37 +03:00
parent 7d92559d13
commit 555ae1ebd3
8 changed files with 79 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
+16 -4
View File
@@ -17,15 +17,16 @@
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 {
@@ -33,6 +34,17 @@ public class J2kPostProcessor(override val contextToAnalyzeIn: PsiElement) : Pos
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(){
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java
+4
View File
@@ -45,6 +45,10 @@ public class RemoveRightPartOfBinaryExpressionFix<T extends JetExpression> exten
@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) {
j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt
+1 -21
View File
@@ -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
}
}
}
j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
+32 -8
View File
@@ -16,16 +16,18 @@
package org.jetbrains.kotlin.j2k
import com.intellij.psi.PsiElement
import com.intellij.openapi.progress.ProcessCanceledException
import org.jetbrains.kotlin.j2k.ast.Element
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiJavaFile
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.resolve.BindingContext
import com.intellij.openapi.diagnostic.Logger
import java.util.ArrayList
import com.intellij.openapi.progress.ProcessCanceledException
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiJavaFile
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 java.util.ArrayList
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)
}
j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java
+7
View File
@@ -0,0 +1,7 @@
class C {
void foo(Object o) {
if (o instanceof String) {
int l = ((String) o).length();
}
}
}
j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt
+7
View File
@@ -0,0 +1,7 @@
class C {
fun foo(o: Any) {
if (o is String) {
val l = o.length()
}
}
}
j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
+6
View File
@@ -987,6 +987,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
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")
j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
+6
View File
@@ -987,6 +987,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
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")