From 0a5501b8dde2873550d2a08cfd68fe4c15d7d411 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 23 Aug 2023 20:55:49 +0200 Subject: [PATCH] [LL FIR] add ability to pass analyseInDependentSession into AnalysisApiFirScriptTestConfigurator ^KT-61431 --- .../kotlin/analysis/low/level/api/fir/AbstractClassIdTest.kt | 3 +-- .../low/level/api/fir/AbstractDependentCopyContextTest.kt | 2 +- .../analysis/low/level/api/fir/AbstractDependentCopyFirTest.kt | 2 +- .../api/fir/AbstractFileBasedKotlinDeclarationProviderTest.kt | 2 +- .../low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt | 2 +- .../analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt | 2 +- .../low/level/api/fir/AbstractNonLocalDeclarationAnchorTest.kt | 2 +- .../fir/diagnostic/AbstractDiagnosticTraversalCounterTest.kt | 2 +- .../api/fir/diagnostic/AbstractFirContextCollectionTest.kt | 2 +- .../level/api/fir/file/structure/AbstractFileStructureTest.kt | 2 +- .../api/fir/file/structure/AbstractInBlockModificationTest.kt | 2 +- .../level/api/fir/resolve/AbstractWholeFileResolvePhaseTest.kt | 2 +- .../test/configurators/AnalysisApiFirScriptTestConfigurator.kt | 3 ++- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractClassIdTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractClassIdTest.kt index 7335ac722aa..0afe04b04dd 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractClassIdTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractClassIdTest.kt @@ -13,7 +13,6 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLeve import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirScriptTestConfigurator import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator -import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.psi.KtClassLikeDeclaration import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.services.TestModuleStructure @@ -49,5 +48,5 @@ abstract class AbstractSourceClassIdTest : AbstractClassIdTest() { } abstract class AbstractScriptClassIdTest : AbstractClassIdTest() { - override val configurator: AnalysisApiTestConfigurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator: AnalysisApiTestConfigurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } \ No newline at end of file diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractDependentCopyContextTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractDependentCopyContextTest.kt index 67844a9f768..9841340c466 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractDependentCopyContextTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractDependentCopyContextTest.kt @@ -33,5 +33,5 @@ abstract class AbstractSourceDependentCopyContextTest : AbstractDependentCopyCon } abstract class AbstractScriptDependentCopyContextTest : AbstractDependentCopyContextTest() { - override val configurator: AnalysisApiTestConfigurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator: AnalysisApiTestConfigurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractDependentCopyFirTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractDependentCopyFirTest.kt index 027ba5f1132..daf1f5f4870 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractDependentCopyFirTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractDependentCopyFirTest.kt @@ -28,5 +28,5 @@ abstract class AbstractSourceDependentCopyFirTest : AbstractDependentCopyFirTest } abstract class AbstractScriptDependentCopyFirTest : AbstractDependentCopyFirTest() { - override val configurator: AnalysisApiTestConfigurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator: AnalysisApiTestConfigurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFileBasedKotlinDeclarationProviderTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFileBasedKotlinDeclarationProviderTest.kt index 2e513e8a77e..f85655ded1e 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFileBasedKotlinDeclarationProviderTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFileBasedKotlinDeclarationProviderTest.kt @@ -157,5 +157,5 @@ abstract class AbstractSourceFileBasedKotlinDeclarationProviderTest : AbstractFi } abstract class AbstractScriptFileBasedKotlinDeclarationProviderTest : AbstractFileBasedKotlinDeclarationProviderTest() { - override val configurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } \ No newline at end of file diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt index a18bd4636a2..0875559a8ad 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt @@ -110,5 +110,5 @@ abstract class AbstractFirOutOfContentRootLazyDeclarationResolveTest : AbstractF } abstract class AbstractFirScriptLazyDeclarationResolveTest : AbstractFirLazyDeclarationResolveTest() { - override val configurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt index a59c82970b8..e9800d95eec 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt @@ -72,5 +72,5 @@ abstract class AbstractOutOfContentRootGetOrBuildFirTest : AbstractGetOrBuildFir } abstract class AbstractScriptGetOrBuildFirTest : AbstractGetOrBuildFirTest() { - override val configurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractNonLocalDeclarationAnchorTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractNonLocalDeclarationAnchorTest.kt index 83587b375a2..07268b1f629 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractNonLocalDeclarationAnchorTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractNonLocalDeclarationAnchorTest.kt @@ -70,5 +70,5 @@ abstract class AbstractSourceNonLocalDeclarationAnchorTest : AbstractNonLocalDec } abstract class AbstractScriptNonLocalDeclarationAnchorTest : AbstractNonLocalDeclarationAnchorTest() { - override val configurator: AnalysisApiTestConfigurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator: AnalysisApiTestConfigurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractDiagnosticTraversalCounterTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractDiagnosticTraversalCounterTest.kt index 989f8d0b309..116f386b791 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractDiagnosticTraversalCounterTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractDiagnosticTraversalCounterTest.kt @@ -158,5 +158,5 @@ abstract class AbstractSourceDiagnosticTraversalCounterTest : AbstractDiagnostic } abstract class AbstractScriptDiagnosticTraversalCounterTest : AbstractDiagnosticTraversalCounterTest() { - override val configurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractFirContextCollectionTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractFirContextCollectionTest.kt index 8328910edf4..2a0a1d95c98 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractFirContextCollectionTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractFirContextCollectionTest.kt @@ -118,5 +118,5 @@ abstract class AbstractFirOutOfContentRootContextCollectionTest : AbstractFirCon } abstract class AbstractScriptContextCollectionTest : AbstractFirContextCollectionTest() { - override val configurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } \ No newline at end of file diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractFileStructureTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractFileStructureTest.kt index daa6926a1a5..3b3e1d38255 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractFileStructureTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractFileStructureTest.kt @@ -129,5 +129,5 @@ abstract class AbstractOutOfContentRootFileStructureTest : AbstractFileStructure } abstract class AbstractScriptFileStructureTest : AbstractFileStructureTest() { - override val configurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } \ No newline at end of file diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt index bc99fa84d10..99c73775fae 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt @@ -134,5 +134,5 @@ abstract class AbstractOutOfContentRootInBlockModificationTest : AbstractInBlock } abstract class AbstractScriptInBlockModificationTest : AbstractInBlockModificationTest() { - override val configurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractWholeFileResolvePhaseTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractWholeFileResolvePhaseTest.kt index db79bd0bbea..231dd081f15 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractWholeFileResolvePhaseTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractWholeFileResolvePhaseTest.kt @@ -37,5 +37,5 @@ abstract class AbstractOutOfContentRootWholeFileResolvePhaseTest : AbstractWhole } abstract class AbstractScriptWholeFileResolvePhaseTest : AbstractWholeFileResolvePhaseTest() { - override val configurator get() = AnalysisApiFirScriptTestConfigurator + override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirScriptTestConfigurator.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirScriptTestConfigurator.kt index 40e232d7336..95855f1103f 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirScriptTestConfigurator.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirScriptTestConfigurator.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtScriptMo import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -object AnalysisApiFirScriptTestConfigurator : AnalysisApiFirSourceLikeTestConfigurator(analyseInDependentSession = false) { +class AnalysisApiFirScriptTestConfigurator(analyseInDependentSession: Boolean) : + AnalysisApiFirSourceLikeTestConfigurator(analyseInDependentSession) { override fun configureTest(builder: TestConfigurationBuilder, disposable: Disposable) { super.configureTest(builder, disposable)