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

Support actualization of expect sealed class with typealias in CliSealedClassInheritorsProvider

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-04-05 13:39:09 +03:00
committed by TeamCityServer
parent fe81078366
commit a107e3d160
4 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -18036,6 +18036,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.kt");
}
@Test
@TestMetadata("expectSealedClassWithActualTypealias.kt")
public void testExpectSealedClassWithActualTypealias() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClassWithActualTypealias.kt");
}
@Test
@TestMetadata("expectSealedInterface.kt")
public void testExpectSealedInterface() throws Exception {
compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClassWithActualTypealias.kt
Vendored
+25
View File
@@ -0,0 +1,25 @@
// FIR_IDENTICAL
// !LANGUAGE: +MultiPlatformProjects
// ISSUE: KT-45796
// SKIP_TXT
// MODULE: m1-common
expect sealed class SealedClass()
class Derived1 : SealedClass()
// MODULE: m1-jvm(m1-common)
actual typealias SealedClass = MySealedClass
sealed class MySealedClass
class Derived2 : SealedClass()
class Derived3 : MySealedClass()
fun whenForSealed(s: SealedClass): Int {
return when (s) { // Should be OK
is Derived1 -> 1
is Derived2 -> 2
is Derived3 -> 3
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -18042,6 +18042,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.kt");
}
@Test
@TestMetadata("expectSealedClassWithActualTypealias.kt")
public void testExpectSealedClassWithActualTypealias() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClassWithActualTypealias.kt");
}
@Test
@TestMetadata("expectSealedInterface.kt")
public void testExpectSealedInterface() throws Exception {
core/descriptors/src/org/jetbrains/kotlin/resolve/SealedClassInheritorsProvider.kt
+10 -6
View File
@@ -8,14 +8,12 @@ package org.jetbrains.kotlin.resolve
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.incremental.components.LookupLocation
import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.resolve.descriptorUtil.parents
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.MemberScope
import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner
import org.jetbrains.kotlin.types.refinement.TypeRefinement
import org.jetbrains.kotlin.utils.addToStdlib.runIf
abstract class SealedClassInheritorsProvider {
/**
@@ -48,9 +46,15 @@ object CliSealedClassInheritorsProvider : SealedClassInheritorsProvider() {
* of theirs actuals, so we need to lookup for descriptor once again via
* scope.getContributedClassifier() to match expects (if possible)
*/
val refinedDescriptor = runIf(descriptor.isExpect) {
scope.getContributedClassifier(descriptor.name, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS) as? ClassDescriptor
} ?: descriptor
val refinedDescriptor = if (descriptor.isExpect) {
when (val actualDescriptor = scope.getContributedClassifier(descriptor.name, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS)) {
is ClassDescriptor -> actualDescriptor
is TypeAliasDescriptor -> actualDescriptor.classDescriptor
else -> null
}
} else {
descriptor
} ?: continue
if (DescriptorUtils.isDirectSubclass(refinedDescriptor, sealedClass)) {
result.add(refinedDescriptor)