Move PathUtils into nf-lang

Signed-off-by: Ben Sherman <[email protected]>

Author: bentsherman

src/main/java/nextflow/lsp/NextflowLanguageServer.java

@@ -25,7 +25,6 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import nextflow.lsp.file.PathUtils;
 import nextflow.lsp.util.JsonUtils;
 import nextflow.lsp.util.Logger;
 import nextflow.lsp.util.ProgressNotification;
@@ -36,6 +35,7 @@
 import nextflow.lsp.services.config.ConfigService;
 import nextflow.lsp.services.script.ScriptService;
 import nextflow.script.formatter.FormattingOptions;
+import nextflow.util.PathUtils;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.eclipse.lsp4j.CallHierarchyIncomingCall;
 import org.eclipse.lsp4j.CallHierarchyIncomingCallsParams;
@@ -602,7 +602,7 @@ private LanguageService getLanguageService(String uri) {
             return null;
         }
         var path = Path.of(URI.create(uri));
-        if( PathUtils.isPathExcluded(path, configuration.excludePatterns()) )
+        if( PathUtils.isExcluded(path, configuration.excludePatterns()) )
             return null;
         return service;
     }

src/main/java/nextflow/lsp/file/PathUtils.java

@@ -35,13 +35,13 @@
 
 import nextflow.lsp.ast.ASTNodeCache;
 import nextflow.lsp.file.FileCache;
-import nextflow.lsp.file.PathUtils;
 import nextflow.lsp.util.DebouncingExecutor;
 import nextflow.lsp.util.LanguageServerUtils;
 import nextflow.lsp.util.Logger;
 import nextflow.lsp.util.Positions;
 import nextflow.script.control.RelatedInformationAware;
 import nextflow.script.formatter.FormattingOptions;
+import nextflow.util.PathUtils;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.eclipse.lsp4j.CallHierarchyIncomingCall;
 import org.eclipse.lsp4j.CallHierarchyItem;
@@ -143,23 +143,11 @@ public void initialize(String rootUri, LanguageServerConfiguration configuration
 
     protected Set<URI> getWorkspaceFiles(String rootUri) {
         try {
-            var root = Path.of(URI.create(rootUri));
             var result = new HashSet<URI>();
-            Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
-                @Override
-                public FileVisitResult preVisitDirectory(Path path, BasicFileAttributes attrs) {
-                    return PathUtils.isPathExcluded(path, configuration.excludePatterns())
-                        ? FileVisitResult.SKIP_SUBTREE
-                        : FileVisitResult.CONTINUE;
-                }
-                @Override
-                public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) {
-                    if( matchesFile(path.toString()) && !PathUtils.isPathExcluded(path, configuration.excludePatterns()) )
-                        result.add(path.toUri());
-                    return FileVisitResult.CONTINUE;
-                }
-            });
-
+            PathUtils.visitFiles(
+                Path.of(URI.create(rootUri)),
+                (path) -> (Files.isDirectory(path) || matchesFile(path.toString())) && !PathUtils.isExcluded(path, configuration.excludePatterns()),
+                (path) -> result.add(path.toUri()));
             return result;
         }
         catch( IOException e ) {