[Test] Drop unused parameters from FirAnalyzerFacade
This commit is contained in:
+1
-5
@@ -11,7 +11,6 @@ import com.intellij.openapi.vfs.VirtualFileManager
|
|||||||
import com.intellij.psi.PsiElementFinder
|
import com.intellij.psi.PsiElementFinder
|
||||||
import com.intellij.psi.search.ProjectScope
|
import com.intellij.psi.search.ProjectScope
|
||||||
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
|
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
|
||||||
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
|
|
||||||
import org.jetbrains.kotlin.cli.jvm.compiler.PsiBasedProjectFileSearchScope
|
import org.jetbrains.kotlin.cli.jvm.compiler.PsiBasedProjectFileSearchScope
|
||||||
import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
|
import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
|
||||||
import org.jetbrains.kotlin.cli.jvm.compiler.VfsBasedProjectEnvironment
|
import org.jetbrains.kotlin.cli.jvm.compiler.VfsBasedProjectEnvironment
|
||||||
@@ -35,7 +34,6 @@ import org.jetbrains.kotlin.fir.session.FirJvmSessionFactory
|
|||||||
import org.jetbrains.kotlin.fir.session.FirNativeSessionFactory
|
import org.jetbrains.kotlin.fir.session.FirNativeSessionFactory
|
||||||
import org.jetbrains.kotlin.fir.session.FirSessionConfigurator
|
import org.jetbrains.kotlin.fir.session.FirSessionConfigurator
|
||||||
import org.jetbrains.kotlin.fir.session.environment.AbstractProjectEnvironment
|
import org.jetbrains.kotlin.fir.session.environment.AbstractProjectEnvironment
|
||||||
import org.jetbrains.kotlin.test.services.configuration.NativeEnvironmentConfigurator
|
|
||||||
import org.jetbrains.kotlin.load.kotlin.PackageAndMetadataPartProvider
|
import org.jetbrains.kotlin.load.kotlin.PackageAndMetadataPartProvider
|
||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
import org.jetbrains.kotlin.platform.TargetPlatform
|
import org.jetbrains.kotlin.platform.TargetPlatform
|
||||||
@@ -56,6 +54,7 @@ import org.jetbrains.kotlin.test.model.TestModule
|
|||||||
import org.jetbrains.kotlin.test.runners.lightTreeSyntaxDiagnosticsReporterHolder
|
import org.jetbrains.kotlin.test.runners.lightTreeSyntaxDiagnosticsReporterHolder
|
||||||
import org.jetbrains.kotlin.test.services.*
|
import org.jetbrains.kotlin.test.services.*
|
||||||
import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator
|
import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator
|
||||||
|
import org.jetbrains.kotlin.test.services.configuration.NativeEnvironmentConfigurator
|
||||||
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfigurator
|
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfigurator
|
||||||
import java.nio.file.Paths
|
import java.nio.file.Paths
|
||||||
|
|
||||||
@@ -309,7 +308,6 @@ open class FirFrontendFacade(
|
|||||||
ktFiles
|
ktFiles
|
||||||
)
|
)
|
||||||
|
|
||||||
val enablePluginPhases = FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES in module.directives
|
|
||||||
val firAnalyzerFacade = FirAnalyzerFacade(
|
val firAnalyzerFacade = FirAnalyzerFacade(
|
||||||
moduleBasedSession,
|
moduleBasedSession,
|
||||||
Fir2IrConfiguration(
|
Fir2IrConfiguration(
|
||||||
@@ -321,9 +319,7 @@ open class FirFrontendFacade(
|
|||||||
),
|
),
|
||||||
ktFiles,
|
ktFiles,
|
||||||
lightTreeFiles,
|
lightTreeFiles,
|
||||||
IrGenerationExtension.getInstances(project),
|
|
||||||
parser,
|
parser,
|
||||||
enablePluginPhases,
|
|
||||||
testServices.lightTreeSyntaxDiagnosticsReporterHolder?.reporter,
|
testServices.lightTreeSyntaxDiagnosticsReporterHolder?.reporter,
|
||||||
)
|
)
|
||||||
val firFiles = firAnalyzerFacade.runResolution()
|
val firFiles = firAnalyzerFacade.runResolution()
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.ObsoleteTestInfrastructure
|
|||||||
import org.jetbrains.kotlin.TestsCompiletimeError
|
import org.jetbrains.kotlin.TestsCompiletimeError
|
||||||
import org.jetbrains.kotlin.analyzer.AnalysisResult
|
import org.jetbrains.kotlin.analyzer.AnalysisResult
|
||||||
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
|
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
|
||||||
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
|
|
||||||
import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory
|
import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory
|
||||||
import org.jetbrains.kotlin.backend.jvm.JvmIrDeserializerImpl
|
import org.jetbrains.kotlin.backend.jvm.JvmIrDeserializerImpl
|
||||||
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
|
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
|
||||||
@@ -131,7 +130,6 @@ object GenerationUtils {
|
|||||||
),
|
),
|
||||||
files,
|
files,
|
||||||
emptyList(),
|
emptyList(),
|
||||||
IrGenerationExtension.getInstances(project),
|
|
||||||
FirParser.Psi,
|
FirParser.Psi,
|
||||||
)
|
)
|
||||||
val fir2IrExtensions = JvmFir2IrExtensions(configuration, JvmIrDeserializerImpl(), JvmIrMangler)
|
val fir2IrExtensions = JvmFir2IrExtensions(configuration, JvmIrDeserializerImpl(), JvmIrMangler)
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.fir
|
package org.jetbrains.kotlin.fir
|
||||||
|
|
||||||
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
|
|
||||||
import org.jetbrains.kotlin.builtins.DefaultBuiltIns
|
import org.jetbrains.kotlin.builtins.DefaultBuiltIns
|
||||||
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
|
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
|
||||||
import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
|
import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
|
||||||
@@ -44,9 +43,7 @@ class FirAnalyzerFacade(
|
|||||||
val fir2IrConfiguration: Fir2IrConfiguration,
|
val fir2IrConfiguration: Fir2IrConfiguration,
|
||||||
val ktFiles: Collection<KtFile> = emptyList(), // may be empty if light tree mode enabled
|
val ktFiles: Collection<KtFile> = emptyList(), // may be empty if light tree mode enabled
|
||||||
val lightTreeFiles: Collection<LightTreeFile> = emptyList(), // may be empty if light tree mode disabled
|
val lightTreeFiles: Collection<LightTreeFile> = emptyList(), // may be empty if light tree mode disabled
|
||||||
val irGeneratorExtensions: Collection<IrGenerationExtension>,
|
|
||||||
val parser: FirParser,
|
val parser: FirParser,
|
||||||
val enablePluginPhases: Boolean = false,
|
|
||||||
val diagnosticReporterForLightTree: DiagnosticReporter? = null
|
val diagnosticReporterForLightTree: DiagnosticReporter? = null
|
||||||
) : AbstractFirAnalyzerFacade() {
|
) : AbstractFirAnalyzerFacade() {
|
||||||
private var firFiles: List<FirFile>? = null
|
private var firFiles: List<FirFile>? = null
|
||||||
|
|||||||
Reference in New Issue
Block a user