Skip to content

Commit 15aebbc

Browse files
author
Maksim Ryzhikov
committed
use runtimeClasspath during classpath resolution
fwcd#92
1 parent 7f05669 commit 15aebbc

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

adapter/build.gradle.kts

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ dependencies {
2323
implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.15.0")
2424
implementation("org.jetbrains.kotlin:kotlin-stdlib")
2525
implementation("org.jetbrains.kotlin:kotlin-reflect")
26-
implementation("kotlin-language-server:shared")
26+
implementation("kotlin-language-server:shared") {
27+
version {
28+
branch = "main"
29+
}
30+
}
2731

2832
// modules temporarily needed because of shared module import above
2933
implementation("org.jetbrains.exposed:exposed-core:0.37.3")

adapter/src/main/kotlin/org/javacs/ktda/classpath/DebugClassPathResolver.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ package org.javacs.ktda.classpath
22

33
import org.javacs.kt.classpath.ClassPathResolver
44
import org.javacs.kt.classpath.defaultClassPathResolver
5+
import org.javacs.kt.classpath.ResolverOptions
56
import org.javacs.kt.classpath.plus
67
import org.javacs.kt.classpath.joined
78
import java.nio.file.Path
89

10+
val options = ResolverOptions(useCompileClasspath = false)
11+
912
fun debugClassPathResolver(workspaceRoots: Collection<Path>): ClassPathResolver =
10-
defaultClassPathResolver(workspaceRoots) + workspaceRoots.map { ProjectClassesResolver(it) }.joined
13+
defaultClassPathResolver(workspaceRoots, resolverOptions = options) + workspaceRoots.map { ProjectClassesResolver(it) }.joined

settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pluginManagement {
1515
}
1616

1717
sourceControl {
18-
gitRepository(java.net.URI.create("https://github.com/fwcd/kotlin-language-server.git")) {
18+
gitRepository(java.net.URI.create("https://github.com/maksimr/kotlin-language-server.git")) {
1919
producesModule("kotlin-language-server:shared")
2020
}
2121
}

0 commit comments

Comments
 (0)