Extend FilesCompleter/DirectoriesCompleter to accept a lambda for the…

… current dir, fix for #413
jline · Jul 8, 2019 · a1f2c93 · a1f2c93
1 parent d9716b6
commit a1f2c93
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Completers.java b/builtins/src/main/java/org/jline/builtins/Completers.java
@@ -25,6 +25,7 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.jline.reader.Candidate;
 import org.jline.reader.LineReader;
@@ -217,19 +218,23 @@ private boolean isTrue(Object result) {
 
     public static class DirectoriesCompleter extends FileNameCompleter {
 
-        private final Path currentDir;
+        private final Supplier<Path> currentDir;
 
         public DirectoriesCompleter(File currentDir) {
             this(currentDir.toPath());
         }
 
         public DirectoriesCompleter(Path currentDir) {
+            this.currentDir = () -> currentDir;
+        }
+
+        public DirectoriesCompleter(Supplier<Path> currentDir) {
             this.currentDir = currentDir;
         }
 
         @Override
         protected Path getUserDir() {
-            return currentDir;
+            return currentDir.get();
         }
 
         @Override
@@ -240,19 +245,23 @@ protected boolean accept(Path path) {
 
     public static class FilesCompleter extends FileNameCompleter {
 
-        private final Path currentDir;
+        private final Supplier<Path> currentDir;
 
         public FilesCompleter(File currentDir) {
             this(currentDir.toPath());
         }
 
         public FilesCompleter(Path currentDir) {
+            this.currentDir = () -> currentDir;
+        }
+
+        public FilesCompleter(Supplier<Path> currentDir) {
             this.currentDir = currentDir;
         }
 
         @Override
         protected Path getUserDir() {
-            return currentDir;
+            return currentDir.get();
         }
     }