[VISUALIZER] Remove unnecessary abstract property frontendFacade

Right frontend facade will be chosen by frontendKind
This commit is contained in:
Ivan Kylchik
2021-03-10 17:47:15 +03:00
committed by TeamCityServer
parent e19514f1dc
commit 29920d729f
5 changed files with 9 additions and 9 deletions
@@ -9,8 +9,9 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.test.Constructor
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
import org.jetbrains.kotlin.test.model.DependencyKind
import org.jetbrains.kotlin.test.model.FrontendFacade
import org.jetbrains.kotlin.test.model.FrontendKind
import org.jetbrains.kotlin.test.model.FrontendOutputHandler
import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest
@@ -20,7 +21,6 @@ import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurat
abstract class AbstractVisualizerTest : AbstractKotlinCompilerTest() {
abstract val handler: Constructor<FrontendOutputHandler<*>>
abstract val frontendKind: FrontendKind<*>
abstract val frontendFacade: Constructor<FrontendFacade<*>>
override fun TestConfigurationBuilder.configuration() {
globalDefaults {
@@ -33,7 +33,10 @@ abstract class AbstractVisualizerTest : AbstractKotlinCompilerTest() {
::CommonEnvironmentConfigurator,
::JvmEnvironmentConfigurator,
)
useFrontendFacades(frontendFacade)
useFrontendFacades(
::FirFrontendFacade,
::ClassicFrontendFacade
)
useFrontendHandlers(handler)
defaultDirectives {
@@ -12,7 +12,5 @@ import org.jetbrains.kotlin.visualizer.AbstractVisualizerTest
abstract class AbstractFirVisualizerTest : AbstractVisualizerTest() {
override val frontendKind: FrontendKind<*> = FrontendKinds.FIR
override val frontendFacade: Constructor<FrontendFacade<*>> = ::FirFrontendFacade
override val handler: Constructor<FrontendOutputHandler<*>> = ::FirOutputHandler
}
@@ -15,8 +15,8 @@ import java.io.File
internal class FirOutputHandler(testServices: TestServices) : FirAnalysisHandler(testServices) {
override fun processModule(module: TestModule, info: FirOutputArtifact) {
val renderer = FirVisualizer(info.firFiles.values.first())
val firRenderResult = renderer.render()
val renderer = info.firFiles.values.firstOrNull()?.let { FirVisualizer(it) } ?: return
val firRenderResult = renderer.render().trim()
val replaceFrom = module.directives[VisualizerDirectives.TEST_FILE_PATH].first()
val replaceTo = module.directives[VisualizerDirectives.EXPECTED_FILE_PATH].first()
@@ -12,6 +12,5 @@ import org.jetbrains.kotlin.visualizer.AbstractVisualizerTest
abstract class AbstractPsiVisualizerTest : AbstractVisualizerTest() {
override val frontendKind: FrontendKind<*> = FrontendKinds.ClassicFrontend
override val frontendFacade: Constructor<FrontendFacade<*>> = ::ClassicFrontendFacade
override val handler: Constructor<FrontendOutputHandler<*>> = ::PsiOutputHandler
}
@@ -15,7 +15,7 @@ import java.io.File
internal class PsiOutputHandler(testServices: TestServices) : ClassicFrontendAnalysisHandler(testServices) {
override fun processModule(module: TestModule, info: ClassicFrontendOutputArtifact) {
val renderer = PsiVisualizer(info.ktFiles.values.first(), info.analysisResult)
val renderer = info.ktFiles.values.firstOrNull()?.let { PsiVisualizer(it, info.analysisResult) } ?: return
val psiRenderResult = renderer.render()
val replaceFrom = module.directives[VisualizerDirectives.TEST_FILE_PATH].first()