From 8f396402374419b22fb4ff3a3bfdaa636d1b6979 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 19 Oct 2021 22:49:27 +0900 Subject: [PATCH] [FIR IDE] Move test file analysis in FE10 Analysis API implementation to FrontendApiTestConfiguratorService --- .../test/AbstractKtFe10ReferenceResolveTest.kt | 8 -------- .../test/AbstractKtFe10ResolveCallTest.kt | 8 -------- .../KtFe10FrontendApiTestConfiguratorService.kt | 14 +++++++------- .../AbstractKtFe10ExpectedExpressionTypeTest.kt | 9 --------- .../AbstractKtFe10HLExpressionTypeTest.kt | 9 --------- .../AbstractKtFe10HasCommonSubtypeTest.kt | 9 --------- ...tractKtFe10OverriddenDeclarationProviderTest.kt | 9 --------- .../test/components/AbstractKtFe10RendererTest.kt | 9 --------- .../test/scopes/AbstractKtFe10FileScopeTest.kt | 9 --------- .../AbstractKtFe10MemberScopeByFqNameTest.kt | 8 -------- ...stractKtFe10CompileTimeConstantEvaluatorTest.kt | 6 ------ .../symbols/AbstractKtFe10SymbolByFqNameTest.kt | 8 -------- .../test/symbols/AbstractKtFe10SymbolByPsiTest.kt | 8 -------- .../symbols/AbstractKtFe10SymbolByReferenceTest.kt | 8 -------- .../impl/barebone/test/AbstractFrontendApiTest.kt | 3 +++ .../impl/base/test/AbstractReferenceResolveTest.kt | 2 ++ .../AbstractCompileTimeConstantEvaluatorTest.kt | 2 ++ .../AbstractExpectedExpressionTypeTest.kt | 4 ++-- .../components/AbstractHLExpressionTypeTest.kt | 4 ++-- .../components/AbstractHasCommonSubtypeTest.kt | 3 ++- .../AbstractOverriddenDeclarationProviderTest.kt | 3 ++- .../base/test/components/AbstractRendererTest.kt | 4 ++-- .../impl/base/test/fir/AbstractResolveCallTest.kt | 3 ++- .../impl/base/test/scopes/AbstractFileScopeTest.kt | 4 ++-- .../impl/base/test/symbols/AbstractSymbolTest.kt | 3 ++- .../test/framework/AbstractHLApiSingleFileTest.kt | 4 +++- .../framework/AbstractHLApiSingleModuleTest.kt | 4 +++- 27 files changed, 36 insertions(+), 129 deletions(-) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ReferenceResolveTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ReferenceResolveTest.kt index 4967705340a..bf319d3c901 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ReferenceResolveTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ReferenceResolveTest.kt @@ -7,16 +7,8 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10ReferenceResolveTest : AbstractReferenceResolveTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - - override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { - analyzeTestFiles(ktFiles, module, testServices) - super.doTestByFileStructure(ktFiles, module, testServices) - } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ResolveCallTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ResolveCallTest.kt index 9cda783ff5e..0160cd0b3ed 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ResolveCallTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ResolveCallTest.kt @@ -7,16 +7,8 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.fir.AbstractResolveCallTest -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10ResolveCallTest : AbstractResolveCallTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - - override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { - analyzeTestFiles(ktFiles, module, testServices) - super.doTestByFileStructure(ktFiles, module, testServices) - } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt index 5393cdd6244..8d457045f97 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt @@ -49,12 +49,12 @@ object KtFe10FrontendApiTestConfiguratorService : FrontendApiTestConfiguratorSer application.registerService(KotlinReferenceProviderContributor::class.java, KtFe10KotlinReferenceProviderContributor::class.java) } } -} -fun analyzeTestFiles(ktFiles: List, module: TestModule, testServices: TestServices) { - val compilerConfigurationProvider = testServices.compilerConfigurationProvider - val project = compilerConfigurationProvider.getProject(module) - val compilerConfiguration = compilerConfigurationProvider.getCompilerConfiguration(module) - val packageProviderFactory = compilerConfigurationProvider.getPackagePartProviderFactory(module) - JvmResolveUtil.analyze(project, ktFiles, compilerConfiguration, packageProviderFactory) + override fun prepareTestFiles(files: List, module: TestModule, testServices: TestServices) { + val compilerConfigurationProvider = testServices.compilerConfigurationProvider + val project = compilerConfigurationProvider.getProject(module) + val compilerConfiguration = compilerConfigurationProvider.getCompilerConfiguration(module) + val packageProviderFactory = compilerConfigurationProvider.getPackagePartProviderFactory(module) + JvmResolveUtil.analyze(project, files, compilerConfiguration, packageProviderFactory) + } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10ExpectedExpressionTypeTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10ExpectedExpressionTypeTest.kt index 7627372d4d4..64a4047cff7 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10ExpectedExpressionTypeTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10ExpectedExpressionTypeTest.kt @@ -6,19 +6,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.components import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractExpectedExpressionTypeTest -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10ExpectedExpressionTypeTest : AbstractExpectedExpressionTypeTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - analyzeTestFiles(listOf(ktFile), module, testServices) - super.doTestByFileStructure(ktFile, module, testServices) - } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HLExpressionTypeTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HLExpressionTypeTest.kt index b05e782cdd8..623d00e5855 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HLExpressionTypeTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HLExpressionTypeTest.kt @@ -6,19 +6,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.components import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractHLExpressionTypeTest -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10HLExpressionTypeTest : AbstractHLExpressionTypeTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - analyzeTestFiles(listOf(ktFile), module, testServices) - super.doTestByFileStructure(ktFile, module, testServices) - } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HasCommonSubtypeTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HasCommonSubtypeTest.kt index d820abef3ba..b35664d4fc9 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HasCommonSubtypeTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HasCommonSubtypeTest.kt @@ -6,19 +6,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.components import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractHasCommonSubtypeTest -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10HasCommonSubtypeTest : AbstractHasCommonSubtypeTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - analyzeTestFiles(listOf(ktFile), module, testServices) - super.doTestByFileStructure(ktFile, module, testServices) - } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10OverriddenDeclarationProviderTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10OverriddenDeclarationProviderTest.kt index a48a1f59e2c..7ef0f3f4b08 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10OverriddenDeclarationProviderTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10OverriddenDeclarationProviderTest.kt @@ -6,19 +6,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.components import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractOverriddenDeclarationProviderTest -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10OverriddenDeclarationProviderTest : AbstractOverriddenDeclarationProviderTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - - override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { - analyzeTestFiles(ktFiles, module, testServices) - super.doTestByFileStructure(ktFiles, module, testServices) - } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10RendererTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10RendererTest.kt index 246a9f6ad81..9bc5b2714de 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10RendererTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10RendererTest.kt @@ -6,19 +6,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.components import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractRendererTest -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10RendererTest : AbstractRendererTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - analyzeTestFiles(listOf(ktFile), module, testServices) - super.doTestByFileStructure(ktFile, module, testServices) - } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10FileScopeTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10FileScopeTest.kt index 45248a0325d..8578fcfab5a 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10FileScopeTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10FileScopeTest.kt @@ -6,19 +6,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.scopes import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractFileScopeTest -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10FileScopeTest : AbstractFileScopeTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - analyzeTestFiles(listOf(ktFile), module, testServices) - super.doTestByFileStructure(ktFile, module, testServices) - } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10MemberScopeByFqNameTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10MemberScopeByFqNameTest.kt index eabbc49ac9d..94083f58c0d 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10MemberScopeByFqNameTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10MemberScopeByFqNameTest.kt @@ -7,22 +7,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.scopes import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10MemberScopeByFqNameTest : AbstractMemberScopeByFqNameTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - analyzeTestFiles(listOf(ktFile), module, testServices) - super.doTestByFileStructure(ktFile, module, testServices) - } - override fun doOutOfBlockModification(ktFile: KtFile) { KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10CompileTimeConstantEvaluatorTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10CompileTimeConstantEvaluatorTest.kt index 15143d04fe6..49294804077 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10CompileTimeConstantEvaluatorTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10CompileTimeConstantEvaluatorTest.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractCompileTimeConstantEvaluatorTest import org.jetbrains.kotlin.psi.KtFile @@ -16,9 +15,4 @@ import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10CompileTimeConstantEvaluatorTest : AbstractCompileTimeConstantEvaluatorTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - analyzeTestFiles(listOf(ktFile), module, testServices) - super.doTestByFileStructure(ktFile, module, testServices) - } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByFqNameTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByFqNameTest.kt index f7c52cf4228..3042af87474 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByFqNameTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByFqNameTest.kt @@ -7,22 +7,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10SymbolByFqNameTest : AbstractSymbolByFqNameTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - analyzeTestFiles(listOf(ktFile), module, testServices) - super.doTestByFileStructure(ktFile, module, testServices) - } - override fun doOutOfBlockModification(ktFile: KtFile) { KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByPsiTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByPsiTest.kt index 3d26af3e53e..8b3e6863b9d 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByPsiTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByPsiTest.kt @@ -7,22 +7,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10SymbolByPsiTest : AbstractSymbolByPsiTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - analyzeTestFiles(listOf(ktFile), module, testServices) - super.doTestByFileStructure(ktFile, module, testServices) - } - override fun doOutOfBlockModification(ktFile: KtFile) { KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByReferenceTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByReferenceTest.kt index 4815e67841c..dd0bf9b5035 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByReferenceTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByReferenceTest.kt @@ -7,22 +7,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices abstract class AbstractKtFe10SymbolByReferenceTest : AbstractSymbolByReferenceTest() { override val configurator: FrontendApiTestConfiguratorService get() = KtFe10FrontendApiTestConfiguratorService - override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { - analyzeTestFiles(listOf(ktFile), module, testServices) - super.doTestByFileStructure(ktFile, module, testServices) - } - override fun doOutOfBlockModification(ktFile: KtFile) { KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt b/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt index e4048dacaae..d372eba27ec 100644 --- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt +++ b/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirective import org.jetbrains.kotlin.test.model.DependencyKind import org.jetbrains.kotlin.test.model.FrontendKinds import org.jetbrains.kotlin.test.model.ResultingArtifact +import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest import org.jetbrains.kotlin.test.services.* import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator @@ -46,6 +47,8 @@ interface FrontendApiTestConfiguratorService { fun registerProjectServices(project: MockProject) fun registerApplicationServices(application: MockApplication) + + fun prepareTestFiles(files: List, module: TestModule, testServices: TestServices) {} } abstract class AbstractFrontendApiTest : TestWithDisposable() { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt index b2fd8f8aaad..036ca49cfd9 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt @@ -39,6 +39,8 @@ abstract class AbstractReferenceResolveTest : AbstractHLApiSingleModuleTest() { } override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { + super.doTestByFileStructure(ktFiles, module, testServices) + val mainKtFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" } val caretPosition = testServices.expressionMarkerProvider.getCaretPosition(mainKtFile) val ktReferences = findReferencesAtCaret(mainKtFile, caretPosition) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractCompileTimeConstantEvaluatorTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractCompileTimeConstantEvaluatorTest.kt index 5eb58606c4e..8edaff8e7ca 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractCompileTimeConstantEvaluatorTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractCompileTimeConstantEvaluatorTest.kt @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.test.services.assertions abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractHLApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { + super.doTestByFileStructure(ktFile, module, testServices) + val element = testServices.expressionMarkerProvider.getSelectedElement(ktFile) val expression = when (element) { is KtExpression -> element diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractExpectedExpressionTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractExpectedExpressionTypeTest.kt index 256442dd82e..7dcd9da836a 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractExpectedExpressionTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractExpectedExpressionTypeTest.kt @@ -5,9 +5,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components -import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.api.impl.base.test.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile @@ -17,6 +15,8 @@ import org.jetbrains.kotlin.test.services.assertions abstract class AbstractExpectedExpressionTypeTest : AbstractHLApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { + super.doTestByFileStructure(ktFile, module, testServices) + val expressionAtCaret = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) as KtExpression val actualExpectedTypeText: String? = executeOnPooledThreadInReadAction { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHLExpressionTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHLExpressionTypeTest.kt index 850b31115b5..d95f83448bc 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHLExpressionTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHLExpressionTypeTest.kt @@ -5,9 +5,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components -import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.api.impl.base.test.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile @@ -17,6 +15,8 @@ import org.jetbrains.kotlin.test.services.assertions abstract class AbstractHLExpressionTypeTest : AbstractHLApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { + super.doTestByFileStructure(ktFile, module, testServices) + val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) as KtExpression val type = executeOnPooledThreadInReadAction { analyseForTest(expression) { expression.getKtType()?.render() } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHasCommonSubtypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHasCommonSubtypeTest.kt index 930e9f7d6f3..ca62c610cf6 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHasCommonSubtypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHasCommonSubtypeTest.kt @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtFile @@ -24,6 +23,8 @@ import java.io.File abstract class AbstractHasCommonSubtypeTest : AbstractHLApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { + super.doTestByFileStructure(ktFile, module, testServices) + val errors = mutableListOf() val originalText = ktFile.text val actualTextBuilder = StringBuilder() diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractOverriddenDeclarationProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractOverriddenDeclarationProviderTest.kt index de56ab7ac71..b6ed5cfde89 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractOverriddenDeclarationProviderTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractOverriddenDeclarationProviderTest.kt @@ -9,7 +9,6 @@ import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.analysis.api.impl.barebone.parentsOfType import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.api.impl.base.test.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol @@ -22,6 +21,8 @@ import org.jetbrains.kotlin.test.services.assertions abstract class AbstractOverriddenDeclarationProviderTest : AbstractHLApiSingleModuleTest() { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { + super.doTestByFileStructure(ktFiles, module, testServices) + val declaration = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFiles.first()) val actual = executeOnPooledThreadInReadAction { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractRendererTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractRendererTest.kt index 55c6e19cb56..003f694f8da 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractRendererTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractRendererTest.kt @@ -5,10 +5,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components -import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions -import org.jetbrains.kotlin.analysis.api.impl.base.test.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule @@ -17,6 +15,8 @@ import org.jetbrains.kotlin.test.services.assertions abstract class AbstractRendererTest : AbstractHLApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { + super.doTestByFileStructure(ktFile, module, testServices) + val options = KtDeclarationRendererOptions.DEFAULT.copy( approximateTypes = true, renderContainingDeclarations = true, diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt index f22f136c287..81f0766abc0 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt @@ -13,7 +13,6 @@ import org.jetbrains.kotlin.analysis.api.calls.KtErrorCallTarget import org.jetbrains.kotlin.analysis.api.calls.KtSuccessCallTarget import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.KtMapBackedSubstitutor -import org.jetbrains.kotlin.analysis.api.impl.base.test.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.markers.KtPossibleMemberSymbol @@ -30,6 +29,8 @@ import kotlin.reflect.jvm.javaGetter abstract class AbstractResolveCallTest : AbstractHLApiSingleModuleTest() { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { + super.doTestByFileStructure(ktFiles, module, testServices) + val ktFile = ktFiles.first() val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt index e878110e968..8710e3e7dbe 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt @@ -5,8 +5,6 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes -import org.jetbrains.kotlin.analysis.api.analyse -import org.jetbrains.kotlin.analysis.api.impl.base.test.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.psi.KtFile @@ -16,6 +14,8 @@ import org.jetbrains.kotlin.test.services.assertions abstract class AbstractFileScopeTest : AbstractHLApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { + super.doTestByFileStructure(ktFile, module, testServices) + val actual = executeOnPooledThreadInReadAction { analyseForTest(ktFile) { val symbol = ktFile.getFileSymbol() diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt index 47ad0937b02..07d6a57dd4d 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.api.impl.base.test.analyseOnPooledThreadInReadAction import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol @@ -32,6 +31,8 @@ abstract class AbstractSymbolTest : AbstractHLApiSingleFileTest() { abstract fun doOutOfBlockModification(ktFile: KtFile) override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { + super.doTestByFileStructure(ktFile, module, testServices) + val createPointers = SymbolTestDirectives.DO_NOT_CHECK_SYMBOL_RESTORE !in module.directives val pointersWithRendered = analyseOnPooledThreadInReadAction(ktFile) { collectSymbols(ktFile, testServices).map { symbol -> diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt index 1d557f042f7..a65f639697a 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt @@ -15,5 +15,7 @@ abstract class AbstractHLApiSingleFileTest : AbstractHLApiSingleModuleTest() { doTestByFileStructure(singleFile, module, testServices) } - protected abstract fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) + protected open fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { + configurator.prepareTestFiles(listOf(ktFile), module, testServices) + } } \ No newline at end of file diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt index 06aa6aa499c..eb3db491680 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt @@ -23,7 +23,9 @@ abstract class AbstractHLApiSingleModuleTest : AbstractFrontendApiTest() { doTestByFileStructure(ktFiles, singleModule, testServices) } - protected abstract fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) + protected open fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { + configurator.prepareTestFiles(ktFiles, module, testServices) + } protected inline fun analyseOnPooledThreadInReadAction(context: KtElement, crossinline action: KtAnalysisSession.() -> R): R = executeOnPooledThreadInReadAction {