Model script exclusion via SourceExclusions

Author: fwcd

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

@@ -157,20 +157,20 @@ class CompilerClassPath(
 
     private fun isBuildScript(file: Path): Boolean = file.fileName.toString().let { it == "pom.xml" || it == "build.gradle" || it == "build.gradle.kts" }
 
+    private fun findJavaSourceFiles(root: Path): Set<Path> {
+        val sourceMatcher = FileSystems.getDefault().getPathMatcher("glob:*.java")
+        return SourceExclusions(listOf(root), scriptsConfig)
+            .walkIncluded()
+            .filter { sourceMatcher.matches(it.fileName) }
+            .toSet()
+    }
+
     override fun close() {
         compiler.close()
         outputDirectory.delete()
     }
 }
 
-private fun findJavaSourceFiles(root: Path): Set<Path> {
-    val sourceMatcher = FileSystems.getDefault().getPathMatcher("glob:*.java")
-    return SourceExclusions(root)
-        .walkIncluded()
-        .filter { sourceMatcher.matches(it.fileName) }
-        .toSet()
-}
-
 private fun logAdded(sources: Collection<Path>, name: String) {
     when {
         sources.isEmpty() -> return

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

@@ -30,13 +30,6 @@ public data class DiagnosticsConfiguration(
     var debounceTime: Long = 250L
 )
 
-public data class ScriptsConfiguration(
-    /** Whether .kts scripts are handled. */
-    var enabled: Boolean = false,
-    /** Whether .gradle.kts scripts are handled. Only considered if scripts are enabled in general. */
-    var buildScriptsEnabled: Boolean = false
-)
-
 public data class JVMConfiguration(
     /** Which JVM target the Kotlin compiler uses. See Compiler.jvmTargetFrom for possible values. */
     var target: String = "default"

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

@@ -69,7 +69,7 @@ class SourceFiles(
     private val scriptsConfig: ScriptsConfiguration
 ) {
     private val workspaceRoots = mutableSetOf<Path>()
-    private var exclusions = SourceExclusions(workspaceRoots)
+    private var exclusions = SourceExclusions(workspaceRoots, scriptsConfig)
     private val files = NotifySourcePath(sp)
     private val open = mutableSetOf<URI>()
 
@@ -177,20 +177,16 @@ class SourceFiles(
     }
 
     private fun findSourceFiles(root: Path): Set<URI> {
-        val glob = if (scriptsConfig.enabled) "*.{kt,kts}" else "*.kt"
-        val sourceMatcher = FileSystems.getDefault().getPathMatcher("glob:$glob")
-        return SourceExclusions(root)
+        val sourceMatcher = FileSystems.getDefault().getPathMatcher("glob:*.{kt,kts}")
+        return SourceExclusions(listOf(root), scriptsConfig)
             .walkIncluded()
-            .filter {
-                sourceMatcher.matches(it.fileName)
-                && (scriptsConfig.buildScriptsEnabled || !it.endsWith(".gradle.kts"))
-            }
+            .filter { sourceMatcher.matches(it.fileName) }
             .map(Path::toUri)
             .toSet()
     }
 
     private fun updateExclusions() {
-        exclusions = SourceExclusions(workspaceRoots)
+        exclusions = SourceExclusions(workspaceRoots, scriptsConfig)
     }
 
     fun isOpen(uri: URI): Boolean = (uri in open)

shared/src/main/kotlin/org/javacs/kt/ScriptsConfiguration.kt

@@ -0,0 +1,8 @@
+package org.javacs.kt
+
+public data class ScriptsConfiguration(
+    /** Whether .kts scripts are handled. */
+    var enabled: Boolean = false,
+    /** Whether .gradle.kts scripts are handled. Only considered if scripts are enabled in general. */
+    var buildScriptsEnabled: Boolean = false
+)

shared/src/main/kotlin/org/javacs/kt/SourceExclusions.kt

@@ -9,10 +9,19 @@ import java.nio.file.Paths
 
 // TODO: Read exclusions from gitignore/settings.json/... instead of
 // hardcoding them
-class SourceExclusions(private val workspaceRoots: Collection<Path>) {
-	private val excludedPatterns = listOf(".*", "bazel-*", "bin", "build", "node_modules", "target").map { FileSystems.getDefault().getPathMatcher("glob:$it") }
-
-    constructor(workspaceRoot: Path) : this(listOf(workspaceRoot)) {}
+class SourceExclusions(
+    private val workspaceRoots: Collection<Path>,
+    private val scriptsConfig: ScriptsConfiguration
+) {
+	private val excludedPatterns = listOf(
+        ".*", "bazel-*", "bin", "build", "node_modules", "target",
+        *(when {
+            !scriptsConfig.enabled -> arrayOf("*.kts")
+            !scriptsConfig.buildScriptsEnabled -> arrayOf("*.gradle.kts")
+            else -> arrayOf()
+        }),
+    )
+        .map { FileSystems.getDefault().getPathMatcher("glob:$it") }
 
     /** Finds all non-excluded files recursively. */
     fun walkIncluded(): Sequence<Path> = workspaceRoots.asSequence().flatMap { root ->