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

Intention "Specify type explicitly" should offer all bounds for platform types #KT-12633 Fixed

Browse Source
This commit is contained in:
Kirill Rakhman
2016-11-26 14:13:23 +01:00
committed by Mikhail Glukhikh
parent ba92dcb737
commit 68df8c55e7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
+10 -4
View File
@@ -40,9 +40,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.isFlexible
import org.jetbrains.kotlin.utils.ifEmpty import org.jetbrains.kotlin.utils.ifEmpty
class SpecifyTypeExplicitlyIntention : class SpecifyTypeExplicitlyIntention :
@@ -115,7 +113,15 @@ class SpecifyTypeExplicitlyIntention :
val resolutionFacade = contextElement.getResolutionFacade() val resolutionFacade = contextElement.getResolutionFacade()
val bindingContext = resolutionFacade.analyze(contextElement, BodyResolveMode.PARTIAL) val bindingContext = resolutionFacade.analyze(contextElement, BodyResolveMode.PARTIAL)
val scope = contextElement.getResolutionScope(bindingContext, resolutionFacade) val scope = contextElement.getResolutionScope(bindingContext, resolutionFacade)
val types = exprType.getResolvableApproximations(scope, true).toList().ifEmpty { return null } val types = with (exprType.getResolvableApproximations(scope, true).toList()) {
when {
exprType.isNullabilityFlexible() -> flatMap {
listOf(TypeUtils.makeNotNullable(it), TypeUtils.makeNullable(it))
}
else -> this
}
}.ifEmpty { return null }
return object : ChooseValueExpression<KotlinType>(types, types.first()) { return object : ChooseValueExpression<KotlinType>(types, types.first()) {
override fun getLookupString(element: KotlinType) = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(element) override fun getLookupString(element: KotlinType) = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(element)
override fun getResult(element: KotlinType) = IdeDescriptorRenderers.SOURCE_CODE.renderType(element) override fun getResult(element: KotlinType) = IdeDescriptorRenderers.SOURCE_CODE.renderType(element)