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

Revert "[FE 1.0] Deprecate declaration of expect and actual in the same module"

Browse Source 
This reverts commit b09561c3c3.

It was decided to postpone this warning till 1.9
This is needed to provide proper IDE support

^KT-40904 Open
^KT-55177 Open
This commit is contained in:
Dmitriy Novozhilov
2023-01-17 15:17:53 +02:00
committed by Space Team
parent 9bffec268a
commit 8d728d4f53
18 changed files with 9 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
Generated
-6
View File
@@ -21228,12 +21228,6 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("expectAndActualInSameModule.kt")
public void testExpectAndActualInSameModule() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectAndActualInSameModule.kt");
}
@Test
@TestMetadata("expectDataObject.kt")
public void testExpectDataObject() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
-6
View File
@@ -21234,12 +21234,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("expectAndActualInSameModule.kt")
public void testExpectAndActualInSameModule() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectAndActualInSameModule.kt");
}
@Test
@TestMetadata("expectDataObject.kt")
public void testExpectDataObject() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
-6
View File
@@ -21228,12 +21228,6 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("expectAndActualInSameModule.kt")
public void testExpectAndActualInSameModule() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectAndActualInSameModule.kt");
}
@Test
@TestMetadata("expectDataObject.kt")
public void testExpectDataObject() throws Exception {
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
-2
View File
@@ -805,8 +805,6 @@ public interface Errors {
DiagnosticFactory2.create(ERROR, ACTUAL_DECLARATION_NAME);
DiagnosticFactory0<KtNamedDeclaration> ACTUAL_MISSING = DiagnosticFactory0.create(ERROR, ACTUAL_DECLARATION_NAME);
DiagnosticFactory0<KtNamedDeclaration> EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE = DiagnosticFactory0.create(WARNING, DECLARATION_NAME);
DiagnosticFactory0<PsiElement> OPTIONAL_EXPECTATION_NOT_ON_EXPECTED = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> OPTIONAL_DECLARATION_OUTSIDE_OF_ANNOTATION_ENTRY = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE = DiagnosticFactory0.create(ERROR);
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
-1
View File
@@ -339,7 +339,6 @@ public class DefaultErrorMessages {
MAP.put(NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS, "Actual class ''{0}'' has no corresponding members for expected class members:{1}",
NAME, adaptGenerics2(IncompatibleExpectedActualClassScopesRenderer.TEXT));
MAP.put(ACTUAL_MISSING, "Declaration must be marked with 'actual'");
MAP.put(EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE, "Expect and corresponding actual are declared in the same module, which will be prohibited in Kotlin 2.0. See https://youtrack.jetbrains.com/issue/KT-55177");
MAP.put(OPTIONAL_EXPECTATION_NOT_ON_EXPECTED, "'@OptionalExpectation' can only be used on an expected annotation class");
MAP.put(OPTIONAL_DECLARATION_OUTSIDE_OF_ANNOTATION_ENTRY, "Declaration annotated with '@OptionalExpectation' can only be used inside an annotation entry");
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt
+4 -23
View File
@@ -181,46 +181,27 @@ class ExpectedActualDeclarationChecker(
}
// Here we have exactly one compatible actual and/or some weakly incompatible. In either case, we don't report anything on expect...
val actualMembers = actuals.filter { it.key.isCompatibleOrWeakCompatible() }.flatMap { it.value }
val actualMembers = actuals.asSequence()
.filter { it.key.isCompatibleOrWeakCompatible() }.flatMap { it.value.asSequence() }
// ...except diagnostics regarding missing actual keyword, because in that case we won't start looking for the actual at all
if (checkActualModifier) {
actualMembers.forEach { reportMissingActualModifier(it, reportOn = null, trace) }
}
reportExpectAndActualInTheSameModule(reportOn, actualMembers, trace)
expectActualTracker.reportExpectActual(expected = expectDescriptor, actualMembers = actualMembers)
}
private fun reportMissingActualModifier(actual: MemberDescriptor, reportOn: KtNamedDeclaration?, trace: BindingTrace) {
if (actual.isActual) return
@Suppress("NAME_SHADOWING")
val reportOn = reportOn ?: actual.declarationSource ?: return
val reportOn = reportOn ?: (actual.source as? KotlinSourceElement)?.psi as? KtNamedDeclaration ?: return
if (requireActualModifier(actual)) {
trace.report(Errors.ACTUAL_MISSING.on(reportOn))
}
}
private val MemberDescriptor.declarationSource: KtNamedDeclaration?
get() = (this.source as? KotlinSourceElement)?.psi as? KtNamedDeclaration
private fun reportExpectAndActualInTheSameModule(
expectSource: KtNamedDeclaration,
actualMembers: List<MemberDescriptor>,
trace: BindingTrace
) {
if (expectSource.containingKtFile.isCommonSource == true) return
val actualMembersWithModifier = actualMembers.filter { it.isActual }
if (actualMembersWithModifier.isEmpty()) return
trace.report(Errors.EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE.on(expectSource))
for (actual in actualMembersWithModifier) {
val actualSource = actual.declarationSource ?: continue
trace.report(Errors.EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE.on(actualSource))
}
}
private fun MemberDescriptor.hasNoActualWithDiagnostic(
compatibility: Map<ExpectActualCompatibility<MemberDescriptor>, List<MemberDescriptor>>
): Boolean {
@@ -230,7 +211,7 @@ class ExpectedActualDeclarationChecker(
}
}
private fun ExpectActualTracker.reportExpectActual(expected: MemberDescriptor, actualMembers: List<MemberDescriptor>) {
private fun ExpectActualTracker.reportExpectActual(expected: MemberDescriptor, actualMembers: Sequence<MemberDescriptor>) {
if (this is ExpectActualTracker.DoNothing) return
val expectedFile = sourceFile(expected) ?: return
compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv14.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE")
package test
@Suppress("INLINE_CLASS_DEPRECATED", "EXPERIMENTAL_FEATURE_WARNING")
compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv15.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE")
package test
@kotlin.jvm.JvmInline
compiler/testData/diagnostics/tests/IncDecOperatorsInExpectClass.fir.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// !LANGUAGE: +MultiPlatformProjects
// SKIP_TXT
// Issue: KT-49714
expect class Counter {
operator fun inc(): Counter
operator fun dec(): Counter
}
actual typealias Counter = Int
compiler/testData/diagnostics/tests/IncDecOperatorsInExpectClass.kt
Vendored
+3 -2
View File
@@ -1,10 +1,11 @@
// FIR_IDENTICAL
// !LANGUAGE: +MultiPlatformProjects
// SKIP_TXT
// Issue: KT-49714
expect <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>class Counter<!> {
expect class Counter {
operator fun inc(): Counter
operator fun dec(): Counter
}
actual typealias <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>Counter<!> = Int
actual typealias Counter = Int
compiler/testData/diagnostics/tests/multiplatform/expectAndActualInSameModule.fir.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
// ISSUE: KT-40904, KT-55177
expect class Foo {
fun memberFun()
val memberProp: Int
}
actual class Foo {
<!ACTUAL_WITHOUT_EXPECT!>actual fun memberFun() {}<!>
<!ACTUAL_WITHOUT_EXPECT!>actual val memberProp: Int = 10<!>
}
expect fun foo()
<!ACTUAL_WITHOUT_EXPECT!>actual fun foo() {}<!>
expect val x: String
<!ACTUAL_WITHOUT_EXPECT!>actual val x: String
get() = "hello"<!>
compiler/testData/diagnostics/tests/multiplatform/expectAndActualInSameModule.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
// ISSUE: KT-40904, KT-55177
expect <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>class Foo<!> {
fun memberFun()
val memberProp: Int
}
actual <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>class Foo<!> {
actual fun memberFun() {}
actual val memberProp: Int = 10
}
expect fun <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>foo<!>()
actual fun <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>foo<!>() {}
expect val <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>x<!>: String
actual val <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>x<!>: String
get() = "hello"
compiler/testData/diagnostics/tests/multiplatform/expectAndActualInSameModule.txt
Vendored
-14
View File
@@ -1,14 +0,0 @@
package
public actual val x: kotlin.String
public actual fun foo(): kotlin.Unit
public final actual class Foo {
public constructor Foo()
public actual final val memberProp: kotlin.Int = 10
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final actual fun memberFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
-6
View File
@@ -21234,12 +21234,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("expectAndActualInSameModule.kt")
public void testExpectAndActualInSameModule() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectAndActualInSameModule.kt");
}
@Test
@TestMetadata("expectDataObject.kt")
public void testExpectDataObject() throws Exception {
libraries/stdlib/common/test/jsCollectionFactories.kt
-1
View File
@@ -2,7 +2,6 @@
* Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE")
package test.collections.js
libraries/stdlib/common/test/testUtils.kt
+1 -2
View File
@@ -2,7 +2,6 @@
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE")
package test
@@ -34,4 +33,4 @@ public expect object BackReferenceHandling {
val nonExistentGroup: HandlingOption
val nonExistentNamedGroup: HandlingOption
val groupZero: HandlingOption
}
}
libraries/stdlib/jvm/test/js/StubsJVM.kt
-1
View File
@@ -2,7 +2,6 @@
* Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE")
package test.collections.js
libraries/stdlib/jvm/test/testUtilsJVM.kt
+1 -2
View File
@@ -2,7 +2,6 @@
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE")
package test
@@ -39,4 +38,4 @@ public actual object BackReferenceHandling {
actual val nonExistentGroup: HandlingOption = HandlingOption.MATCH_NOTHING
actual val nonExistentNamedGroup: HandlingOption = HandlingOption.THROW
actual val groupZero: HandlingOption = HandlingOption.THROW
}
}