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

KMP: Put "prohbit actual typealias to Nothing and Nullable" under the flag

Browse Source 
^KT-61668 Fixed

Review: https://jetbrains.team/p/kt/reviews/12062/timeline
This commit is contained in:
Nikita Bobko
2023-09-05 16:57:16 +02:00
committed by Space Team
parent 141bc9cac9
commit 0922833b46
8 changed files with 98 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java
Generated
+12
View File
@@ -1683,12 +1683,24 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing.kt");
}
@Test
@TestMetadata("actualTypealiasToNothing_oldLanguageVersion.kt")
public void testActualTypealiasToNothing_oldLanguageVersion() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.kt");
}
@Test
@TestMetadata("actualTypealiasToNullableType.kt")
public void testActualTypealiasToNullableType() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNullableType.kt");
}
@Test
@TestMetadata("actualTypealiasToNullableType_oldLanguageVersion.kt")
public void testActualTypealiasToNullableType_oldLanguageVersion() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNullableType_oldLanguageVersion.kt");
}
@Test
public void testAllFilesPresentInTypealias() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform/typealias"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true);
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java
Generated
+12
View File
@@ -1683,12 +1683,24 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing.kt");
}
@Test
@TestMetadata("actualTypealiasToNothing_oldLanguageVersion.kt")
public void testActualTypealiasToNothing_oldLanguageVersion() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.kt");
}
@Test
@TestMetadata("actualTypealiasToNullableType.kt")
public void testActualTypealiasToNullableType() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNullableType.kt");
}
@Test
@TestMetadata("actualTypealiasToNullableType_oldLanguageVersion.kt")
public void testActualTypealiasToNullableType_oldLanguageVersion() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNullableType_oldLanguageVersion.kt");
}
@Test
public void testAllFilesPresentInTypealias() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform/typealias"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true);
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirActualTypeAliasChecker.kt
+10 -7
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.fir.analysis.checkers.declaration
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.reportOn
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
@@ -62,14 +63,16 @@ object FirActualTypeAliasChecker : FirTypeAliasChecker() {
reporter.reportOn(declaration.source, FirErrors.ACTUAL_TYPE_ALIAS_WITH_COMPLEX_SUBSTITUTION, context)
}
@OptIn(UnexpandedTypeCheck::class)
// an earlier check ensures we have an ACTUAL_TYPE_ALIAS_NOT_TO_CLASS error on non-expanded type alias
if (expandedTypeRef.isNothing) {
reporter.reportOn(declaration.source, FirErrors.ACTUAL_TYPE_ALIAS_TO_NOTHING, context)
}
if (context.languageVersionSettings.supportsFeature(LanguageFeature.MultiplatformRestrictions)) {
@OptIn(UnexpandedTypeCheck::class)
// an earlier check ensures we have an ACTUAL_TYPE_ALIAS_NOT_TO_CLASS error on non-expanded type alias
if (expandedTypeRef.isNothing) {
reporter.reportOn(declaration.source, FirErrors.ACTUAL_TYPE_ALIAS_TO_NOTHING, context)
}
if (expandedTypeRef.isMarkedNullable == true) {
reporter.reportOn(declaration.source, FirErrors.ACTUAL_TYPE_ALIAS_TO_NULLABLE_TYPE, context)
if (expandedTypeRef.isMarkedNullable == true) {
reporter.reportOn(declaration.source, FirErrors.ACTUAL_TYPE_ALIAS_TO_NULLABLE_TYPE, context)
}
}
}
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
+9 -7
View File
@@ -191,14 +191,16 @@ class DeclarationsChecker(
return
}
if (rhs.isNothing()) {
trace.report(ACTUAL_TYPE_ALIAS_TO_NOTHING.on(declaration))
return
}
if (languageVersionSettings.supportsFeature(LanguageFeature.MultiplatformRestrictions)) {
if (rhs.isNothing()) {
trace.report(ACTUAL_TYPE_ALIAS_TO_NOTHING.on(declaration))
return
}
if (rhs.isMarkedNullable) {
trace.report(ACTUAL_TYPE_ALIAS_TO_NULLABLE_TYPE.on(declaration))
return
if (rhs.isMarkedNullable) {
trace.report(ACTUAL_TYPE_ALIAS_TO_NULLABLE_TYPE.on(declaration))
return
}
}
}
compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.fir.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// LANGUAGE: -MultiplatformRestrictions
// MODULE: m1-common
// FILE: common.kt
<!INCOMPATIBLE_MATCHING{JVM}!>expect class E01<!>
<!INCOMPATIBLE_MATCHING{JVM}!>expect class E02<!>
// MODULE: m1-jvm()()(m1-common)
// FILE: jvm.kt
typealias MyNothing = Nothing
actual typealias E01 = Nothing
<!ACTUAL_TYPE_ALIAS_NOT_TO_CLASS!>actual typealias E02 = MyNothing<!>
compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// LANGUAGE: -MultiplatformRestrictions
// MODULE: m1-common
// FILE: common.kt
expect class E01
expect class E02
// MODULE: m1-jvm()()(m1-common)
// FILE: jvm.kt
typealias MyNothing = Nothing
actual typealias E01 = Nothing
<!ACTUAL_TYPE_ALIAS_NOT_TO_CLASS!>actual typealias E02 = MyNothing<!>
compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNullableType_oldLanguageVersion.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// LANGUAGE: -MultiplatformRestrictions
// FIR_IDENTICAL
// MODULE: m1-common
// FILE: common.kt
expect class E01
expect class E02
// MODULE: m1-jvm()()(m1-common)
// FILE: jvm.kt
typealias MyNullable = String?
actual typealias E01 = String?
<!ACTUAL_TYPE_ALIAS_NOT_TO_CLASS!>actual typealias E02 = MyNullable<!>
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+12
View File
@@ -24678,12 +24678,24 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing.kt");
}
@Test
@TestMetadata("actualTypealiasToNothing_oldLanguageVersion.kt")
public void testActualTypealiasToNothing_oldLanguageVersion() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.kt");
}
@Test
@TestMetadata("actualTypealiasToNullableType.kt")
public void testActualTypealiasToNullableType() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNullableType.kt");
}
@Test
@TestMetadata("actualTypealiasToNullableType_oldLanguageVersion.kt")
public void testActualTypealiasToNullableType_oldLanguageVersion() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNullableType_oldLanguageVersion.kt");
}
@Test
public void testAllFilesPresentInTypealias() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform/typealias"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);