Skip to content

Commit 844699d

Browse files
committed
Add scripting compiler as a dependency
Adds the kotlin-scripting-compiler to the classpath since CliScriptDefinitionProvider has been moved to this package.
1 parent 3b20ec8 commit 844699d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

server/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ dependencies {
3737
implementation 'com.google.guava:guava:21.0'
3838
implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.5.0'
3939
implementation "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
40+
implementation "org.jetbrains.kotlin:kotlin-scripting-compiler:$kotlinVersion"
4041
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
4142
implementation 'org.jetbrains:fernflower:1.0'
4243

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.intellij.openapi.vfs.StandardFileSystems
66
import com.intellij.openapi.vfs.VirtualFileManager
77
import com.intellij.psi.PsiFileFactory
88
import com.intellij.mock.MockProject
9-
import org.jetbrains.kotlin.cli.common.script.CliScriptDefinitionProvider
9+
import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider
1010
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
1111
import org.jetbrains.kotlin.cli.jvm.compiler.CliBindingTrace
1212
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
@@ -68,10 +68,10 @@ class Compiler(classPath: Set<Path>) {
6868

6969
private val parser = KtPsiFactory(environment.project)
7070
private val localFileSystem = VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL)
71-
private val scripts = ScriptDefinitionProvider.getInstance(environment.project) as CliScriptDefinitionProvider
71+
private val scripts = ScriptDefinitionProvider.getInstance(environment.project) as? CliScriptDefinitionProvider
7272

7373
init {
74-
scripts.setScriptDefinitions(listOf(KotlinScriptDefinition(Any::class)))
74+
scripts?.setScriptDefinitions(listOf(KotlinScriptDefinition(Any::class)))
7575
}
7676

7777
fun createFile(content: String, file: Path = Paths.get("dummy.kt")): KtFile {

0 commit comments

Comments
 (0)