From 56afd763dc262f4d44116a2a21cf83341de1414e Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Fri, 3 Jul 2020 15:41:23 +0300 Subject: [PATCH] Minor: add debug log messages --- .../kotlin/idea/scripting/gradle/LastModifiedFiles.kt | 10 +++++++++- .../gradle/importing/KotlinDslScriptModelProcessor.kt | 4 ++++ .../idea/scripting/gradle/roots/GradleBuildRoot.kt | 3 +++ .../scripting/gradle/roots/GradleBuildRootsManager.kt | 3 +++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/LastModifiedFiles.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/LastModifiedFiles.kt index 986782591a7..4d91bf45fba 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/LastModifiedFiles.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/LastModifiedFiles.kt @@ -36,7 +36,11 @@ class LastModifiedFiles( class SimultaneouslyChangedFiles( val ts: Long = Long.MIN_VALUE, val fileIds: MutableSet = mutableSetOf() - ) + ) { + override fun toString(): String { + return "SimultaneouslyChangedFiles(ts=$ts, fileIds=$fileIds)" + } + } @Synchronized fun fileChanged(ts: Long, fileId: String) { @@ -59,6 +63,10 @@ class LastModifiedFiles( else -> last.ts } + override fun toString(): String { + return "LastModifiedFiles(last=$last, previous=$previous)" + } + companion object { private val fileAttribute = FileAttribute("last-modified-files", 1, false) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt index 0bfd0a14d6d..2698124f9e3 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt @@ -134,6 +134,10 @@ class KotlinDslGradleBuildSync(val workingDir: String, val taskId: ExternalSyste val projectRoots = mutableSetOf() val models = mutableListOf() var failed = false + + override fun toString(): String { + return "KotlinGradleDslSync(workingDir=$workingDir, gradleVersion=$gradleVersion, gradleHome=$gradleHome, javaHome=$javaHome, projectRoots=$projectRoots, failed=$failed)" + } } fun saveScriptModels(project: Project, build: KotlinDslGradleBuildSync) { diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt index 8058f1d5cb5..f8c13d2f532 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt @@ -12,6 +12,8 @@ import org.jetbrains.kotlin.idea.core.script.ucache.ScriptClassRootsBuilder import org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptDefinitionsContributor import org.jetbrains.kotlin.idea.scripting.gradle.LastModifiedFiles import org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslScriptModel +import org.jetbrains.kotlin.idea.scripting.gradle.scriptingDebugLog +import org.jetbrains.kotlin.idea.scripting.gradle.scriptingErrorLog import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition import org.jetbrains.kotlin.scripting.resolve.VirtualFileScriptSource import org.jetbrains.plugins.gradle.settings.GradleProjectSettings @@ -43,6 +45,7 @@ sealed class GradleBuildRoot( get() = LocalFileSystem.getInstance().findFileByPath(pathPrefix) fun saveLastModifiedFiles() { + scriptingDebugLog { "LasModifiedFiles saved: $lastModifiedFiles" } LastModifiedFiles.write(dir ?: return, lastModifiedFiles) } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt index fb6c3fac87e..c0641e363ed 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt @@ -146,6 +146,8 @@ class GradleBuildRootsManager(val project: Project) : GradleBuildRootsLocator(), if (oldRoot is Imported && oldRoot.data.models.isEmpty()) return } + scriptingDebugLog { "save gradle project info after import: $sync" } + if (oldRoot is Legacy) { oldRoot.importing.set(updated) return @@ -161,6 +163,7 @@ class GradleBuildRootsManager(val project: Project) : GradleBuildRootsLocator(), return } + scriptingDebugLog { "save script models after import: ${sync.models}" } val newData = GradleBuildRootData( sync.ts, sync.projectRoots, gradleHome, sync.javaHome, sync.models