From fe810783661f53786cb8c5021bc6168ee00b8e83 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 5 Apr 2021 12:48:35 +0300 Subject: [PATCH] Allow sealed inheritors for expect sealed classes in MPP submodules KT-45842 Fixed KTIJ-7068 --- .../SealedInheritorInSameModuleChecker.kt | 13 +++++++++++-- .../common/common.kt | 4 ++++ .../dependencies.txt | 6 ++++++ .../intermediate/platform.kt | 4 ++++ .../main/main.kt | 3 +++ .../common/common.kt | 16 ++++++++++++++++ .../dependencies.txt | 8 ++++++++ .../intermediate/intermediate.kt | 6 ++++++ .../main/main.kt | 6 ++++++ .../real-main/real-main.kt | 3 +++ .../commonA/commonA.kt | 2 +- .../MultiplatformAnalysisTestGenerated.java | 10 ++++++++++ 12 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/common/common.kt create mode 100644 idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/dependencies.txt create mode 100644 idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/intermediate/platform.kt create mode 100644 idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/main/main.kt create mode 100644 idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/common/common.kt create mode 100644 idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/dependencies.txt create mode 100644 idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/intermediate/intermediate.kt create mode 100644 idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/main/main.kt create mode 100644 idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/real-main/real-main.kt diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/SealedInheritorInSameModuleChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/SealedInheritorInSameModuleChecker.kt index 1e0d55233ad..9e72a517183 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/SealedInheritorInSameModuleChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/SealedInheritorInSameModuleChecker.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.resolve.checkers import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.descriptors.isSealed import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.KtClassOrObject @@ -22,8 +23,16 @@ object SealedInheritorInSameModuleChecker : DeclarationChecker { val typeReference = superTypeListEntry.typeReference ?: continue val superType = typeReference.getAbbreviatedTypeOrType(context.trace.bindingContext)?.unwrap() ?: continue val superClass = superType.constructor.declarationDescriptor ?: continue - if (superClass.isSealed() && superClass.module != currentModule) { - context.trace.report(Errors.SEALED_INHERITOR_IN_DIFFERENT_MODULE.on(typeReference)) + if (superClass.isSealed()) { + /* + * It's allowed to declare inheritors of expect sealed class in any dependent module until actual + * counterpart for this class will be declared. So if super class is resolved to expect sealed + * class then its allowed to declare inheritor + */ + val inheritorAllowed = superClass.isExpect || superClass.module == currentModule + if (!inheritorAllowed) { + context.trace.report(Errors.SEALED_INHERITOR_IN_DIFFERENT_MODULE.on(typeReference)) + } } } } diff --git a/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/common/common.kt b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/common/common.kt new file mode 100644 index 00000000000..eeb66a7aa8b --- /dev/null +++ b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/common/common.kt @@ -0,0 +1,4 @@ +package foo + +expect sealed class SealedWithSharedActual() +expect sealed class SealedWithPlatformActuals : SealedWithSharedActual diff --git a/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/dependencies.txt b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/dependencies.txt new file mode 100644 index 00000000000..9f2cfdcd7d2 --- /dev/null +++ b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/dependencies.txt @@ -0,0 +1,6 @@ +MODULE common { platform=[JVM, JS, Native]; root=common } +MODULE intermediate { platform=[JVM]; root=intermediate } +MODULE main { platform=[JVM]; root=main } + +intermediate -> common { kind=DEPENDS_ON } +main -> intermediate { kind=DEPENDS_ON } diff --git a/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/intermediate/platform.kt b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/intermediate/platform.kt new file mode 100644 index 00000000000..d11f8f27dd6 --- /dev/null +++ b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/intermediate/platform.kt @@ -0,0 +1,4 @@ +package foo + +actual sealed class SealedWithSharedActual +class SimpleShared : SealedWithPlatformActuals() diff --git a/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/main/main.kt b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/main/main.kt new file mode 100644 index 00000000000..de7202b7303 --- /dev/null +++ b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/main/main.kt @@ -0,0 +1,3 @@ +package foo + +actual sealed class SealedWithPlatformActuals actual constructor(): SealedWithSharedActual() diff --git a/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/common/common.kt b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/common/common.kt new file mode 100644 index 00000000000..14d42398238 --- /dev/null +++ b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/common/common.kt @@ -0,0 +1,16 @@ +package foo + +/* + * - Sealed1 [common], actualized in [main] + * - Sealed2 [common], actualized in [intermediate] + * - Derived11 [common] + * - Derived12 [intermediate] + * - Derived1 [common] + * - Derived2 [intermediate] + * - Derived3 [main] + */ +expect sealed class Sealed1() +expect sealed class Sealed2() : Sealed1 + +class Derived1 : Sealed1() +class Derived11 : Sealed2() diff --git a/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/dependencies.txt b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/dependencies.txt new file mode 100644 index 00000000000..5571b2cd6fb --- /dev/null +++ b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/dependencies.txt @@ -0,0 +1,8 @@ +MODULE common { platform=[JVM, JS, Native]; root=common } +MODULE intermediate { platform=[JVM]; root=intermediate } +MODULE main { platform=[JVM]; root=main } +MODULE real-main { platform=[JVM]; root=real-main } + +intermediate -> common { kind=DEPENDS_ON } +main -> intermediate { kind=DEPENDS_ON } +real-main -> main { kind=DEPENDS_ON } diff --git a/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/intermediate/intermediate.kt b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/intermediate/intermediate.kt new file mode 100644 index 00000000000..4056ae1e07f --- /dev/null +++ b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/intermediate/intermediate.kt @@ -0,0 +1,6 @@ +package foo + +actual sealed class Sealed2 : Sealed1() + +class Derived2 : Sealed1() +class Derived12 : Sealed2() diff --git a/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/main/main.kt b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/main/main.kt new file mode 100644 index 00000000000..18882270023 --- /dev/null +++ b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/main/main.kt @@ -0,0 +1,6 @@ +package foo + +actual sealed class Sealed1 actual constructor() + +class Derived2 : Sealed1() +class Derived13Error : Sealed2() // should be an error diff --git a/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/real-main/real-main.kt b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/real-main/real-main.kt new file mode 100644 index 00000000000..47bb83df1c9 --- /dev/null +++ b/idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/real-main/real-main.kt @@ -0,0 +1,3 @@ +package foo + +class Derived3Error : Sealed1() // should be an error diff --git a/idea/testData/multiplatform/whenExhaustivenessForSealed/commonA/commonA.kt b/idea/testData/multiplatform/whenExhaustivenessForSealed/commonA/commonA.kt index 932279efdc9..347b95716b7 100644 --- a/idea/testData/multiplatform/whenExhaustivenessForSealed/commonA/commonA.kt +++ b/idea/testData/multiplatform/whenExhaustivenessForSealed/commonA/commonA.kt @@ -1 +1 @@ -class CommonAImplTestClass: TestClass() \ No newline at end of file +class CommonAImplTestClass: TestClass() diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java index a91cc3ccd48..b22850fa7ff 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java @@ -229,6 +229,16 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna runTest("idea/testData/multiplatform/recursiveTypes/"); } + @TestMetadata("sealedInheritorsInComplexModuleStructure1") + public void testSealedInheritorsInComplexModuleStructure1() throws Exception { + runTest("idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure1/"); + } + + @TestMetadata("sealedInheritorsInComplexModuleStructure2") + public void testSealedInheritorsInComplexModuleStructure2() throws Exception { + runTest("idea/testData/multiplatform/sealedInheritorsInComplexModuleStructure2/"); + } + @TestMetadata("simple") public void testSimple() throws Exception { runTest("idea/testData/multiplatform/simple/");