From b14406b7b7cebe8bf42af470206234708f22e997 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Mon, 14 Aug 2023 13:37:56 +0200 Subject: [PATCH] [Gradle] Inline daemon exception report call It allows getting rid of the dependency on `:compiler:incremental-compilation-impl` #KT-61449 In Progress --- .../kotlin/compilerRunner/GradleKotlinCompilerWork.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt index 5001f736a2f..941432fd4b3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.build.report.statistics.StatTag import org.jetbrains.kotlin.buildtools.api.KotlinLogger import org.jetbrains.kotlin.buildtools.api.SourcesChanges import org.jetbrains.kotlin.cli.common.ExitCode +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.daemon.common.* @@ -23,8 +24,6 @@ import org.jetbrains.kotlin.gradle.tasks.* import org.jetbrains.kotlin.gradle.utils.stackTraceAsString import org.jetbrains.kotlin.incremental.ClasspathChanges import org.jetbrains.kotlin.incremental.IncrementalModuleInfo -import org.jetbrains.kotlin.incremental.util.ExceptionLocation -import org.jetbrains.kotlin.incremental.util.reportException import org.jetbrains.kotlin.util.removeSuffixIfPresent import org.jetbrains.kotlin.utils.addToStdlib.ifTrue import org.slf4j.LoggerFactory @@ -174,7 +173,10 @@ internal class GradleKotlinCompilerWork @Inject constructor( try { return compileWithDaemon(messageCollector) to KotlinCompilerExecutionStrategy.DAEMON } catch (e: Throwable) { - messageCollector.reportException(e, ExceptionLocation.DAEMON) + messageCollector.report( + severity = CompilerMessageSeverity.EXCEPTION, + message = "Daemon compilation failed: ${e.message}\n${e.stackTraceToString()}" + ) if (!compilerExecutionSettings.useDaemonFallbackStrategy) { throw RuntimeException( "Failed to compile with Kotlin daemon. Fallback strategy (compiling without Kotlin daemon) is turned off. " +