From ece930747158dd88cb0ad05c19b2c2691da8568b Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Tue, 13 Jul 2021 15:46:16 +0300 Subject: [PATCH] [JS IR] Fix destination directory in Incremental compiler runner for JS --- .../kotlin/incremental/IncrementalJsCompilerRunner.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt index fde92d34fe6..206a6019976 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.build.GeneratedFile import org.jetbrains.kotlin.build.report.BuildReporter import org.jetbrains.kotlin.build.report.ICReporter -import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter import org.jetbrains.kotlin.build.report.metrics.BuildAttribute +import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.isIrBackendEnabled @@ -94,8 +94,13 @@ class IncrementalJsCompilerRunner( return IncrementalJsCachesManager(cacheDirectory, projectDir, reporter, serializerProtocol) } - override fun destinationDir(args: K2JSCompilerArguments): File = - File(args.outputFile).parentFile + override fun destinationDir(args: K2JSCompilerArguments): File { + val outputFile = File(args.outputFile!!) + return if (args.isIrBackendEnabled()) + outputFile + else + outputFile.parentFile + } override fun calculateSourcesToCompileImpl( caches: IncrementalJsCachesManager,