[LL FIR] add ability to pass analyseInDependentSession into AnalysisApiFirScriptTestConfigurator

^KT-61431
This commit is contained in:
Dmitrii Gridin
2023-08-23 20:55:49 +02:00
committed by Space Team
parent 833072e1fb
commit 0a5501b8dd
13 changed files with 14 additions and 14 deletions
@@ -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.AnalysisApiFirScriptTestConfigurator
import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator 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.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.psi.KtClassLikeDeclaration import org.jetbrains.kotlin.psi.KtClassLikeDeclaration
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.services.TestModuleStructure import org.jetbrains.kotlin.test.services.TestModuleStructure
@@ -49,5 +48,5 @@ abstract class AbstractSourceClassIdTest : AbstractClassIdTest() {
} }
abstract class AbstractScriptClassIdTest : AbstractClassIdTest() { abstract class AbstractScriptClassIdTest : AbstractClassIdTest() {
override val configurator: AnalysisApiTestConfigurator get() = AnalysisApiFirScriptTestConfigurator override val configurator: AnalysisApiTestConfigurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -33,5 +33,5 @@ abstract class AbstractSourceDependentCopyContextTest : AbstractDependentCopyCon
} }
abstract class AbstractScriptDependentCopyContextTest : AbstractDependentCopyContextTest() { abstract class AbstractScriptDependentCopyContextTest : AbstractDependentCopyContextTest() {
override val configurator: AnalysisApiTestConfigurator get() = AnalysisApiFirScriptTestConfigurator override val configurator: AnalysisApiTestConfigurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -28,5 +28,5 @@ abstract class AbstractSourceDependentCopyFirTest : AbstractDependentCopyFirTest
} }
abstract class AbstractScriptDependentCopyFirTest : AbstractDependentCopyFirTest() { abstract class AbstractScriptDependentCopyFirTest : AbstractDependentCopyFirTest() {
override val configurator: AnalysisApiTestConfigurator get() = AnalysisApiFirScriptTestConfigurator override val configurator: AnalysisApiTestConfigurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -157,5 +157,5 @@ abstract class AbstractSourceFileBasedKotlinDeclarationProviderTest : AbstractFi
} }
abstract class AbstractScriptFileBasedKotlinDeclarationProviderTest : AbstractFileBasedKotlinDeclarationProviderTest() { abstract class AbstractScriptFileBasedKotlinDeclarationProviderTest : AbstractFileBasedKotlinDeclarationProviderTest() {
override val configurator get() = AnalysisApiFirScriptTestConfigurator override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -110,5 +110,5 @@ abstract class AbstractFirOutOfContentRootLazyDeclarationResolveTest : AbstractF
} }
abstract class AbstractFirScriptLazyDeclarationResolveTest : AbstractFirLazyDeclarationResolveTest() { abstract class AbstractFirScriptLazyDeclarationResolveTest : AbstractFirLazyDeclarationResolveTest() {
override val configurator get() = AnalysisApiFirScriptTestConfigurator override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -72,5 +72,5 @@ abstract class AbstractOutOfContentRootGetOrBuildFirTest : AbstractGetOrBuildFir
} }
abstract class AbstractScriptGetOrBuildFirTest : AbstractGetOrBuildFirTest() { abstract class AbstractScriptGetOrBuildFirTest : AbstractGetOrBuildFirTest() {
override val configurator get() = AnalysisApiFirScriptTestConfigurator override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -70,5 +70,5 @@ abstract class AbstractSourceNonLocalDeclarationAnchorTest : AbstractNonLocalDec
} }
abstract class AbstractScriptNonLocalDeclarationAnchorTest : AbstractNonLocalDeclarationAnchorTest() { abstract class AbstractScriptNonLocalDeclarationAnchorTest : AbstractNonLocalDeclarationAnchorTest() {
override val configurator: AnalysisApiTestConfigurator get() = AnalysisApiFirScriptTestConfigurator override val configurator: AnalysisApiTestConfigurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -158,5 +158,5 @@ abstract class AbstractSourceDiagnosticTraversalCounterTest : AbstractDiagnostic
} }
abstract class AbstractScriptDiagnosticTraversalCounterTest : AbstractDiagnosticTraversalCounterTest() { abstract class AbstractScriptDiagnosticTraversalCounterTest : AbstractDiagnosticTraversalCounterTest() {
override val configurator get() = AnalysisApiFirScriptTestConfigurator override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -118,5 +118,5 @@ abstract class AbstractFirOutOfContentRootContextCollectionTest : AbstractFirCon
} }
abstract class AbstractScriptContextCollectionTest : AbstractFirContextCollectionTest() { abstract class AbstractScriptContextCollectionTest : AbstractFirContextCollectionTest() {
override val configurator get() = AnalysisApiFirScriptTestConfigurator override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -129,5 +129,5 @@ abstract class AbstractOutOfContentRootFileStructureTest : AbstractFileStructure
} }
abstract class AbstractScriptFileStructureTest : AbstractFileStructureTest() { abstract class AbstractScriptFileStructureTest : AbstractFileStructureTest() {
override val configurator get() = AnalysisApiFirScriptTestConfigurator override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -134,5 +134,5 @@ abstract class AbstractOutOfContentRootInBlockModificationTest : AbstractInBlock
} }
abstract class AbstractScriptInBlockModificationTest : AbstractInBlockModificationTest() { abstract class AbstractScriptInBlockModificationTest : AbstractInBlockModificationTest() {
override val configurator get() = AnalysisApiFirScriptTestConfigurator override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -37,5 +37,5 @@ abstract class AbstractOutOfContentRootWholeFileResolvePhaseTest : AbstractWhole
} }
abstract class AbstractScriptWholeFileResolvePhaseTest : AbstractWholeFileResolvePhaseTest() { abstract class AbstractScriptWholeFileResolvePhaseTest : AbstractWholeFileResolvePhaseTest() {
override val configurator get() = AnalysisApiFirScriptTestConfigurator override val configurator = AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false)
} }
@@ -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.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder 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) { override fun configureTest(builder: TestConfigurationBuilder, disposable: Disposable) {
super.configureTest(builder, disposable) super.configureTest(builder, disposable)