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

[FE 1.0] Substitute anonymous object's supertypes while using that in public declarations

Browse Source 
^KT-46136 Fixed
This commit is contained in:
Victor Petukhov
2022-02-21 16:18:19 +03:00
committed by teamcity
parent 2c5d817633
commit 3aabc8d666
11 changed files with 77 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt
+7
View File
@@ -21,7 +21,9 @@ import org.jetbrains.kotlin.descriptors.Substitutable
import org.jetbrains.kotlin.incremental.components.LookupLocation
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.calls.inference.wrapWithCapturingSubstitution
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.TypeSubstitutor
import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext.safeSubstitute
import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.kotlin.utils.newLinkedHashSetWithExpectedSize
import org.jetbrains.kotlin.utils.sure
@@ -35,6 +37,11 @@ class SubstitutingScope(private val workerScope: MemberScope, givenSubstitutor:
private val _allDescriptors by lazy { substitute(workerScope.getContributedDescriptors()) }
fun substitute(type: KotlinType): KotlinType {
if (substitutor.isEmpty) return type
return substitutor.safeSubstitute(type) as KotlinType
}
private fun <D : DeclarationDescriptor> substitute(descriptor: D): D {
if (substitutor.isEmpty) return descriptor