Separate classpath from build script classpath

Author: fwcd

server/src/main/resources/kotlinDSLClassPathFinder.gradle

@@ -3,7 +3,8 @@ import org.gradle.internal.classpath.ClassPath
 
 allprojects { project ->
     task kotlinLSPKotlinDSLDeps {
-        def pattern = ~/^(?:gradle-(?:kotlin-dsl|base-services|core)|kotlin-(?:compiler|stdlib)).*\.jar/
+        // def pattern = ~/^(?:gradle-(?:kotlin-dsl|base-services|plugins|core)|kotlin-(?:compiler|stdlib)).*\.jar/
+        def pattern = ~/^.*\.jar/
         doLast {
             (fileTree("$gradle.gradleHomeDir/lib") + fileTree("$gradle.gradleUserHomeDir/caches/$gradle.gradleVersion/generated-gradle-jars"))
                 .findAll { it.name =~ pattern }

shared/src/main/kotlin/org/javacs/kt/classpath/ClassPathResolver.kt

@@ -6,6 +6,7 @@ import java.nio.file.Path
 /** A source for creating class paths */
 interface ClassPathResolver {
     val resolverType: String
+
     val classpath: Set<Path> // may throw exceptions
     val classpathOrEmpty: Set<Path> // does not throw exceptions
         get() = try {
@@ -15,6 +16,16 @@ interface ClassPathResolver {
             emptySet<Path>()
         }
 
+    val buildScriptClasspath: Set<Path>
+        get() = emptySet<Path>()
+    val buildScriptClasspathOrEmpty: Set<Path>
+        get() = try {
+            buildScriptClasspath
+        } catch (e: Exception) {
+            LOG.warn("Could not resolve buildscript classpath using {}: {}", resolverType, e.message)
+            emptySet<Path>()
+        }
+
     companion object {
         /** A default empty classpath implementation */
         val empty = object : ClassPathResolver {
@@ -39,10 +50,14 @@ internal class UnionClassPathResolver(val lhs: ClassPathResolver, val rhs: Class
     override val resolverType: String get() = "(${lhs.resolverType} + ${rhs.resolverType})"
     override val classpath get() = lhs.classpath + rhs.classpath
     override val classpathOrEmpty get() = lhs.classpathOrEmpty + rhs.classpathOrEmpty
+    override val buildScriptClasspath get() = lhs.buildScriptClasspath + rhs.buildScriptClasspath
+    override val buildScriptClasspathOrEmpty get() = lhs.buildScriptClasspathOrEmpty + rhs.buildScriptClasspathOrEmpty
 }
 
 internal class FirstNonEmptyClassPathResolver(val lhs: ClassPathResolver, val rhs: ClassPathResolver) : ClassPathResolver {
     override val resolverType: String get() = "(${lhs.resolverType} or ${rhs.resolverType})"
     override val classpath get() = lhs.classpath.takeIf { it.isNotEmpty() } ?: rhs.classpath
     override val classpathOrEmpty get() = lhs.classpathOrEmpty.takeIf { it.isNotEmpty() } ?: rhs.classpathOrEmpty
+    override val buildScriptClasspath get() = lhs.buildScriptClasspath.takeIf { it.isNotEmpty() } ?: rhs.buildScriptClasspath
+    override val buildScriptClasspathOrEmpty get() = lhs.buildScriptClasspathOrEmpty.takeIf { it.isNotEmpty() } ?: rhs.buildScriptClasspathOrEmpty
 }

shared/src/main/kotlin/org/javacs/kt/classpath/GradleClassPathResolver.kt

@@ -14,14 +14,25 @@ import java.nio.file.Paths
 
 internal class GradleClassPathResolver(private val path: Path, private val includeKotlinDSL: Boolean): ClassPathResolver {
     override val resolverType: String = "Gradle"
+    private val projectDirectory: Path get() = path.getParent()
     override val classpath: Set<Path> get() {
-        val projectDirectory = path.getParent()
-        val scripts = listOf("projectClassPathFinder.gradle") + listOf("kotlinDSLClassPathFinder.gradle").takeIf { includeKotlinDSL }.orEmpty()
-        val tasks = listOf("kotlinLSPProjectDeps") + listOf("kotlinLSPKotlinDSLDeps").takeIf { includeKotlinDSL }.orEmpty()
+        val scripts = listOf("projectClassPathFinder.gradle")
+        val tasks = listOf("kotlinLSPProjectDeps")
 
         return readDependenciesViaGradleCLI(projectDirectory, scripts, tasks)
             .apply { if (isNotEmpty()) LOG.info("Successfully resolved dependencies for '${projectDirectory.fileName}' using Gradle") }
     }
+    override val buildScriptClasspath: Set<Path> get() {
+        return if (includeKotlinDSL) {
+            val scripts = listOf("kotlinDSLClassPathFinder.gradle")
+            val tasks = listOf("kotlinLSPKotlinDSLDeps")
+
+            return readDependenciesViaGradleCLI(projectDirectory, scripts, tasks)
+                .apply { if (isNotEmpty()) LOG.info("Successfully resolved build script dependencies for '${projectDirectory.fileName}' using Gradle") }
+        } else {
+            emptySet()
+        }
+    }
 
     companion object {
         /** Create a Gradle resolver if a file is a pom. */