diff --git a/builtins/src/main/java/org/jline/builtins/Completers.java b/builtins/src/main/java/org/jline/builtins/Completers.java index 1c26338f6..5dccc637c 100644 --- a/builtins/src/main/java/org/jline/builtins/Completers.java +++ b/builtins/src/main/java/org/jline/builtins/Completers.java @@ -259,8 +259,8 @@ protected Path getUserDir() { } @Override - protected String getSeparator() { - return forceSlash ? "/" : getUserDir().getFileSystem().getSeparator(); + protected String getSeparator(boolean useForwardSlash) { + return forceSlash || useForwardSlash ? "/" : getUserDir().getFileSystem().getSeparator(); } @Override @@ -306,8 +306,8 @@ protected Path getUserDir() { } @Override - protected String getSeparator() { - return forceSlash ? "/" : getUserDir().getFileSystem().getSeparator(); + protected String getSeparator(boolean useForwardSlash) { + return forceSlash || useForwardSlash ? "/" : getUserDir().getFileSystem().getSeparator(); } } @@ -341,7 +341,7 @@ public void complete(LineReader reader, ParsedLine commandLine, final List= 0) { @@ -396,8 +396,8 @@ protected Path getUserHome() { return Paths.get(System.getProperty("user.home")); } - protected String getSeparator() { - return getUserDir().getFileSystem().getSeparator(); + protected String getSeparator(boolean useForwardSlash) { + return useForwardSlash ? "/" :getUserDir().getFileSystem().getSeparator(); } protected String getDisplay(Terminal terminal, Path p) { diff --git a/reader/src/main/java/org/jline/reader/LineReader.java b/reader/src/main/java/org/jline/reader/LineReader.java index 6e1cc18eb..1654ec263 100644 --- a/reader/src/main/java/org/jline/reader/LineReader.java +++ b/reader/src/main/java/org/jline/reader/LineReader.java @@ -406,6 +406,7 @@ enum Option { DELAY_LINE_WRAP, AUTO_PARAM_SLASH(true), AUTO_REMOVE_SLASH(true), + USE_FORWARD_SLASH(false), /** When hitting the <tab> key at the beginning of the line, insert a tabulation * instead of completing. This is mainly useful when {@link #BRACKETED_PASTE} is * disabled, so that copy/paste of indented text does not trigger completion.