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

[FE] Prohibit expect external and expect tailrec

Browse Source 
^KT-58536 Fixed
This commit is contained in:
Roman Efremov
2023-05-17 16:08:33 +02:00
committed by Space Team
parent e6d5df18b8
commit 439cc88525
26 changed files with 298 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt
+12
View File
@@ -3252,6 +3252,18 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirErrors.EXPECTED_EXTERNAL_DECLARATION) { firDiagnostic ->
ExpectedExternalDeclarationImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirErrors.EXPECTED_TAILREC_FUNCTION) { firDiagnostic ->
ExpectedTailrecFunctionImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirErrors.IMPLEMENTATION_BY_DELEGATION_IN_EXPECT_CLASS) { firDiagnostic ->
ImplementationByDelegationInExpectClassImpl(
firDiagnostic as KtPsiDiagnostic,
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt
+8
View File
@@ -2290,6 +2290,14 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = ExpectedPrivateDeclaration::class
}
abstract class ExpectedExternalDeclaration : KtFirDiagnostic<KtModifierListOwner>() {
override val diagnosticClass get() = ExpectedExternalDeclaration::class
}
abstract class ExpectedTailrecFunction : KtFirDiagnostic<KtModifierListOwner>() {
override val diagnosticClass get() = ExpectedTailrecFunction::class
}
abstract class ImplementationByDelegationInExpectClass : KtFirDiagnostic<KtDelegatedSuperTypeEntry>() {
override val diagnosticClass get() = ImplementationByDelegationInExpectClass::class
}
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
+10
View File
@@ -2761,6 +2761,16 @@ internal class ExpectedPrivateDeclarationImpl(
override val token: KtLifetimeToken,
) : KtFirDiagnostic.ExpectedPrivateDeclaration(), KtAbstractFirDiagnostic<KtModifierListOwner>
internal class ExpectedExternalDeclarationImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.ExpectedExternalDeclaration(), KtAbstractFirDiagnostic<KtModifierListOwner>
internal class ExpectedTailrecFunctionImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.ExpectedTailrecFunction(), KtAbstractFirDiagnostic<KtModifierListOwner>
internal class ImplementationByDelegationInExpectClassImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java
Generated
+12
View File
@@ -31,6 +31,12 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst
runTest("compiler/testData/diagnostics/tests/multiplatform/expectDataObject.kt");
}
@Test
@TestMetadata("expectExternal.kt")
public void testExpectExternal() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectExternal.kt");
}
@Test
@TestMetadata("expectInterfaceApplicability.kt")
public void testExpectInterfaceApplicability() throws Exception {
@@ -43,6 +49,12 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst
runTest("compiler/testData/diagnostics/tests/multiplatform/expectObjectWithAbstractMember.kt");
}
@Test
@TestMetadata("expectTailrec.kt")
public void testExpectTailrec() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectTailrec.kt");
}
@Test
@TestMetadata("headerFunInNonHeaderClass.kt")
public void testHeaderFunInNonHeaderClass() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java
Generated
+12
View File
@@ -31,6 +31,12 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi
runTest("compiler/testData/diagnostics/tests/multiplatform/expectDataObject.kt");
}
@Test
@TestMetadata("expectExternal.kt")
public void testExpectExternal() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectExternal.kt");
}
@Test
@TestMetadata("expectInterfaceApplicability.kt")
public void testExpectInterfaceApplicability() throws Exception {
@@ -43,6 +49,12 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi
runTest("compiler/testData/diagnostics/tests/multiplatform/expectObjectWithAbstractMember.kt");
}
@Test
@TestMetadata("expectTailrec.kt")
public void testExpectTailrec() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectTailrec.kt");
}
@Test
@TestMetadata("headerFunInNonHeaderClass.kt")
public void testHeaderFunInNonHeaderClass() throws Exception {
compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
+2
View File
@@ -1104,6 +1104,8 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
val EXPECTED_LATEINIT_PROPERTY by error<KtModifierListOwner>(PositioningStrategy.LATEINIT_MODIFIER)
val SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS by error<PsiElement>()
val EXPECTED_PRIVATE_DECLARATION by error<KtModifierListOwner>(PositioningStrategy.VISIBILITY_MODIFIER)
val EXPECTED_EXTERNAL_DECLARATION by error<KtModifierListOwner>(PositioningStrategy.EXTERNAL_MODIFIER)
val EXPECTED_TAILREC_FUNCTION by error<KtModifierListOwner>(PositioningStrategy.TAILREC_MODIFIER)
val IMPLEMENTATION_BY_DELEGATION_IN_EXPECT_CLASS by error<KtDelegatedSuperTypeEntry>()
val ACTUAL_TYPE_ALIAS_NOT_TO_CLASS by error<KtTypeAlias>(PositioningStrategy.DECLARATION_SIGNATURE)
compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/model/RegularDiagnosticData.kt
+1
View File
@@ -107,6 +107,7 @@ enum class PositioningStrategy(private val strategy: String? = null) {
ENUM_MODIFIER,
FIELD_KEYWORD,
TAILREC_MODIFIER,
EXTERNAL_MODIFIER,
PROPERTY_DELEGATE,
IMPORT_ALIAS,
DECLARATION_START_TO_NAME,
compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
+2
View File
@@ -599,6 +599,8 @@ object FirErrors {
val EXPECTED_LATEINIT_PROPERTY by error0<KtModifierListOwner>(SourceElementPositioningStrategies.LATEINIT_MODIFIER)
val SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS by error0<PsiElement>()
val EXPECTED_PRIVATE_DECLARATION by error0<KtModifierListOwner>(SourceElementPositioningStrategies.VISIBILITY_MODIFIER)
val EXPECTED_EXTERNAL_DECLARATION by error0<KtModifierListOwner>(SourceElementPositioningStrategies.EXTERNAL_MODIFIER)
val EXPECTED_TAILREC_FUNCTION by error0<KtModifierListOwner>(SourceElementPositioningStrategies.TAILREC_MODIFIER)
val IMPLEMENTATION_BY_DELEGATION_IN_EXPECT_CLASS by error0<KtDelegatedSuperTypeEntry>()
val ACTUAL_TYPE_ALIAS_NOT_TO_CLASS by error0<KtTypeAlias>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
val ACTUAL_TYPE_ALIAS_TO_CLASS_WITH_DECLARATION_SITE_VARIANCE by error0<KtTypeAlias>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectActualDeclarationChecker.kt
+53
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.fir.analysis.checkers.declaration
import org.jetbrains.kotlin.KtFakeSourceElementKind
import org.jetbrains.kotlin.KtSourceElement
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.descriptors.ClassKind
@@ -15,6 +16,9 @@ import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.utils.isActual
import org.jetbrains.kotlin.fir.declarations.utils.isExpect
import org.jetbrains.kotlin.fir.declarations.utils.isExternal
import org.jetbrains.kotlin.fir.declarations.utils.isTailRec
import org.jetbrains.kotlin.fir.languageVersionSettings
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
@@ -33,11 +37,60 @@ object FirExpectActualDeclarationChecker : FirBasicDeclarationChecker() {
override fun check(declaration: FirDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
if (!context.session.languageVersionSettings.supportsFeature(LanguageFeature.MultiPlatformProjects)) return
if (declaration !is FirMemberDeclaration) return
if (declaration.isExpect) {
checkExpectDeclarationModifiers(declaration, context, reporter)
}
if (declaration.isActual) {
checkActualDeclarationHasExpected(declaration, context, reporter)
}
}
private fun checkExpectDeclarationModifiers(
declaration: FirMemberDeclaration,
context: CheckerContext,
reporter: DiagnosticReporter,
) {
checkExpectDeclarationHasNoExternalModifier(declaration, context, reporter)
if (declaration is FirProperty) {
checkExpectPropertyAccessorsModifiers(declaration, context, reporter)
}
if (declaration is FirFunction && declaration.isTailRec) {
reporter.reportOn(declaration.source, FirErrors.EXPECTED_TAILREC_FUNCTION, context)
}
}
private fun checkExpectPropertyAccessorsModifiers(
property: FirProperty,
context: CheckerContext,
reporter: DiagnosticReporter,
) {
for (accessor in listOfNotNull(property.getter, property.setter)) {
checkExpectPropertyAccessorModifiers(accessor, context, reporter)
}
}
private fun checkExpectPropertyAccessorModifiers(
accessor: FirPropertyAccessor,
context: CheckerContext,
reporter: DiagnosticReporter,
) {
fun FirPropertyAccessor.isDefault() = source?.kind == KtFakeSourceElementKind.DefaultAccessor
if (!accessor.isDefault()) {
checkExpectDeclarationHasNoExternalModifier(accessor, context, reporter)
}
}
private fun checkExpectDeclarationHasNoExternalModifier(
declaration: FirMemberDeclaration,
context: CheckerContext,
reporter: DiagnosticReporter,
) {
if (declaration.isExternal) {
reporter.reportOn(declaration.source, FirErrors.EXPECTED_EXTERNAL_DECLARATION, context)
}
}
private fun checkActualDeclarationHasExpected(
declaration: FirMemberDeclaration,
context: CheckerContext,
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrorsDefaultMessages.kt
+4
View File
@@ -223,6 +223,8 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.FLOAT_LITERAL_OUT
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DEPRECATED_BINARY_MOD
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EXPOSED_PROPERTY_TYPE_IN_CONSTRUCTOR
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DEPRECATED_IDENTITY_EQUALS
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EXPECTED_EXTERNAL_DECLARATION
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EXPECTED_TAILREC_FUNCTION
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.FORBIDDEN_BINARY_MOD
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.FORBIDDEN_IDENTITY_EQUALS
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.FORBIDDEN_IDENTITY_EQUALS_WARNING
@@ -1762,6 +1764,8 @@ object FirErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
map.put(EXPECTED_DELEGATED_PROPERTY, "Expected property cannot be delegated")
map.put(EXPECTED_LATEINIT_PROPERTY, "Expected property cannot be lateinit")
map.put(EXPECTED_PRIVATE_DECLARATION, "Expected declaration cannot be private")
map.put(EXPECTED_EXTERNAL_DECLARATION, "Expected declaration cannot be external")
map.put(EXPECTED_TAILREC_FUNCTION, "Expected function cannot have 'tailrec' modifier")
map.put(SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS, "Expected classes cannot initialize supertypes")
map.put(IMPLEMENTATION_BY_DELEGATION_IN_EXPECT_CLASS, "Implementation by delegation in expected classes is prohibited")
map.put(ACTUAL_TYPE_ALIAS_NOT_TO_CLASS, "Right-hand side of actual type alias should be a class, not another type alias")
compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt
+3
View File
@@ -455,6 +455,9 @@ object LightTreePositioningStrategies {
val TAILREC_MODIFIER: LightTreePositioningStrategy =
ModifierSetBasedLightTreePositioningStrategy(KtTokens.TAILREC_KEYWORD)
val EXTERNAL_MODIFIER: LightTreePositioningStrategy =
ModifierSetBasedLightTreePositioningStrategy(KtTokens.EXTERNAL_KEYWORD)
val OBJECT_KEYWORD: LightTreePositioningStrategy = keywordStrategy { objectKeyword(it) }
val FIELD_KEYWORD: LightTreePositioningStrategy = keywordStrategy { fieldKeyword(it) }
compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
+4
View File
@@ -309,6 +309,10 @@ object PositioningStrategies {
val TAILREC_MODIFIER: PositioningStrategy<KtModifierListOwner> =
ModifierSetBasedPositioningStrategy(KtTokens.TAILREC_KEYWORD)
@JvmField
val EXTERNAL_MODIFIER: PositioningStrategy<KtModifierListOwner> =
ModifierSetBasedPositioningStrategy(KtTokens.EXTERNAL_KEYWORD)
@JvmField
val OBJECT_KEYWORD: PositioningStrategy<KtObjectDeclaration> = object : PositioningStrategy<KtObjectDeclaration>() {
override fun mark(element: KtObjectDeclaration): List<TextRange> {
compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/SourceElementPositioningStrategies.kt
+5
View File
@@ -340,6 +340,11 @@ object SourceElementPositioningStrategies {
PositioningStrategies.TAILREC_MODIFIER
)
val EXTERNAL_MODIFIER = SourceElementPositioningStrategy(
LightTreePositioningStrategies.EXTERNAL_MODIFIER,
PositioningStrategies.EXTERNAL_MODIFIER
)
val PROPERTY_DELEGATE = SourceElementPositioningStrategy(
LightTreePositioningStrategies.PROPERTY_DELEGATE,
PositioningStrategies.PROPERTY_DELEGATE
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+2
View File
@@ -790,6 +790,8 @@ public interface Errors {
DiagnosticFactory0<PsiElement> EXPECTED_LATEINIT_PROPERTY = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> EXPECTED_PRIVATE_DECLARATION = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> EXPECTED_EXTERNAL_DECLARATION = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> EXPECTED_TAILREC_FUNCTION = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtDelegatedSuperTypeEntry> IMPLEMENTATION_BY_DELEGATION_IN_EXPECT_CLASS = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtTypeAlias> ACTUAL_TYPE_ALIAS_NOT_TO_CLASS = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE);
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+2
View File
@@ -352,6 +352,8 @@ public class DefaultErrorMessages {
MAP.put(EXPECTED_LATEINIT_PROPERTY, "Expected property cannot be lateinit");
MAP.put(SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS, "Expected classes cannot initialize supertypes");
MAP.put(EXPECTED_PRIVATE_DECLARATION, "Expected declaration cannot be private");
MAP.put(EXPECTED_EXTERNAL_DECLARATION, "Expected declaration cannot be external");
MAP.put(EXPECTED_TAILREC_FUNCTION, "Expected function cannot have 'tailrec' modifier");
MAP.put(IMPLEMENTATION_BY_DELEGATION_IN_EXPECT_CLASS, "Implementation by delegation in expected classes is prohibited");
compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
+23 -5
View File
@@ -343,7 +343,7 @@ class DeclarationsChecker(
checkPrimaryConstructor(classOrObject, classDescriptor)
checkPrivateExpectedDeclaration(classOrObject, classDescriptor)
checkExpectDeclarationModifiers(classOrObject, classDescriptor)
}
private fun checkLocalAnnotation(classDescriptor: ClassDescriptor, classOrObject: KtClassOrObject) {
@@ -618,14 +618,29 @@ class DeclarationsChecker(
shadowedExtensionChecker.checkDeclaration(property, propertyDescriptor)
checkPropertyTypeParametersAreUsedInReceiverType(propertyDescriptor)
checkImplicitCallableType(property, propertyDescriptor)
checkPrivateExpectedDeclaration(property, propertyDescriptor)
checkExpectDeclarationModifiers(property, propertyDescriptor)
checkBackingField(property)
}
private fun checkPrivateExpectedDeclaration(declaration: KtDeclaration, descriptor: MemberDescriptor) {
if (descriptor.isExpect && DescriptorVisibilities.isPrivate(descriptor.visibility)) {
private fun checkExpectDeclarationModifiers(declaration: KtDeclaration, descriptor: MemberDescriptor) {
if (!descriptor.isExpect) return
if (DescriptorVisibilities.isPrivate(descriptor.visibility)) {
trace.report(EXPECTED_PRIVATE_DECLARATION.on(declaration.modifierList?.getModifier(KtTokens.PRIVATE_KEYWORD) ?: declaration))
}
checkExpectDeclarationHasNoExternalModifier(declaration)
if (declaration is KtFunction) {
declaration.modifierList?.getModifier(KtTokens.TAILREC_KEYWORD)?.let {
trace.report(EXPECTED_TAILREC_FUNCTION.on(it))
}
}
}
private fun checkExpectDeclarationHasNoExternalModifier(declaration: KtDeclaration) {
declaration.modifierList?.getModifier(KtTokens.EXTERNAL_KEYWORD)?.let {
trace.report(EXPECTED_EXTERNAL_DECLARATION.on(it))
}
}
private fun checkPropertyTypeParametersAreUsedInReceiverType(descriptor: PropertyDescriptor) {
@@ -925,7 +940,7 @@ class DeclarationsChecker(
trace.report(EXPECTED_DECLARATION_WITH_BODY.on(function))
}
checkPrivateExpectedDeclaration(function, functionDescriptor)
checkExpectDeclarationModifiers(function, functionDescriptor)
}
private fun checkActualFunction(element: KtDeclaration, functionDescriptor: FunctionDescriptor) {
@@ -1022,6 +1037,9 @@ class DeclarationsChecker(
}
}
}
if (propertyDescriptor.isExpect) {
checkExpectDeclarationHasNoExternalModifier(accessor)
}
}
private fun checkEnumEntry(enumEntry: KtEnumEntry, enumEntryClass: ClassDescriptor) {
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualCompatibilityChecker.kt
+1 -3
View File
@@ -432,11 +432,9 @@ object AbstractExpectActualCompatibilityChecker {
}
if (
expectFunction.isExternal && !actualFunction.isExternal ||
expectFunction.isInfix && !actualFunction.isInfix ||
expectFunction.isInline && !actualFunction.isInline ||
expectFunction.isOperator && !actualFunction.isOperator ||
expectFunction.isTailrec && !actualFunction.isTailrec
expectFunction.isOperator && !actualFunction.isOperator
) {
return Incompatible.FunctionModifiersNotSubset
}
compiler/testData/diagnostics/tests/multiplatform/expectExternal.fir.kt
Vendored
+38
View File
@@ -0,0 +1,38 @@
// MODULE: m1-common
// FILE: common.kt
expect <!EXPECTED_EXTERNAL_DECLARATION!>external<!> fun foo()
expect fun bar()
expect <!EXPECTED_EXTERNAL_DECLARATION, WRONG_MODIFIER_TARGET!>external<!> var prop: String
expect var getAndSet: String
<!EXPECTED_EXTERNAL_DECLARATION!>external<!> get
<!EXPECTED_EXTERNAL_DECLARATION!>external<!> set
<!EXPECTED_EXTERNAL_DECLARATION, WRONG_MODIFIER_TARGET!>external<!> expect val explicitGetter: String
<!EXPECTED_EXTERNAL_DECLARATION!>external<!> get
expect <!EXPECTED_EXTERNAL_DECLARATION, WRONG_MODIFIER_TARGET!>external<!> class A {
<!EXPECTED_EXTERNAL_DECLARATION!>external<!> fun foo()
fun bar()
}
// MODULE: m1-jvm()()(m1-common)
// FILE: jvm.kt
actual external fun foo()
actual external fun bar()
actual <!WRONG_MODIFIER_TARGET!>external<!> var prop: String
actual var getAndSet: String
external get
external set
actual <!WRONG_MODIFIER_TARGET!>external<!> val explicitGetter: String
external get
actual class A {
actual external fun foo()
actual external fun bar()
}
compiler/testData/diagnostics/tests/multiplatform/expectExternal.kt
Vendored
+38
View File
@@ -0,0 +1,38 @@
// MODULE: m1-common
// FILE: common.kt
expect <!EXPECTED_EXTERNAL_DECLARATION, EXPECTED_EXTERNAL_DECLARATION{JVM}!>external<!> fun foo()
expect fun bar()
expect <!EXPECTED_EXTERNAL_DECLARATION, EXPECTED_EXTERNAL_DECLARATION{JVM}, WRONG_MODIFIER_TARGET{JVM}!>external<!> var prop: String
expect var getAndSet: String
<!EXPECTED_EXTERNAL_DECLARATION, EXPECTED_EXTERNAL_DECLARATION{JVM}!>external<!> get
<!EXPECTED_EXTERNAL_DECLARATION, EXPECTED_EXTERNAL_DECLARATION{JVM}!>external<!> set
<!EXPECTED_EXTERNAL_DECLARATION, EXPECTED_EXTERNAL_DECLARATION{JVM}, WRONG_MODIFIER_TARGET{JVM}!>external<!> expect val explicitGetter: String
<!EXPECTED_EXTERNAL_DECLARATION, EXPECTED_EXTERNAL_DECLARATION{JVM}!>external<!> get
expect <!EXPECTED_EXTERNAL_DECLARATION, EXPECTED_EXTERNAL_DECLARATION{JVM}, WRONG_MODIFIER_TARGET{JVM}!>external<!> class A {
<!EXPECTED_EXTERNAL_DECLARATION, EXPECTED_EXTERNAL_DECLARATION{JVM}!>external<!> fun foo()
fun bar()
}
// MODULE: m1-jvm()()(m1-common)
// FILE: jvm.kt
actual external fun foo()
actual external fun bar()
actual <!WRONG_MODIFIER_TARGET!>external<!> var prop: String
actual var getAndSet: String
external get
external set
actual <!WRONG_MODIFIER_TARGET!>external<!> val explicitGetter: String
external get
actual class A {
actual external fun foo()
actual external fun bar()
}
compiler/testData/diagnostics/tests/multiplatform/expectTailrec.fir.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
// MODULE: m1-common
// FILE: common.kt
expect <!EXPECTED_TAILREC_FUNCTION, NO_TAIL_CALLS_FOUND!>tailrec<!> fun foo(p: Int): Int
expect fun bar(p: Int): Int
expect <!WRONG_MODIFIER_TARGET!>tailrec<!> val notReport: String
expect class A {
<!EXPECTED_TAILREC_FUNCTION, NO_TAIL_CALLS_FOUND!>tailrec<!> fun foo(p: Int): Int
fun bar(p: Int): Int
}
// MODULE: m1-jvm()()(m1-common)
// FILE: jvm.kt
actual tailrec fun foo(p: Int): Int = foo(p)
actual tailrec fun bar(p: Int): Int = bar(p)
actual val notReport: String = "123"
actual class A {
actual tailrec fun foo(p: Int): Int = foo(p)
actual tailrec fun bar(p: Int): Int = bar(p)
}
compiler/testData/diagnostics/tests/multiplatform/expectTailrec.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
// MODULE: m1-common
// FILE: common.kt
expect <!EXPECTED_TAILREC_FUNCTION, EXPECTED_TAILREC_FUNCTION{JVM}!>tailrec<!> fun foo(p: Int): Int
expect fun bar(p: Int): Int
expect <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>tailrec<!> val notReport: String
expect class A {
<!EXPECTED_TAILREC_FUNCTION, EXPECTED_TAILREC_FUNCTION{JVM}!>tailrec<!> fun foo(p: Int): Int
fun bar(p: Int): Int
}
// MODULE: m1-jvm()()(m1-common)
// FILE: jvm.kt
actual tailrec fun foo(p: Int): Int = foo(p)
actual tailrec fun bar(p: Int): Int = bar(p)
actual val notReport: String = "123"
actual class A {
actual tailrec fun foo(p: Int): Int = foo(p)
actual tailrec fun bar(p: Int): Int = bar(p)
}
compiler/testData/multiplatform/incompatibleFunctions/common.kt
Vendored
+1 -5
View File
@@ -2,8 +2,4 @@ expect infix fun Int.plus(s: CharSequence): Int
expect operator fun Double.times(x: CharArray)
expect external fun f1()
expect inline fun f2()
expect tailrec fun f3()
expect inline fun f1()
compiler/testData/multiplatform/incompatibleFunctions/jvm.kt
Vendored
-4
View File
@@ -3,7 +3,3 @@ actual fun Int.plus(s: CharSequence): Int = 0
actual fun Double.times(x: CharArray) {}
actual fun f1() {}
actual fun f2() {}
actual fun f3() {}
compiler/testData/multiplatform/incompatibleFunctions/output.txt
Vendored
+4 -16
View File
@@ -6,32 +6,20 @@ Output:
Exit code: COMPILATION_ERROR
Output:
compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:1:1: error: actual function 'plus' has no corresponding expected declaration
The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (external, infix, inline, operator, tailrec):
The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (infix, inline, operator):
public expect infix fun Int.plus(s: CharSequence): Int
actual fun Int.plus(s: CharSequence): Int = 0
^
compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:3:1: error: actual function 'times' has no corresponding expected declaration
The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (external, infix, inline, operator, tailrec):
The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (infix, inline, operator):
public expect operator fun Double.times(x: CharArray): Unit
actual fun Double.times(x: CharArray) {}
^
compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:5:1: error: actual function 'f1' has no corresponding expected declaration
The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (external, infix, inline, operator, tailrec):
public external expect fun f1(): Unit
The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (infix, inline, operator):
public expect inline fun f1(): Unit
actual fun f1() {}
^
compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:7:1: error: actual function 'f2' has no corresponding expected declaration
The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (external, infix, inline, operator, tailrec):
public expect inline fun f2(): Unit
actual fun f2() {}
^
compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:9:1: error: actual function 'f3' has no corresponding expected declaration
The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (external, infix, inline, operator, tailrec):
public expect tailrec fun f3(): Unit
actual fun f3() {}
^
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+12
View File
@@ -22252,6 +22252,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectDataObject.kt");
}
@Test
@TestMetadata("expectExternal.kt")
public void testExpectExternal() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectExternal.kt");
}
@Test
@TestMetadata("expectInterfaceApplicability.kt")
public void testExpectInterfaceApplicability() throws Exception {
@@ -22264,6 +22270,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectObjectWithAbstractMember.kt");
}
@Test
@TestMetadata("expectTailrec.kt")
public void testExpectTailrec() throws Exception {
runTest("compiler/testData/diagnostics/tests/multiplatform/expectTailrec.kt");
}
@Test
@TestMetadata("headerFunInNonHeaderClass.kt")
public void testHeaderFunInNonHeaderClass() throws Exception {
core/compiler.common/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectActualCompatibility.kt
+1 -1
View File
@@ -50,7 +50,7 @@ sealed class ExpectActualCompatibility<out D> {
object FunctionModifiersDifferent : Incompatible<Nothing>("modifiers are different (suspend)")
object FunctionModifiersNotSubset : Incompatible<Nothing>(
"some modifiers on expected declaration are missing on the actual one (external, infix, inline, operator, tailrec)"
"some modifiers on expected declaration are missing on the actual one (infix, inline, operator)"
)
// Properties