Skip to content

Commit 5fb5825

Browse files
committed
Log script template at debug level
1 parent be6f43d commit 5fb5825

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

server/src/main/kotlin/org/javacs/kt/Compiler.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private class CompilationEnvironment(
9999
addJvmClasspathRoots(classPath.map { it.toFile() })
100100

101101
// Setup script templates (e.g. used by Gradle's Kotlin DSL)
102-
var scriptDefinitions: List<ScriptDefinition> = listOf(ScriptDefinition.getDefault(defaultJvmScriptingHostConfiguration))
102+
val scriptDefinitions: MutableList<ScriptDefinition> = mutableListOf(ScriptDefinition.getDefault(defaultJvmScriptingHostConfiguration))
103103

104104
if (classPath.any { GRADLE_DSL_DEPENDENCY_PATTERN.matches(it.fileName.toString()) }) {
105105
LOG.info("Configuring Kotlin DSL script templates...")
@@ -122,7 +122,7 @@ private class CompilationEnvironment(
122122
// of KotlinScriptDefinition.dependencyResolver
123123
// TODO: Use ScriptDefinition.FromLegacyTemplate directly if possible
124124
// scriptDefinitions = scriptTemplates.map { ScriptDefinition.FromLegacyTemplate(scriptHostConfig, scriptClassLoader.loadClass(it).kotlin) }
125-
scriptDefinitions = scriptTemplates.map { ScriptDefinition.FromLegacy(scriptHostConfig, object : KotlinScriptDefinitionFromAnnotatedTemplate(
125+
scriptDefinitions.addAll(scriptTemplates.map { ScriptDefinition.FromLegacy(scriptHostConfig, object : KotlinScriptDefinitionFromAnnotatedTemplate(
126126
scriptClassLoader.loadClass(it).kotlin,
127127
scriptHostConfig[ScriptingHostConfiguration.getEnvironment]?.invoke()
128128
) {
@@ -131,7 +131,7 @@ private class CompilationEnvironment(
131131
imports = listOf("org.gradle.kotlin.dsl.*")
132132
))
133133
}
134-
}) }
134+
}) })
135135
} catch (e: Exception) {
136136
LOG.error("Error while loading script template classes")
137137
LOG.printStackTrace(e)
@@ -280,7 +280,7 @@ class Compiler(classPath: Set<Path>, buildScriptClassPath: Set<Path> = emptySet(
280280
fun compileFiles(files: Collection<KtFile>, sourcePath: Collection<KtFile>, kind: CompilationKind = CompilationKind.DEFAULT): Pair<BindingContext, ComponentProvider> {
281281
if (kind == CompilationKind.BUILD_SCRIPT) {
282282
// Print the (legacy) script template used by the compiled Kotlin DSL build file
283-
files.forEach { LOG.info("$it -> ScriptDefinition: ${it.findScriptDefinition()?.asLegacyOrNull<KotlinScriptDefinition>()?.template?.simpleName}") }
283+
files.forEach { LOG.debug { "$it -> ScriptDefinition: ${it.findScriptDefinition()?.asLegacyOrNull<KotlinScriptDefinition>()?.template?.simpleName}" } }
284284
}
285285

286286
compileLock.withLock {

0 commit comments

Comments
 (0)