Prune file walk tree in findJavaSourceFiles

Author: fwcd

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

@@ -127,13 +127,17 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
     }
 }
 
-// TODO: Cut off branches that are excluded in the walker directly
 private fun findJavaSourceFiles(root: Path): Set<Path> {
     val sourceMatcher = FileSystems.getDefault().getPathMatcher("glob:*.java")
     val exclusions = SourceExclusions(root)
-    return Files.walk(root)
-        .filter { exclusions.isPathIncluded(it) && sourceMatcher.matches(it.fileName) }
-        .collect(Collectors.toSet())
+    return root.toFile().walk()
+        .onEnter { exclusions.isPathIncluded(it.toPath()) }
+        .map { it.toPath() }
+        .filter {
+            // LOG.info("At $it")
+            sourceMatcher.matches(it)
+        }
+        .toSet()
 }
 
 private fun logAdded(sources: Collection<Path>, name: String) {

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

@@ -1,6 +1,7 @@
 package org.javacs.kt
 
 import org.javacs.kt.util.filePath
+import java.io.File
 import java.net.URI
 import java.nio.file.Path
 import java.nio.file.Paths

shared/src/main/kotlin/org/javacs/kt/util/Utils.kt

@@ -2,10 +2,12 @@ package org.javacs.kt.util
 
 import org.javacs.kt.LOG
 import java.io.PrintStream
+import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.net.URI
 import java.util.concurrent.CompletableFuture
+import java.util.stream.Stream
 
 fun execAndReadStdout(shellCommand: String, directory: Path): String {
     val process = Runtime.getRuntime().exec(shellCommand, null, directory.toFile())