diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10AnalysisSession.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10AnalysisSession.kt index 2c8e2ee9003..be9400c5b56 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10AnalysisSession.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10AnalysisSession.kt @@ -52,6 +52,7 @@ class KtFe10AnalysisSession( override val compileTimeConstantProviderImpl: KtCompileTimeConstantProvider = KtFe10CompileTimeConstantProvider(this) override val visibilityCheckerImpl: KtVisibilityChecker = KtFe10VisibilityChecker(this) override val overrideInfoProviderImpl: KtOverrideInfoProvider = KtFe10OverrideInfoProvider(this) + override val multiplatformInfoProviderImpl: KtMultiplatformInfoProvider = KtFe10MultiplatformInfoProvider(this) override val inheritorsProviderImpl: KtInheritorsProvider = KtFe10InheritorsProvider(this) override val typesCreatorImpl: KtTypeCreator = KtFe10TypeCreator(this) override val samResolverImpl: KtSamResolver = KtFe10SamResolver(this) diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt new file mode 100644 index 00000000000..df71169e5e6 --- /dev/null +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt @@ -0,0 +1,44 @@ +/* + * Copyright 2010-2023 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. + */ + +package org.jetbrains.kotlin.analysis.api.descriptors.components + +import org.jetbrains.kotlin.analysis.api.components.KtMultiplatformInfoProvider +import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession +import org.jetbrains.kotlin.analysis.api.descriptors.components.base.Fe10KtAnalysisSessionComponent +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.getSymbolDescriptor +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol +import org.jetbrains.kotlin.analysis.api.symbols.psiSafe +import org.jetbrains.kotlin.analysis.utils.errors.checkWithAttachmentBuilder +import org.jetbrains.kotlin.descriptors.MemberDescriptor +import org.jetbrains.kotlin.psi.KtDeclaration +import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier +import org.jetbrains.kotlin.resolve.multiplatform.ExpectActualCompatibility +import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver + +internal class KtFe10MultiplatformInfoProvider( + override val analysisSession: KtFe10AnalysisSession +) : KtMultiplatformInfoProvider(), Fe10KtAnalysisSessionComponent { + override fun getExpectForActual(actual: KtDeclarationSymbol): KtDeclarationSymbol? { + if (actual.psiSafe()?.hasActualModifier() != true) return null + val memberDescriptor = (getSymbolDescriptor(actual) as? MemberDescriptor)?.takeIf { it.isActual } ?: return null + + val expectedCompatibilityMap = + ExpectedActualResolver.findExpectedForActual(memberDescriptor) ?: return null + + val expectsForActual = (expectedCompatibilityMap[ExpectActualCompatibility.Compatible] + ?: expectedCompatibilityMap.values.flatten()) + check(expectsForActual.size <= 1) { "expected as maximum one `expect` for the actual" } + checkWithAttachmentBuilder(expectsForActual.size <= 1, message = { "expected as maximum one `expect` for the actual" }) { + withEntry("actual", memberDescriptor.toString()) + withEntry("expectsForActualSize", expectsForActual.size.toString()) + for ((index, expectForActual) in expectsForActual.withIndex()) { + withEntry("expectsForActual$index", expectForActual.toString()) + } + } + return expectsForActual.singleOrNull()?.toKtSymbol(analysisContext) as? KtDeclarationSymbol + } +} \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/multiplatformInfoProvider/Fe10IdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/multiplatformInfoProvider/Fe10IdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java new file mode 100644 index 00000000000..11c7a9ebb1d --- /dev/null +++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/multiplatformInfoProvider/Fe10IdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java @@ -0,0 +1,54 @@ +/* + * Copyright 2010-2023 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. + */ + +package org.jetbrains.kotlin.analysis.api.fe10.test.cases.generated.cases.components.multiplatformInfoProvider; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.analysis.api.fe10.test.configurator.AnalysisApiFe10TestConfiguratorFactory; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.multiplatformInfoProvider.AbstractExpectForActualTest; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual") +@TestDataPath("$PROJECT_ROOT") +public class Fe10IdeNormalAnalysisSourceModuleExpectForActualTestGenerated extends AbstractExpectForActualTest { + @NotNull + @Override + public AnalysisApiTestConfigurator getConfigurator() { + return AnalysisApiFe10TestConfiguratorFactory.INSTANCE.createConfigurator( + new AnalysisApiTestConfiguratorFactoryData( + FrontendKind.Fe10, + TestModuleKind.Source, + AnalysisSessionMode.Normal, + AnalysisApiMode.Ide + ) + ); + } + + @Test + @TestMetadata("actual_object.kt") + public void testActual_object() throws Exception { + runTest("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.kt"); + } + + @Test + public void testAllFilesPresentInExpectForActual() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual"), Pattern.compile("^(.+)\\.kt$"), null, true); + } +} diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt index dae39ce6f8c..08d385d2c3c 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt @@ -99,6 +99,8 @@ private constructor( override val inheritorsProviderImpl: KtInheritorsProvider = KtFirInheritorsProvider(this, token) + override val multiplatformInfoProviderImpl: KtMultiplatformInfoProvider = KtFirMultiplatformInfoProvider(this, token) + override val symbolInfoProviderImpl: KtSymbolInfoProvider = KtFirSymbolInfoProvider(this, token) override val typesCreatorImpl: KtTypeCreator = KtFirTypeCreator(this, token) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt new file mode 100644 index 00000000000..089f1accc79 --- /dev/null +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt @@ -0,0 +1,46 @@ +/* + * Copyright 2010-2023 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. + */ + +package org.jetbrains.kotlin.analysis.api.fir.components + +import org.jetbrains.kotlin.analysis.api.components.KtMultiplatformInfoProvider +import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession +import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirSymbol +import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken +import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol +import org.jetbrains.kotlin.analysis.low.level.api.fir.util.withFirSymbolEntry +import org.jetbrains.kotlin.analysis.utils.errors.checkWithAttachmentBuilder +import org.jetbrains.kotlin.fir.declarations.expectForActual +import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol +import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol +import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol +import org.jetbrains.kotlin.resolve.multiplatform.ExpectActualCompatibility + +internal class KtFirMultiplatformInfoProvider( + override val analysisSession: KtFirAnalysisSession, + override val token: KtLifetimeToken, +) : KtMultiplatformInfoProvider(), KtFirAnalysisSessionComponent { + override fun getExpectForActual(actual: KtDeclarationSymbol): KtDeclarationSymbol? { + require(actual is KtFirSymbol<*>) + val firSymbol = actual.firSymbol + val status = when (firSymbol) { + is FirCallableSymbol -> firSymbol.rawStatus + is FirClassSymbol -> firSymbol.rawStatus + is FirTypeAliasSymbol -> firSymbol.rawStatus + else -> null + } + if (status?.isActual != true) return null + + val expectsForActual = firSymbol.expectForActual?.get(ExpectActualCompatibility.Compatible) ?: return null + checkWithAttachmentBuilder(expectsForActual.size <= 1, message = { "expected as maximum one `expect` for the actual" }) { + withFirSymbolEntry("actual", firSymbol) + withEntry("expectsForActualSize", expectsForActual.size.toString()) + for ((index, expectForActual) in expectsForActual.withIndex()) { + withFirSymbolEntry("expectsForActual$index", expectForActual) + } + } + return expectsForActual.singleOrNull()?.let { analysisSession.firSymbolBuilder.buildSymbol(it) as? KtDeclarationSymbol } + } +} \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeDependentAnalysisSourceModuleExpectForActualTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeDependentAnalysisSourceModuleExpectForActualTestGenerated.java new file mode 100644 index 00000000000..7aaf0fe51b8 --- /dev/null +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeDependentAnalysisSourceModuleExpectForActualTestGenerated.java @@ -0,0 +1,54 @@ +/* + * Copyright 2010-2023 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. + */ + +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.multiplatformInfoProvider; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.analysis.api.fir.test.configurators.AnalysisApiFirTestConfiguratorFactory; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.multiplatformInfoProvider.AbstractExpectForActualTest; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual") +@TestDataPath("$PROJECT_ROOT") +public class FirIdeDependentAnalysisSourceModuleExpectForActualTestGenerated extends AbstractExpectForActualTest { + @NotNull + @Override + public AnalysisApiTestConfigurator getConfigurator() { + return AnalysisApiFirTestConfiguratorFactory.INSTANCE.createConfigurator( + new AnalysisApiTestConfiguratorFactoryData( + FrontendKind.Fir, + TestModuleKind.Source, + AnalysisSessionMode.Dependent, + AnalysisApiMode.Ide + ) + ); + } + + @Test + @TestMetadata("actual_object.kt") + public void testActual_object() throws Exception { + runTest("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.kt"); + } + + @Test + public void testAllFilesPresentInExpectForActual() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual"), Pattern.compile("^(.+)\\.kt$"), null, true); + } +} diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java new file mode 100644 index 00000000000..3f688ac8ac6 --- /dev/null +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java @@ -0,0 +1,54 @@ +/* + * Copyright 2010-2023 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. + */ + +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.multiplatformInfoProvider; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.analysis.api.fir.test.configurators.AnalysisApiFirTestConfiguratorFactory; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.multiplatformInfoProvider.AbstractExpectForActualTest; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual") +@TestDataPath("$PROJECT_ROOT") +public class FirIdeNormalAnalysisSourceModuleExpectForActualTestGenerated extends AbstractExpectForActualTest { + @NotNull + @Override + public AnalysisApiTestConfigurator getConfigurator() { + return AnalysisApiFirTestConfiguratorFactory.INSTANCE.createConfigurator( + new AnalysisApiTestConfiguratorFactoryData( + FrontendKind.Fir, + TestModuleKind.Source, + AnalysisSessionMode.Normal, + AnalysisApiMode.Ide + ) + ); + } + + @Test + @TestMetadata("actual_object.kt") + public void testActual_object() throws Exception { + runTest("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.kt"); + } + + @Test + public void testAllFilesPresentInExpectForActual() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual"), Pattern.compile("^(.+)\\.kt$"), null, true); + } +} diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/multiplatformInfoProvider/AbstractExpectForActualTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/multiplatformInfoProvider/AbstractExpectForActualTest.kt new file mode 100644 index 00000000000..457c456a0fc --- /dev/null +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/multiplatformInfoProvider/AbstractExpectForActualTest.kt @@ -0,0 +1,38 @@ +/* + * Copyright 2010-2023 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. + */ + +package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.multiplatformInfoProvider + +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedTest +import org.jetbrains.kotlin.analysis.test.framework.project.structure.ktModuleProvider +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.utils.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.psi.KtDeclaration +import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.services.TestModuleStructure +import org.jetbrains.kotlin.test.services.TestServices +import org.jetbrains.kotlin.test.services.assertions + +abstract class AbstractExpectForActualTest : AbstractAnalysisApiBasedTest() { + override fun doTestByModuleStructure(moduleStructure: TestModuleStructure, testServices: TestServices) { + val (declaration, _) = moduleStructure.modules.flatMap { module -> + val ktFiles = testServices.ktModuleProvider.getModuleFiles(module).filterIsInstance() + testServices.expressionMarkerProvider.getElementsOfTypeAtCarets(ktFiles) + }.single() + + val expectedSymbolText: String? = executeOnPooledThreadInReadAction { + analyseForTest(declaration) { + val expectedSymbol = declaration.getSymbol().getExpectForActual() ?: return@analyseForTest null + expectedSymbol.psi?.containingFile?.name + " : " + expectedSymbol.render() + } + } + + val actual = buildString { + appendLine("expected symbol: $expectedSymbolText") + } + + testServices.assertions.assertEqualsToTestDataFileSibling(actual) + } +} \ No newline at end of file diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirStandaloneNormalAnalysisSourceModuleExpectForActualTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirStandaloneNormalAnalysisSourceModuleExpectForActualTestGenerated.java new file mode 100644 index 00000000000..f4c5a4959b4 --- /dev/null +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirStandaloneNormalAnalysisSourceModuleExpectForActualTestGenerated.java @@ -0,0 +1,54 @@ +/* + * Copyright 2010-2023 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. + */ + +package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.components.multiplatformInfoProvider; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.analysis.api.standalone.fir.test.AnalysisApiFirStandaloneModeTestConfiguratorFactory; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.multiplatformInfoProvider.AbstractExpectForActualTest; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual") +@TestDataPath("$PROJECT_ROOT") +public class FirStandaloneNormalAnalysisSourceModuleExpectForActualTestGenerated extends AbstractExpectForActualTest { + @NotNull + @Override + public AnalysisApiTestConfigurator getConfigurator() { + return AnalysisApiFirStandaloneModeTestConfiguratorFactory.INSTANCE.createConfigurator( + new AnalysisApiTestConfiguratorFactoryData( + FrontendKind.Fir, + TestModuleKind.Source, + AnalysisSessionMode.Normal, + AnalysisApiMode.Standalone + ) + ); + } + + @Test + @TestMetadata("actual_object.kt") + public void testActual_object() throws Exception { + runTest("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.kt"); + } + + @Test + public void testAllFilesPresentInExpectForActual() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual"), Pattern.compile("^(.+)\\.kt$"), null, true); + } +} diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt index 5ca096677af..420ad68fa48 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt @@ -54,6 +54,7 @@ public abstract class KtAnalysisSession(final override val token: KtLifetimeToke KtSymbolDeclarationRendererMixIn, KtVisibilityCheckerMixIn, KtMemberSymbolProviderMixin, + KtMultiplatformInfoProviderMixin, KtInheritorsProviderMixIn, KtTypeCreatorMixIn, KtAnalysisScopeProviderMixIn, @@ -136,6 +137,9 @@ public abstract class KtAnalysisSession(final override val token: KtLifetimeToke internal val inheritorsProvider: KtInheritorsProvider get() = inheritorsProviderImpl protected abstract val inheritorsProviderImpl: KtInheritorsProvider + internal val multiplatformInfoProvider: KtMultiplatformInfoProvider get() = multiplatformInfoProviderImpl + protected abstract val multiplatformInfoProviderImpl: KtMultiplatformInfoProvider + internal val symbolInfoProvider: KtSymbolInfoProvider get() = symbolInfoProviderImpl protected abstract val symbolInfoProviderImpl: KtSymbolInfoProvider diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtMultiplatformInfoProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtMultiplatformInfoProvider.kt new file mode 100644 index 00000000000..65df5843e06 --- /dev/null +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtMultiplatformInfoProvider.kt @@ -0,0 +1,23 @@ +/* + * Copyright 2010-2023 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. + */ + +package org.jetbrains.kotlin.analysis.api.components + +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion +import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol + +public abstract class KtMultiplatformInfoProvider : KtAnalysisSessionComponent() { + public abstract fun getExpectForActual(actual: KtDeclarationSymbol): KtDeclarationSymbol? +} + +public interface KtMultiplatformInfoProviderMixin : KtAnalysisSessionMixIn { + + /** + * Gives expect symbol for the actual one if it is available. + **/ + public fun KtDeclarationSymbol.getExpectForActual(): KtDeclarationSymbol? = + withValidityAssertion { analysisSession.multiplatformInfoProvider.getExpectForActual(this) } + +} \ No newline at end of file diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtDeclarationSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtDeclarationSymbol.kt index 7e2282b360c..e2b7803390c 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtDeclarationSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtDeclarationSymbol.kt @@ -10,6 +10,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithTypeParamet /** * Represents a symbol of declaration which can be directly expressed in source code. - * Eg, classes, type parameters or functions ar [KtDeclarationSymbol], but files and packages are not + * Eg, classes, type parameters or functions are [KtDeclarationSymbol], but files and packages are not */ public sealed interface KtDeclarationSymbol : KtSymbol, KtSymbolWithTypeParameters, KtAnnotatedSymbol \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.descriptors.txt b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.descriptors.txt new file mode 100644 index 00000000000..f96ab8e3557 --- /dev/null +++ b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.descriptors.txt @@ -0,0 +1 @@ +expected symbol: null diff --git a/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.kt b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.kt new file mode 100644 index 00000000000..16be720839f --- /dev/null +++ b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.kt @@ -0,0 +1,16 @@ +// !LANGUAGE: +MultiPlatformProjects +// MODULE: commonMain +// FILE: Common.kt + +package sample +expect object Platform { + val name: String +} + +// MODULE: androidMain(commonMain) +// FILE: JvmAndroid.kt + +package sample +actual object Platform { + actual val name: String = "JVM" +} \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.txt b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.txt new file mode 100644 index 00000000000..68bbd71edee --- /dev/null +++ b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/actual_object.txt @@ -0,0 +1 @@ +expected symbol: Common.kt : object Platform diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt index 5d01f9b6bf3..190ae7c6bcf 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.express import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.expressionTypeProvider.AbstractExpectedExpressionTypeTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.expressionTypeProvider.AbstractHLExpressionTypeTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.importOptimizer.AbstractAnalysisApiImportOptimizerTest +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.multiplatformInfoProvider.AbstractExpectForActualTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiExpressionPsiTypeProviderTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiPsiTypeProviderTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.signatureSubstitution.AbstractAnalysisApiSignatureContractsTest @@ -271,6 +272,12 @@ private fun AnalysisApiTestGroup.generateAnalysisApiComponentsTests() { } } + component("multiplatformInfoProvider") { + test(AbstractExpectForActualTest::class) { + model("expectForActual") + } + } + component("psiTypeProvider") { test(AbstractAnalysisApiPsiTypeProviderTest::class) { model("psiType/forDeclaration")