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

Split setting substitutor descriptor for entire resolved call into two parts: setting resulting substitutor and setting substitutor for resolved call's types

Browse Source
This commit is contained in:
Victor Petukhov
2021-05-24 15:00:59 +03:00
parent fd5169186e
commit d8c68aacdd
10 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt
+9 -1
View File
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner
import org.jetbrains.kotlin.types.checker.REFINER_CAPABILITY
import org.jetbrains.kotlin.types.refinement.TypeRefinement
import org.jetbrains.kotlin.types.typeUtil.contains
import org.jetbrains.kotlin.types.typeUtil.isAnyOrNullableAny
import org.jetbrains.kotlin.types.typeUtil.makeNullable
import org.jetbrains.kotlin.utils.DFS
@@ -424,8 +425,15 @@ fun ModuleDescriptor.isTypeRefinementEnabled(): Boolean = getCapability(REFINER_
val VariableDescriptor.isUnderscoreNamed
get() = !name.isSpecial && name.identifier == "_"
fun <D : CallableDescriptor> D.shouldBeUsedToSubstitute() =
private fun <D : CallableDescriptor> D.containsStubTypes() =
valueParameters.any { parameter -> parameter.type.contains { it is StubTypeForBuilderInference } }
|| returnType?.contains { it is StubTypeForBuilderInference } == true
|| dispatchReceiverParameter?.type?.contains { it is StubTypeForBuilderInference } == true
|| extensionReceiverParameter?.type?.contains { it is StubTypeForBuilderInference } == true
fun <D : CallableDescriptor> D.shouldBeSubstituteWithStubTypes() =
valueParameters.none { it.type.isError }
&& returnType?.isError != true
&& dispatchReceiverParameter?.type?.isError != true
&& extensionReceiverParameter?.type?.isError != true
&& containsStubTypes()