Move file walking logic into SourceExclusions

Author: fwcd

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

@@ -5,7 +5,6 @@ import java.io.Closeable
 import java.nio.file.Files
 import java.nio.file.FileSystems
 import java.nio.file.Path
-import java.util.stream.Collectors
 
 /**
  * Manages the class path (compiled JARs, etc), the Java source path
@@ -129,14 +128,9 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
 
 private fun findJavaSourceFiles(root: Path): Set<Path> {
     val sourceMatcher = FileSystems.getDefault().getPathMatcher("glob:*.java")
-    val exclusions = SourceExclusions(root)
-    return root.toFile().walk()
-        .onEnter { exclusions.isPathIncluded(it.toPath()) }
-        .map { it.toPath() }
-        .filter {
-            // LOG.info("At $it")
-            sourceMatcher.matches(it)
-        }
+    return SourceExclusions(root)
+        .walkIncluded()
+        .filter { sourceMatcher.matches(it) }
         .toSet()
 }
 

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

@@ -20,7 +20,6 @@ import java.nio.file.FileSystems
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
-import java.util.stream.Collectors
 
 private class SourceVersion(val content: String, val version: Int, val language: Language?, val isTemporary: Boolean)
 
@@ -215,14 +214,13 @@ private fun patch(sourceText: String, change: TextDocumentContentChangeEvent): S
     }
 }
 
-// TODO: Cut off branches that are excluded in the walker directly
 private fun findSourceFiles(root: Path): Set<URI> {
     val sourceMatcher = FileSystems.getDefault().getPathMatcher("glob:*.{kt,kts}")
-    val exclusions = SourceExclusions(root)
-    return Files.walk(root)
-        .filter { exclusions.isPathIncluded(it) && sourceMatcher.matches(it.fileName) }
+    return SourceExclusions(root)
+        .walkIncluded()
+        .filter { sourceMatcher.matches(it.fileName) }
         .map(Path::toUri)
-        .collect(Collectors.toSet())
+        .toSet()
 }
 
 private fun logAdded(sources: Collection<URI>, rootPath: Path?) {

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

@@ -11,10 +11,20 @@ import java.nio.file.Paths
 class SourceExclusions(private val workspaceRoots: Collection<Path>) {
 	private val excludedFolders = listOf(".git", "bin", "build", "target", "node_modules")
 
-	constructor(workspaceRoot: Path) : this(listOf(workspaceRoot)) {}
+    constructor(workspaceRoot: Path) : this(listOf(workspaceRoot)) {}
 
+    /** Finds all non-excluded files recursively. */
+    fun walkIncluded(): Sequence<Path> = workspaceRoots.asSequence().flatMap { root ->
+        root.toFile()
+            .walk()
+            .onEnter { isPathIncluded(it.toPath()) }
+            .map { it.toPath() }
+    }
+
+    /** Tests whether the given URI is not excluded. */
     fun isURIIncluded(uri: URI) = uri.filePath?.let(this::isPathIncluded) ?: false
 
+    /** Tests whether the given path is not excluded. */
     fun isPathIncluded(file: Path): Boolean = workspaceRoots.any { file.startsWith(it) }
         && excludedFolders.none {
             workspaceRoots