From 556b7894d50705e4db2bb735fcc2cb0eae2df0cf Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 23 Sep 2022 20:10:20 +0200 Subject: [PATCH] [Low Level FIR] do not search for declarations from `kotlin.` package in source modules --- .../LLFirNonUnderContentRootSessionFactory.kt | 3 ++- .../level/api/fir/providers/LLFirProvider.kt | 2 ++ .../api/fir/providers/LLFirProviderHelper.kt | 21 ++++++++++++++----- .../api/fir/sessions/LLFirSessionFactory.kt | 2 ++ ...tedSinceKotlinHiddenOnReferenceArgument.kt | 1 + ...precatedSinceKotlinWithoutArguments.fir.kt | 1 + .../deprecatedSinceKotlinWithoutArguments.kt | 1 + .../deprecated/deprecatedSinceKotlin/error.kt | 2 ++ .../deprecatedSinceKotlin/hidden.kt | 1 + .../messageFromDeprecatedAnnotation.fir.kt | 2 ++ .../messageFromDeprecatedAnnotation.kt | 2 ++ .../deprecatedSinceKotlin/warning.kt | 1 + .../jvmInlineExpectValueClass.kt | 2 ++ .../conversionOfSignedToUnsigned.fir.kt | 1 + .../conversionOfSignedToUnsigned.kt | 1 + .../basicValueClassDeclaration.kt | 1 + .../basicValueClassDeclarationDisabled.kt | 1 + .../constructorsJvmSignaturesClash.fir.kt | 1 + .../constructorsJvmSignaturesClash.kt | 1 + .../delegatedPropertyInValueClass.fir.kt | 1 + .../delegatedPropertyInValueClass.kt | 1 + .../functionsJvmSignaturesClash.fir.kt | 1 + .../functionsJvmSignaturesClash.kt | 1 + ...tionsJvmSignaturesConflictOnInheritance.kt | 1 + .../identityComparisonWithValueClasses.fir.kt | 1 + .../identityComparisonWithValueClasses.kt | 1 + .../jvmInlineApplicability.fir.kt | 1 + .../valueClasses/jvmInlineApplicability.kt | 1 + .../valueClasses/lateinitValueClasses.fir.kt | 1 + .../valueClasses/lateinitValueClasses.kt | 1 + ...senceOfInitializerBlockInsideValueClass.kt | 1 + ...OfPublicPrimaryConstructorForValueClass.kt | 1 + ...ertiesWithBackingFieldsInsideValueClass.kt | 1 + .../valueClasses/recursiveValueClasses.kt | 1 + ...embersAndConstructsInsideValueClass.fir.kt | 1 + ...vedMembersAndConstructsInsideValueClass.kt | 1 + .../valueClassCanOnlyImplementInterfaces.kt | 1 + ...annotImplementInterfaceByDelegation.fir.kt | 1 + ...assCannotImplementInterfaceByDelegation.kt | 1 + ...assConstructorParameterWithDefaultValue.kt | 1 + .../valueClassDeclarationCheck.fir.kt | 1 + .../valueClassDeclarationCheck.kt | 1 + .../valueClassImplementsCollection.kt | 1 + .../valueClassWithForbiddenUnderlyingType.kt | 1 + ...ClassWithGenericUnderlyingTypeNoFeature.kt | 1 + .../valueClassesInsideAnnotations.kt | 1 + ...varargsOnParametersOfValueClassType.fir.kt | 1 + .../varargsOnParametersOfValueClassType.kt | 1 + ...piVersionIsAtLeastHasConstArguments.fir.kt | 1 + .../apiVersionIsAtLeastHasConstArguments.kt | 1 + .../coroutines/suspendTest.fir.kt | 1 + .../testsWithStdLib/coroutines/suspendTest.kt | 1 + .../independentResolutionInLambda.kt | 1 + .../factoryPattern/multipleOverloads_1.kt | 1 + .../factoryPattern/multipleOverloads_2.kt | 1 + .../factoryPattern/multipleOverloads_3.kt | 1 + ...overloadByLambdaReturnType_disabled.fir.kt | 1 + .../overloadByLambdaReturnType_disabled.kt | 1 + .../overloadByLambdaReturnType_enabled.fir.kt | 1 + .../overloadByLambdaReturnType_enabled.kt | 1 + .../resolutionInOldInference.kt | 1 + .../factoryPattern/returnFromInlineLambda.kt | 1 + 62 files changed, 84 insertions(+), 6 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/LLFirNonUnderContentRootSessionFactory.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/LLFirNonUnderContentRootSessionFactory.kt index ea377d7749e..26e6be5e0f9 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/LLFirNonUnderContentRootSessionFactory.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/LLFirNonUnderContentRootSessionFactory.kt @@ -73,7 +73,8 @@ internal class LLFirNonUnderContentRootSessionFactory(private val project: Proje this, components, project.createDeclarationProvider(contentScope), - project.createPackageProvider(contentScope) + project.createPackageProvider(contentScope), + cabContainKotlinPackage = true, ) register(FirProvider::class, provider) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProvider.kt index b6ae69a8f9b..f7b2b8e0eca 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProvider.kt @@ -29,6 +29,7 @@ internal class LLFirProvider( private val moduleComponents: LLFirModuleResolveComponents, private val declarationProvider: KotlinDeclarationProvider, packageProvider: KotlinPackageProvider, + cabContainKotlinPackage: Boolean, ) : FirProvider() { override val symbolProvider: FirSymbolProvider = SymbolProvider() @@ -37,6 +38,7 @@ internal class LLFirProvider( moduleComponents.firFileBuilder, declarationProvider, packageProvider, + cabContainKotlinPackage, ) override val isPhasedFirAllowed: Boolean get() = true diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProviderHelper.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProviderHelper.kt index 1a0baf01795..6f9f9e9215c 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProviderHelper.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProviderHelper.kt @@ -5,11 +5,12 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.providers -import com.google.common.collect.Sets import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirFileBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.util.FirElementFinder import org.jetbrains.kotlin.analysis.providers.KotlinDeclarationProvider import org.jetbrains.kotlin.analysis.providers.KotlinPackageProvider +import org.jetbrains.kotlin.builtins.StandardNames +import org.jetbrains.kotlin.config.AnalysisFlags import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.caches.createCache import org.jetbrains.kotlin.fir.caches.firCachesFactory @@ -17,7 +18,7 @@ import org.jetbrains.kotlin.fir.caches.getValue import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirRegularClass +import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol @@ -25,14 +26,17 @@ import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.psi.KtFile internal class LLFirProviderHelper( firSession: FirSession, private val firFileBuilder: LLFirFileBuilder, private val declarationProvider: KotlinDeclarationProvider, private val packageProvider: KotlinPackageProvider, + canContainKotlinPackage: Boolean, ) { + private val allowKotlinPackage = canContainKotlinPackage || + firSession.languageVersionSettings.getFlag(AnalysisFlags.allowKotlinPackage) + private val classifierByClassId = firSession.firCachesFactory.createCache { classId -> val ktClass = declarationProvider.getClassLikeDeclarationByClassId(classId) ?: return@createCache null @@ -62,10 +66,12 @@ internal class LLFirProviderHelper( fun getFirClassifierByFqName(classId: ClassId): FirClassLikeDeclaration? { if (classId.isLocal) return null + if (!allowKotlinPackage && classId.isKotlinPackage()) return null return classifierByClassId.getValue(classId) } fun getTopLevelCallableSymbols(packageFqName: FqName, name: Name): List> { + if (!allowKotlinPackage && packageFqName.isKotlinPackage()) return emptyList() val callableId = CallableId(packageFqName, name) return callablesByCallableId.getValue(callableId) } @@ -86,6 +92,11 @@ internal class LLFirProviderHelper( } } - fun getPackage(fqName: FqName): FqName? = - fqName.takeIf(packageProvider::doKotlinPackageExists) + fun getPackage(fqName: FqName): FqName? { + if (!allowKotlinPackage && fqName.isKotlinPackage()) return null + return fqName.takeIf(packageProvider::doKotlinPackageExists) + } } + +private fun ClassId.isKotlinPackage(): Boolean = startsWith(StandardNames.BUILT_INS_PACKAGE_NAME) +private fun FqName.isKotlinPackage(): Boolean = startsWith(StandardNames.BUILT_INS_PACKAGE_NAME) \ No newline at end of file diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionFactory.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionFactory.kt index 1505af14591..89761ce4495 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionFactory.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionFactory.kt @@ -98,6 +98,7 @@ internal object LLFirSessionFactory { components, project.createDeclarationProvider(contentScope), project.createPackageProvider(contentScope), + cabContainKotlinPackage = true, ) register(FirProvider::class, provider) @@ -202,6 +203,7 @@ internal object LLFirSessionFactory { components, project.createDeclarationProvider(contentScope), project.createPackageProvider(contentScope), + cabContainKotlinPackage = true, ) register(FirProvider::class, provider) diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinHiddenOnReferenceArgument.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinHiddenOnReferenceArgument.kt index b9ae05a9c54..abd328b3353 100644 --- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinHiddenOnReferenceArgument.kt +++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinHiddenOnReferenceArgument.kt @@ -1,4 +1,5 @@ // FIR_IDENTICAL +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION package kotlin diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinWithoutArguments.fir.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinWithoutArguments.fir.kt index e0f28fdda0b..b0169365a5a 100644 --- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinWithoutArguments.fir.kt +++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinWithoutArguments.fir.kt @@ -1,3 +1,4 @@ +// ALLOW_KOTLIN_PACKAGE package kotlin @Deprecated("") diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinWithoutArguments.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinWithoutArguments.kt index 293aded9734..6e5e1dcd389 100644 --- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinWithoutArguments.kt +++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinWithoutArguments.kt @@ -1,3 +1,4 @@ +// ALLOW_KOTLIN_PACKAGE package kotlin @Deprecated("") diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/error.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/error.kt index 08dde1466d8..87c8456ba36 100644 --- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/error.kt +++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/error.kt @@ -1,5 +1,7 @@ // FIR_IDENTICAL // !API_VERSION: 1.4 +// ALLOW_KOTLIN_PACKAGE + package kotlin diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/hidden.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/hidden.kt index 03faeec3d32..6e6bc4711f6 100644 --- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/hidden.kt +++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/hidden.kt @@ -1,5 +1,6 @@ // FIR_IDENTICAL // !API_VERSION: 1.4 +// ALLOW_KOTLIN_PACKAGE package kotlin diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.fir.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.fir.kt index 43ddd2603b0..d42b568099f 100644 --- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.fir.kt +++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.fir.kt @@ -1,3 +1,5 @@ +// ALLOW_KOTLIN_PACKAGE + package kotlin @Deprecated("foo test") diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.kt index c786d91af9d..812d972914e 100644 --- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.kt +++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.kt @@ -1,3 +1,5 @@ +// ALLOW_KOTLIN_PACKAGE + package kotlin @Deprecated("foo test") diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/warning.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/warning.kt index 27dc1ee1b1b..9c41b0ca7ac 100644 --- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/warning.kt +++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/warning.kt @@ -1,4 +1,5 @@ // FIR_IDENTICAL +// ALLOW_KOTLIN_PACKAGE // !API_VERSION: 1.4 package kotlin diff --git a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt index ced8d3df7f5..42f7057431b 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt @@ -1,5 +1,7 @@ // FIR_IDENTICAL // SKIP_TXT +// ALLOW_KOTLIN_PACKAGE + // MODULE: m1-common // FILE: common.kt diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt index 978c9a24af4..0e42d359c88 100644 --- a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt +++ b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt @@ -1,4 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER +// ALLOW_KOTLIN_PACKAGE // FILE: annotation.kt diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.kt b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.kt index 986d1e0f5b1..ddf89ecf53a 100644 --- a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.kt +++ b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.kt @@ -1,4 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER +// ALLOW_KOTLIN_PACKAGE // FILE: annotation.kt diff --git a/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.kt b/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.kt index 1f69c45cf88..d6cde515d1e 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.kt @@ -1,6 +1,7 @@ // FIR_IDENTICAL // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt b/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt index 33c7f9f9410..868ff582947 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt @@ -3,6 +3,7 @@ // !API_VERSION: 1.4 // !LANGUAGE: -InlineClasses // !DIAGNOSTICS: -UNUSED_PARAMETER +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.fir.kt index b018d9831e5..6bb3a3c3366 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.fir.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.fir.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt b/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt index 73ca5f4da72..57b48342fb0 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.fir.kt index 5a2d781df54..9c0b8e71e05 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.fir.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.fir.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt b/compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt index d0ac3ace7ec..faa3282f199 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.fir.kt index 6f9deb73b3c..f4fe5d91ced 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.fir.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.fir.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt b/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt index 83a738bafa6..43799673545 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesConflictOnInheritance.kt b/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesConflictOnInheritance.kt index d6bb03c2625..b926e471f97 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesConflictOnInheritance.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesConflictOnInheritance.kt @@ -2,6 +2,7 @@ // !SKIP_JAVAC // FIR_IDENTICAL // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.fir.kt index 19dc7929946..11eff5fa286 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.fir.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.fir.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_VARIABLE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.kt b/compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.kt index fe5dfeaa5ba..559abba7ec7 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_VARIABLE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.fir.kt index 63f795257db..b155535e784 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.fir.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.fir.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.kt b/compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.kt index 614b06aa4f7..128b79125d8 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.fir.kt index d8de417e8f4..fc2ee1587d2 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.fir.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.fir.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_VARIABLE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.kt b/compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.kt index 7e534316a9f..81a0117420c 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_VARIABLE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.kt b/compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.kt index b502a111072..a3e1ec29e8d 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.kt @@ -2,6 +2,7 @@ // !SKIP_JAVAC // FIR_IDENTICAL // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_VARIABLE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.kt b/compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.kt index cf3e71c8731..2b9a9b049bf 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.kt @@ -1,5 +1,6 @@ // FIR_IDENTICAL // !SKIP_JAVAC +// ALLOW_KOTLIN_PACKAGE // FIR_IDENTICAL // !LANGUAGE: +InlineClasses diff --git a/compiler/testData/diagnostics/tests/valueClasses/propertiesWithBackingFieldsInsideValueClass.kt b/compiler/testData/diagnostics/tests/valueClasses/propertiesWithBackingFieldsInsideValueClass.kt index 0825d056eb0..1eab7ac027d 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/propertiesWithBackingFieldsInsideValueClass.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/propertiesWithBackingFieldsInsideValueClass.kt @@ -1,6 +1,7 @@ // FIR_IDENTICAL // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.kt b/compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.kt index f62eaf37b46..a68d056bcc0 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.kt @@ -1,6 +1,7 @@ // FIR_IDENTICAL // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.fir.kt index c3e9c80183f..14d1cc834dd 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.fir.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.fir.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.kt b/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.kt index 50f056d36bf..bb70f5bc493 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassCanOnlyImplementInterfaces.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassCanOnlyImplementInterfaces.kt index 0f92f1f6ff3..49d5f2a657c 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/valueClassCanOnlyImplementInterfaces.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassCanOnlyImplementInterfaces.kt @@ -1,4 +1,5 @@ // FIR_IDENTICAL +// ALLOW_KOTLIN_PACKAGE // !SKIP_JAVAC // !LANGUAGE: +InlineClasses diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.fir.kt index 796caee355f..0c8f47ae571 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.fir.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.fir.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.kt index b991e47e351..bcd97fdc3b6 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassConstructorParameterWithDefaultValue.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassConstructorParameterWithDefaultValue.kt index 1208b18e499..b9aa976a1f2 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/valueClassConstructorParameterWithDefaultValue.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassConstructorParameterWithDefaultValue.kt @@ -1,4 +1,5 @@ // FIR_IDENTICAL +// ALLOW_KOTLIN_PACKAGE // !SKIP_JAVAC // FIR_IDENTICAL // !LANGUAGE: +InlineClasses diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.fir.kt index 13c44ae164f..74310efe47f 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.fir.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.fir.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.kt index 70aacac053f..834ecc06a70 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassImplementsCollection.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassImplementsCollection.kt index 6f0b197791a..940cecd7c89 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/valueClassImplementsCollection.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassImplementsCollection.kt @@ -2,6 +2,7 @@ // !SKIP_JAVAC // FIR_IDENTICAL // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.kt index 81d39c028dc..0a884b1ded4 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.kt @@ -1,4 +1,5 @@ // FIR_IDENTICAL +// ALLOW_KOTLIN_PACKAGE // !SKIP_JAVAC // SKIP_TXT // !LANGUAGE: +InlineClasses diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithGenericUnderlyingTypeNoFeature.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithGenericUnderlyingTypeNoFeature.kt index a4e70b94829..f55608dff96 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithGenericUnderlyingTypeNoFeature.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithGenericUnderlyingTypeNoFeature.kt @@ -2,6 +2,7 @@ // !SKIP_JAVAC // SKIP_TXT // !LANGUAGE: +InlineClasses, -GenericInlineClassParameter +// ALLOW_KOTLIN_PACKAGE package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassesInsideAnnotations.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassesInsideAnnotations.kt index de93ec95be5..eb92f2323cd 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/valueClassesInsideAnnotations.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassesInsideAnnotations.kt @@ -1,4 +1,5 @@ // FIR_IDENTICAL +// ALLOW_KOTLIN_PACKAGE // !SKIP_JAVAC // !LANGUAGE: +InlineClasses diff --git a/compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.fir.kt index d3064305ddf..cdcc85b73f5 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.fir.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.fir.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE, -UNUSED_ANONYMOUS_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.kt b/compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.kt index c6f060114b0..fe238bb0817 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.kt @@ -1,5 +1,6 @@ // !SKIP_JAVAC // !LANGUAGE: +InlineClasses +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE, -UNUSED_ANONYMOUS_PARAMETER package kotlin.jvm diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmSpecialFunctions/apiVersionIsAtLeastHasConstArguments.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmSpecialFunctions/apiVersionIsAtLeastHasConstArguments.fir.kt index 29c9bf90911..c6ca6449413 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmSpecialFunctions/apiVersionIsAtLeastHasConstArguments.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmSpecialFunctions/apiVersionIsAtLeastHasConstArguments.fir.kt @@ -1,3 +1,4 @@ +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER // SKIP_TXT // FILE: test.kt diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmSpecialFunctions/apiVersionIsAtLeastHasConstArguments.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmSpecialFunctions/apiVersionIsAtLeastHasConstArguments.kt index 7050543ef96..b83f6a25f35 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmSpecialFunctions/apiVersionIsAtLeastHasConstArguments.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmSpecialFunctions/apiVersionIsAtLeastHasConstArguments.kt @@ -1,3 +1,4 @@ +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER // SKIP_TXT // FILE: test.kt diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendTest.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendTest.fir.kt index 373341f675f..ccbbf46e955 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendTest.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendTest.fir.kt @@ -1,3 +1,4 @@ +// ALLOW_KOTLIN_PACKAGE // SKIP_TXT // FILE: test.kt diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendTest.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendTest.kt index d9576cc6a03..878d7307ca7 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendTest.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendTest.kt @@ -1,3 +1,4 @@ +// ALLOW_KOTLIN_PACKAGE // SKIP_TXT // FILE: test.kt diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt index 8feed0cd8c5..d367be065b0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt @@ -1,5 +1,6 @@ // FIR_IDENTICAL // !LANGUAGE: +OverloadResolutionByLambdaReturnType +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION // ISSUE: KT-11265 diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt index daec4a1495c..82c21ba6011 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt @@ -1,5 +1,6 @@ // FIR_IDENTICAL // !LANGUAGE: +OverloadResolutionByLambdaReturnType +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -OPT_IN_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS // ISSUE: KT-11265 diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt index 0b635a5ad3b..a3df3fc11f5 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt @@ -1,5 +1,6 @@ // FIR_IDENTICAL // !LANGUAGE: +OverloadResolutionByLambdaReturnType +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -OPT_IN_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS // ISSUE: KT-11265 diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.kt index 19bcca7974e..030a2cb734a 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_3.kt @@ -1,5 +1,6 @@ // FIR_IDENTICAL // !LANGUAGE: +OverloadResolutionByLambdaReturnType +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -OPT_IN_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS // ISSUE: KT-11265 diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt index 1fad67faa22..cb4c7418f37 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -OverloadResolutionByLambdaReturnType +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION // ISSUE: KT-11265 diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt index 802582d1dbf..1a94083c34b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -OverloadResolutionByLambdaReturnType +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION // ISSUE: KT-11265 diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt index 95b116c3abb..b4ac71ef802 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: +OverloadResolutionByLambdaReturnType +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION // ISSUE: KT-11265 diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.kt index 2f8c440240a..3235bed8b4a 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.kt @@ -1,4 +1,5 @@ // !LANGUAGE: +OverloadResolutionByLambdaReturnType +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION // ISSUE: KT-11265 diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt index 6fdd7a6cb0f..debc67595b4 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt @@ -1,4 +1,5 @@ // FIR_IDENTICAL +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION // ISSUE: KT-11265 diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/returnFromInlineLambda.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/returnFromInlineLambda.kt index 895ebf54813..ac779cb12e8 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/returnFromInlineLambda.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/returnFromInlineLambda.kt @@ -1,5 +1,6 @@ // FIR_IDENTICAL // !LANGUAGE: +OverloadResolutionByLambdaReturnType +// ALLOW_KOTLIN_PACKAGE // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -OPT_IN_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS // ISSUE: KT-11265