diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisLibraryBinaryModuleMultiModuleCompilerFacilityTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisLibraryBinaryModuleMultiModuleCompilerFacilityTestGenerated.java deleted file mode 100644 index f1a9e7d05fe..00000000000 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisLibraryBinaryModuleMultiModuleCompilerFacilityTestGenerated.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2010-2024 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.compilerFacility; - -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.compilerFacility.AbstractMultiModuleCompilerFacilityTest; -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/compilerFacility/compilationMultiBinaryModule") -@TestDataPath("$PROJECT_ROOT") -public class FirIdeNormalAnalysisLibraryBinaryModuleMultiModuleCompilerFacilityTestGenerated extends AbstractMultiModuleCompilerFacilityTest { - @NotNull - @Override - public AnalysisApiTestConfigurator getConfigurator() { - return AnalysisApiFirTestConfiguratorFactory.INSTANCE.createConfigurator( - new AnalysisApiTestConfiguratorFactoryData( - FrontendKind.Fir, - TestModuleKind.LibraryBinary, - AnalysisSessionMode.Normal, - AnalysisApiMode.Ide - ) - ); - } - - @Test - public void testAllFilesPresentInCompilationMultiBinaryModule() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule"), Pattern.compile("^(.+)\\.(kt)$"), null, true); - } - - @Test - @TestMetadata("dependencyBetweenBinaryLibraries.kt") - public void testDependencyBetweenBinaryLibraries() { - runTest("analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/dependencyBetweenBinaryLibraries.kt"); - } - - @Test - @TestMetadata("javaAnnotationWithVararg.kt") - public void testJavaAnnotationWithVararg() { - runTest("analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/javaAnnotationWithVararg.kt"); - } -} diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisLibraryBinaryModuleFirPluginPrototypeMultiBinaryModuleCompilerFacilityTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisSourceModuleFirPluginPrototypeMultiModuleCompilerFacilityTestGenerated.java similarity index 77% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisLibraryBinaryModuleFirPluginPrototypeMultiBinaryModuleCompilerFacilityTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisSourceModuleFirPluginPrototypeMultiModuleCompilerFacilityTestGenerated.java index 83c7e9a84a9..35ccf872323 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisLibraryBinaryModuleFirPluginPrototypeMultiBinaryModuleCompilerFacilityTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisSourceModuleFirPluginPrototypeMultiModuleCompilerFacilityTestGenerated.java @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModul 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.compilerFacility.AbstractFirPluginPrototypeMultiBinaryModuleCompilerFacilityTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.compilerFacility.AbstractFirPluginPrototypeMultiModuleCompilerFacilityTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,16 +25,16 @@ 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/compilerFacility/firPluginPrototypeMultiBinaryModule") +@TestMetadata("analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule") @TestDataPath("$PROJECT_ROOT") -public class FirIdeNormalAnalysisLibraryBinaryModuleFirPluginPrototypeMultiBinaryModuleCompilerFacilityTestGenerated extends AbstractFirPluginPrototypeMultiBinaryModuleCompilerFacilityTest { +public class FirIdeNormalAnalysisSourceModuleFirPluginPrototypeMultiModuleCompilerFacilityTestGenerated extends AbstractFirPluginPrototypeMultiModuleCompilerFacilityTest { @NotNull @Override public AnalysisApiTestConfigurator getConfigurator() { return AnalysisApiFirTestConfiguratorFactory.INSTANCE.createConfigurator( new AnalysisApiTestConfiguratorFactoryData( FrontendKind.Fir, - TestModuleKind.LibraryBinary, + TestModuleKind.Source, AnalysisSessionMode.Normal, AnalysisApiMode.Ide ) @@ -42,19 +42,19 @@ public class FirIdeNormalAnalysisLibraryBinaryModuleFirPluginPrototypeMultiBinar } @Test - public void testAllFilesPresentInFirPluginPrototypeMultiBinaryModule() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule"), Pattern.compile("^(.+)\\.(kt)$"), null, true); + public void testAllFilesPresentInFirPluginPrototypeMultiModule() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule"), Pattern.compile("^(.+)\\.(kt)$"), null, true); } @Test @TestMetadata("composableFunctionMultiModules.kt") public void testComposableFunctionMultiModules() { - runTest("analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules.kt"); + runTest("analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules.kt"); } @Test @TestMetadata("composableFunctionMultiModules2.kt") public void testComposableFunctionMultiModules2() { - runTest("analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules2.kt"); + runTest("analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules2.kt"); } } diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisSourceModuleMultiModuleCompilerFacilityTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisSourceModuleMultiModuleCompilerFacilityTestGenerated.java index 5abe090f508..e7a8a00ef88 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisSourceModuleMultiModuleCompilerFacilityTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisSourceModuleMultiModuleCompilerFacilityTestGenerated.java @@ -58,12 +58,24 @@ public class FirIdeNormalAnalysisSourceModuleMultiModuleCompilerFacilityTestGene runTest("analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/defaultParameterValue.kt"); } + @Test + @TestMetadata("dependencyBetweenBinaryLibraries.kt") + public void testDependencyBetweenBinaryLibraries() { + runTest("analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/dependencyBetweenBinaryLibraries.kt"); + } + @Test @TestMetadata("internalUsage.kt") public void testInternalUsage() { runTest("analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/internalUsage.kt"); } + @Test + @TestMetadata("javaAnnotationWithVararg.kt") + public void testJavaAnnotationWithVararg() { + runTest("analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/javaAnnotationWithVararg.kt"); + } + @Nested @TestMetadata("analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/codeFragments") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/compilerFacility/AbstractCompilerFacilityTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/compilerFacility/AbstractCompilerFacilityTest.kt index 65f976f70fa..7966b0e399b 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/compilerFacility/AbstractCompilerFacilityTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/compilerFacility/AbstractCompilerFacilityTest.kt @@ -48,7 +48,7 @@ import kotlin.test.assertFalse abstract class AbstractMultiModuleCompilerFacilityTest : AbstractCompilerFacilityTest() -abstract class AbstractFirPluginPrototypeMultiBinaryModuleCompilerFacilityTest : AbstractCompilerFacilityTest() { +abstract class AbstractFirPluginPrototypeMultiModuleCompilerFacilityTest : AbstractCompilerFacilityTest() { override fun extraCustomRuntimeClasspathProviders(): Array> = arrayOf(::PluginRuntimeAnnotationsProvider) } diff --git a/analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/dependencyBetweenBinaryLibraries.ir.txt b/analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/dependencyBetweenBinaryLibraries.ir.txt similarity index 100% rename from analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/dependencyBetweenBinaryLibraries.ir.txt rename to analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/dependencyBetweenBinaryLibraries.ir.txt diff --git a/analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/dependencyBetweenBinaryLibraries.kt b/analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/dependencyBetweenBinaryLibraries.kt similarity index 62% rename from analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/dependencyBetweenBinaryLibraries.kt rename to analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/dependencyBetweenBinaryLibraries.kt index 35d283c4e25..1e1a8971fe4 100644 --- a/analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/dependencyBetweenBinaryLibraries.kt +++ b/analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/dependencyBetweenBinaryLibraries.kt @@ -1,16 +1,19 @@ // MODULE: lib +// MODULE_KIND: LibraryBinary // FILE: p3/foo.kt -package p3; +package p3 fun foo() = 3 + // MODULE: lib2(lib) +// MODULE_KIND: LibraryBinary // FILE: p2/bar.kt -package p2; +package p2 fun bar() = 4 + p3.foo() + // MODULE: main(lib, lib2) -// MODULE_KIND: Source // FILE: main.kt import p2.bar -fun test() = bar() \ No newline at end of file +fun test() = bar() diff --git a/analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/dependencyBetweenBinaryLibraries.txt b/analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/dependencyBetweenBinaryLibraries.txt similarity index 100% rename from analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/dependencyBetweenBinaryLibraries.txt rename to analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/dependencyBetweenBinaryLibraries.txt diff --git a/analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/javaAnnotationWithVararg.ir.txt b/analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/javaAnnotationWithVararg.ir.txt similarity index 100% rename from analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/javaAnnotationWithVararg.ir.txt rename to analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/javaAnnotationWithVararg.ir.txt diff --git a/analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/javaAnnotationWithVararg.kt b/analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/javaAnnotationWithVararg.kt similarity index 92% rename from analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/javaAnnotationWithVararg.kt rename to analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/javaAnnotationWithVararg.kt index 1c3d19f411c..31d59c82e61 100644 --- a/analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/javaAnnotationWithVararg.kt +++ b/analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/javaAnnotationWithVararg.kt @@ -1,4 +1,5 @@ // MODULE: lib +// MODULE_KIND: LibraryBinary // FILE: p3/Anno.java package p3; @@ -13,7 +14,9 @@ import static java.lang.annotation.ElementType.*; public @interface Anno { String[] value(); } + // MODULE: lib2(lib) +// MODULE_KIND: LibraryBinary // FILE: p2/Parent.java package p2; @@ -27,8 +30,8 @@ public class Parent { public void setContentView(@Anno({"UnknownNullness", "MissingNullability"}) int id) { } } + // MODULE: main(lib, lib2) -// MODULE_KIND: Source // FILE: main.kt import p2.Parent @@ -39,4 +42,4 @@ class Child: Parent() { } private fun bar() {} -} \ No newline at end of file +} diff --git a/analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/javaAnnotationWithVararg.txt b/analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/javaAnnotationWithVararg.txt similarity index 98% rename from analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/javaAnnotationWithVararg.txt rename to analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/javaAnnotationWithVararg.txt index 35260a6cb95..a582ebcc081 100644 --- a/analysis/analysis-api/testData/components/compilerFacility/compilationMultiBinaryModule/javaAnnotationWithVararg.txt +++ b/analysis/analysis-api/testData/components/compilerFacility/compilationMultiModule/javaAnnotationWithVararg.txt @@ -3,4 +3,4 @@ public final class Child { public method (): void private final method bar(): void protected method onCreate(): void -} \ No newline at end of file +} diff --git a/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules.ir.txt b/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules.ir.txt similarity index 100% rename from analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules.ir.txt rename to analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules.ir.txt diff --git a/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules.kt b/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules.kt similarity index 91% rename from analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules.kt rename to analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules.kt index 92e38c3ed38..f9bf17eaced 100644 --- a/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules.kt +++ b/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules.kt @@ -2,9 +2,9 @@ // DUMP_IR // MODULE: lib +// MODULE_KIND: LibraryBinary // FILE: p3/foo.kt - -package p3; +package p3 import org.jetbrains.kotlin.fir.plugin.MyComposable @@ -14,9 +14,7 @@ public fun Foo( ) {} // MODULE: main(lib) -// MODULE_KIND: Source // FILE: main.kt - import org.jetbrains.kotlin.fir.plugin.MyComposable import p3.Foo @@ -25,4 +23,4 @@ public fun Bar() { Foo( text = {}, // @Composable invocations can only happen from the context of a @Composable function ) -} \ No newline at end of file +} diff --git a/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules.txt b/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules.txt similarity index 100% rename from analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules.txt rename to analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules.txt diff --git a/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules2.ir.txt b/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules2.ir.txt similarity index 100% rename from analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules2.ir.txt rename to analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules2.ir.txt diff --git a/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules2.kt b/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules2.kt similarity index 87% rename from analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules2.kt rename to analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules2.kt index 7df529d1e80..73a6715b3a2 100644 --- a/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules2.kt +++ b/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules2.kt @@ -2,9 +2,9 @@ // DUMP_IR // MODULE: lib +// MODULE_KIND: LibraryBinary // FILE: p3/foo.kt - -package p3; +package p3 import org.jetbrains.kotlin.fir.plugin.MyComposable @@ -14,9 +14,7 @@ fun setContent(content: @MyComposable () -> Unit): Int { } // MODULE: main(lib) -// MODULE_KIND: Source // FILE: main.kt - import org.jetbrains.kotlin.fir.plugin.MyComposable import p3.setContent @@ -31,4 +29,4 @@ fun Greeting(name: String) { show("hi $name!") } -fun show(str: String) {} \ No newline at end of file +fun show(str: String) {} diff --git a/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules2.txt b/analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules2.txt similarity index 100% rename from analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiBinaryModule/composableFunctionMultiModules2.txt rename to analysis/analysis-api/testData/components/compilerFacility/firPluginPrototypeMultiModule/composableFunctionMultiModules2.txt 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 6aa335c24cd..ade3f8581df 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 @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.callRes import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.callResolver.AbstractResolveCandidatesTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.compilerFacility.AbstractCompilerFacilityTest -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.compilerFacility.AbstractFirPluginPrototypeMultiBinaryModuleCompilerFacilityTest +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.compilerFacility.AbstractFirPluginPrototypeMultiModuleCompilerFacilityTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.compilerFacility.AbstractMultiModuleCompilerFacilityTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.containingDeclarationProvider.AbstractContainingDeclarationProviderByDelegatedMemberScopeTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.containingDeclarationProvider.AbstractContainingDeclarationProviderByMemberScopeTest @@ -114,14 +114,8 @@ internal fun AnalysisApiTestGroup.generateAnalysisApiTests() { model("compilationMultiModule", pattern = TestGeneratorUtil.KT) } - test(AbstractMultiModuleCompilerFacilityTest::class, filter = testModuleKindIs(TestModuleKind.LibraryBinary)) { - model("compilationMultiBinaryModule", pattern = TestGeneratorUtil.KT) - } - - test( - AbstractFirPluginPrototypeMultiBinaryModuleCompilerFacilityTest::class, filter = testModuleKindIs(TestModuleKind.LibraryBinary) - ) { - model("firPluginPrototypeMultiBinaryModule", pattern = TestGeneratorUtil.KT) + test(AbstractFirPluginPrototypeMultiModuleCompilerFacilityTest::class, filter = testModuleKindIs(TestModuleKind.Source)) { + model("firPluginPrototypeMultiModule", pattern = TestGeneratorUtil.KT) } }