azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K1/K2: deduplicate/simplify the code around JVM CLI

Browse Source 
Related to KT-61510, KT-61745
This commit is contained in:
Mikhail Glukhikh
2023-09-06 14:36:05 +02:00
committed by Space Team
parent 3561054998
commit b0b6a6a05a
6 changed files with 281 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt
+5 -7
View File
@@ -29,10 +29,7 @@ import org.jetbrains.kotlin.cli.common.messages.IrMessageCollector
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.cli.common.modules.ModuleBuilder
import org.jetbrains.kotlin.cli.jvm.*
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.VfsBasedProjectEnvironment
import org.jetbrains.kotlin.cli.jvm.compiler.findMainClass
import org.jetbrains.kotlin.cli.jvm.compiler.forAllFiles
import org.jetbrains.kotlin.cli.jvm.compiler.*
import org.jetbrains.kotlin.cli.jvm.compiler.pipeline.*
import org.jetbrains.kotlin.cli.jvm.config.*
import org.jetbrains.kotlin.cli.jvm.plugins.PluginCliParser
@@ -221,7 +218,7 @@ open class IncrementalFirJvmCompilerRunner(
val analysisResults =
compileModuleToAnalyzedFir(
compilerInput,
compilerEnvironment,
projectEnvironment,
emptyList(),
incrementalExcludesScope,
diagnosticsReporter,
@@ -308,9 +305,10 @@ open class IncrementalFirJvmCompilerRunner(
diagnosticsReporter.reportToMessageCollector(messageCollector, renderDiagnosticName)
writeOutputs(
projectEnvironment,
writeOutputsIfNeeded(
projectEnvironment.project,
configuration,
messageCollector,
listOf(codegenOutput.generationState),
mainClassFqName
)