From 51c71efa2e27fadd22bcd721753f7798e7b6a43a Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Wed, 26 Oct 2022 10:16:55 +0200
Subject: [PATCH] [Gradle] Add additional logging for setting .moduleName in
 compiler args

^KT-54312 Verification Pending
---
 .../kotlin/gradle/internal/CompilerArgumentsContributor.kt  | 6 ++++--
 .../kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt       | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt
index 4d88ddc3430..5adcb5ba186 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt
@@ -67,6 +67,7 @@ internal open class KotlinJvmCompilerArgumentsContributor(
     taskProvider: KotlinJvmCompilerArgumentsProvider
 ) : AbstractKotlinCompileArgumentsContributor<K2JVMCompilerArguments>(taskProvider) {
 
+    private val taskName = taskProvider.taskName
     private val moduleName = taskProvider.moduleName
     private val friendPaths = taskProvider.friendPaths
     private val compileClasspath = taskProvider.compileClasspath
@@ -82,10 +83,10 @@ internal open class KotlinJvmCompilerArgumentsContributor(
         super.contributeArguments(args, flags)
 
         args.moduleName = moduleName
-        logger.kotlinDebug { "args.moduleName = ${args.moduleName}" }
+        logger.kotlinDebug { "$taskName | args.moduleName = ${args.moduleName}" }
 
         args.friendPaths = friendPaths.files.map { it.absolutePath }.toTypedArray()
-        logger.kotlinDebug { "args.friendPaths = ${args.friendPaths?.joinToString() ?: "[]"}" }
+        logger.kotlinDebug { "$taskName | args.friendPaths = ${args.friendPaths?.joinToString() ?: "[]"}" }
 
         if (DefaultsOnly in flags) return
 
@@ -98,5 +99,6 @@ internal open class KotlinJvmCompilerArgumentsContributor(
         args.destinationAsFile = destinationDir
 
         compilerOptions.fillCompilerArguments(args)
+        logger.kotlinDebug { "$taskName | args.moduleName = ${args.moduleName} (w/ compilerOptions applied)" }
     }
 }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 645a6033a35..adb857437d9 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -521,6 +521,7 @@ open class KotlinCompileArgumentsProvider<T : AbstractKotlinCompile<out CommonCo
 
 class KotlinJvmCompilerArgumentsProvider
     (taskProvider: KotlinCompile) : KotlinCompileArgumentsProvider<KotlinCompile>(taskProvider) {
+    val taskName: String = taskProvider.name
     val moduleName: String = taskProvider.moduleName.get()
     val friendPaths: FileCollection = taskProvider.friendPaths
     val compileClasspath: Iterable<File> = taskProvider.libraries