Skip to content

Commit be6f43d

Browse files
committed
Implicitly import Kotlin DSL
1 parent a5edd49 commit be6f43d

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,17 @@ private class CompilationEnvironment(
121121
// ScriptDefinition.compilationConfiguration and its defaultImports instead
122122
// of KotlinScriptDefinition.dependencyResolver
123123
// TODO: Use ScriptDefinition.FromLegacyTemplate directly if possible
124-
scriptDefinitions = scriptTemplates.map { ScriptDefinition.FromLegacyTemplate(scriptHostConfig, scriptClassLoader.loadClass(it).kotlin) }
125-
// scriptDefinitions = scriptTemplates.map { ScriptDefinition.FromLegacy(scriptHostConfig, object : KotlinScriptDefinitionFromAnnotatedTemplate(
126-
// scriptClassLoader.loadClass(it).kotlin,
127-
// scriptHostConfig[ScriptingHostConfiguration.getEnvironment]?.invoke()
128-
// ) {
129-
// override val dependencyResolver: DependenciesResolver = object : DependenciesResolver {
130-
// override fun resolve(scriptContents: ScriptContents, environment: Environment) = ResolveResult.Success(ScriptDependencies(
131-
// imports = listOf("org.gradle.kotlin.api.*")
132-
// ))
133-
// }
134-
// }) }
124+
// scriptDefinitions = scriptTemplates.map { ScriptDefinition.FromLegacyTemplate(scriptHostConfig, scriptClassLoader.loadClass(it).kotlin) }
125+
scriptDefinitions = scriptTemplates.map { ScriptDefinition.FromLegacy(scriptHostConfig, object : KotlinScriptDefinitionFromAnnotatedTemplate(
126+
scriptClassLoader.loadClass(it).kotlin,
127+
scriptHostConfig[ScriptingHostConfiguration.getEnvironment]?.invoke()
128+
) {
129+
override val dependencyResolver: DependenciesResolver = object : DependenciesResolver {
130+
override fun resolve(scriptContents: ScriptContents, environment: Environment) = ResolveResult.Success(ScriptDependencies(
131+
imports = listOf("org.gradle.kotlin.dsl.*")
132+
))
133+
}
134+
}) }
135135
} catch (e: Exception) {
136136
LOG.error("Error while loading script template classes")
137137
LOG.printStackTrace(e)

0 commit comments

Comments
 (0)