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

RemoveExplicitTypeArguments fixed: platform types approximated before comparison

Browse Source
This commit is contained in:
Andrey Breslav
2014-10-07 20:05:48 +04:00
parent 94f4ddb762
commit d74b27335e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt
+2 -1
View File
@@ -35,6 +35,7 @@ import org.jetbrains.jet.lang.psi.JetDeclarationWithBody
import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.jet.lang.psi.psiUtil.getTextWithLocation import org.jetbrains.jet.lang.psi.psiUtil.getTextWithLocation
import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo
import org.jetbrains.jet.plugin.util.approximateFlexibleTypes
public class RemoveExplicitTypeArguments : JetSelfTargetingIntention<JetTypeArgumentList>( public class RemoveExplicitTypeArguments : JetSelfTargetingIntention<JetTypeArgumentList>(
"remove.explicit.type.arguments", javaClass()) { "remove.explicit.type.arguments", javaClass()) {
@@ -80,7 +81,7 @@ public class RemoveExplicitTypeArguments : JetSelfTargetingIntention<JetTypeArgu
val args = originalCall.getTypeArguments() val args = originalCall.getTypeArguments()
val newArgs = resolutionResults?.getResultingCall()?.getTypeArguments() val newArgs = resolutionResults?.getResultingCall()?.getTypeArguments()
return args == newArgs return args == newArgs?.mapValues { approximateFlexibleTypes(it.getValue(), false) }
} }
private class CallWithoutTypeArgs(call: Call) : DelegatingCall(call) { private class CallWithoutTypeArgs(call: Call) : DelegatingCall(call) {