Migrate classpath resolution to ClassPathResolvers

Author: fwcd

adapter/build.gradle

@@ -26,7 +26,7 @@ dependencies {
 	implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.6.0'
 	implementation 'org.jetbrains.kotlin:kotlin-stdlib'
 	implementation 'org.jetbrains.kotlin:kotlin-reflect'
-	implementation 'com.github.fwcd.kotlin-language-server:shared:542d635b9fc9e41eb732ba40ef10742b33a92acc'
+	implementation 'com.github.fwcd.kotlin-language-server:shared:0691158787'
 	// The Java Debug Interface classes (com.sun.jdi.*)
 	implementation files("${System.properties['java.home']}/../lib/tools.jar")
 	testImplementation 'junit:junit:4.12'

adapter/src/main/kotlin/org/javacs/ktda/adapter/KotlinDebugAdapter.kt

@@ -28,7 +28,7 @@ import org.javacs.ktda.core.launch.DebugLauncher
 import org.javacs.ktda.core.launch.LaunchConfiguration
 import org.javacs.ktda.core.launch.AttachConfiguration
 import org.javacs.ktda.core.breakpoint.ExceptionBreakpoint
-import org.javacs.ktda.classpath.findClassPath
+import org.javacs.ktda.classpath.debugClassPathResolver
 import org.javacs.ktda.classpath.findValidKtFilePath
 
 /** The debug server interface conforming to the Debug Adapter Protocol */
@@ -92,7 +92,7 @@ class KotlinDebugAdapter(
 		setupCommonInitializationParams(args)
 
 		val config = LaunchConfiguration(
-			findClassPath(listOf(projectRoot)),
+			debugClassPathResolver(listOf(projectRoot)).classpathOrEmpty,
 			mainClass,
 			projectRoot
 		)

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

@@ -0,0 +1,10 @@
+package org.javacs.ktda.classpath
+
+import org.javacs.kt.classpath.ClassPathResolver
+import org.javacs.kt.classpath.defaultClassPathResolver
+import org.javacs.kt.classpath.plus
+import org.javacs.kt.classpath.joined
+import java.nio.file.Path
+
+fun debugClassPathResolver(workspaceRoots: Collection<Path>): ClassPathResolver =
+	defaultClassPathResolver(workspaceRoots) + workspaceRoots.map { ProjectClassesResolver(it) }.joined