Skip to content

InputValue prompt with mask doesn't work correctly, fixes #1103 #1114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 10, 2024
Merged

InputValue prompt with mask doesn't work correctly, fixes #1103 #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c48e114
InputValue prompt with mask doesn't return the enter value, only the …
mattirn Nov 26, 2024
799d9cb
Merge remote-tracking branch 'origin/master' into jline-1103
gnodet Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions console-ui/src/main/java/org/jline/consoleui/prompt/AbstractPrompt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@ public InputResult execute() {
List<Candidate> matches = new ArrayList<>();
KeyMap<Operation> keyMap = new KeyMap<>();
bindKeys(keyMap);
StringBuilder displayBuffer = new StringBuilder();
StringBuilder buffer = new StringBuilder();
CompletionMatcher completionMatcher = new CompletionMatcherImpl();
boolean tabCompletion = completer != null && reader != null;
Expand All @@ -596,7 +597,7 @@ public InputResult execute() {
refreshDisplay(
firstItemRow - 1,
column,
buffer.toString(),
displayBuffer.toString(),
row,
startColumn,
displayCandidates ? matches : new ArrayList<>());
Expand All @@ -608,48 +609,67 @@ public InputResult execute() {
}
break;
case RIGHT:
if (column < startColumn + buffer.length()) {
if (column < startColumn + displayBuffer.length()) {
column++;
}
break;
case INSERT:
buffer.insert(column - startColumn, mask == null ? bindingReader.getLastBinding() : mask);
displayBuffer.insert(
column - startColumn, mask == null ? bindingReader.getLastBinding() : mask);
buffer.insert(column - startColumn, bindingReader.getLastBinding());
column++;
break;
case BACKSPACE:
if (column > startColumn) {
displayBuffer.deleteCharAt(column - startColumn - 1);
buffer.deleteCharAt(column - startColumn - 1);
column--;
}
break;
case DELETE:
if (column < startColumn + buffer.length() && column >= startColumn) {
if (column < startColumn + displayBuffer.length() && column >= startColumn) {
displayBuffer.deleteCharAt(column - startColumn);
buffer.deleteCharAt(column - startColumn);
}
break;
case BEGINNING_OF_LINE:
column = startColumn;
break;
case END_OF_LINE:
column = startColumn + buffer.length();
column = startColumn + displayBuffer.length();
break;
case SELECT_CANDIDATE:
if (tabCompletion && matches.size() < ReaderUtils.getInt(reader, LineReader.LIST_MAX, 50)) {
String selected =
selectCandidate(firstItemRow - 1, buffer.toString(), row + 1, startColumn, matches);
resetHeader();
if (selected != null) {
buffer.delete(0, buffer.length());
displayBuffer.delete(0, displayBuffer.length());
if (mask == null) {
displayBuffer.append(selected);
} else {
for (int i = 0; i < selected.length(); i++) {
displayBuffer.append(mask);
}
}
buffer.delete(0, displayBuffer.length());
buffer.append(selected);
column = startColumn + buffer.length();
column = startColumn + displayBuffer.length();
}
}
break;
case EXIT:
if (buffer.toString().isEmpty()) {
if (displayBuffer.toString().isEmpty()) {
if (mask == null) {
displayBuffer.append(defaultValue);
} else {
for (int i = 0; i < defaultValue.length(); i++) {
displayBuffer.append(mask);
}
}
buffer.append(defaultValue);
}
return new InputResult(buffer.toString());
return new InputResult(buffer.toString(), displayBuffer.toString());
case CANCEL:
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion console-ui/src/main/java/org/jline/consoleui/prompt/ConsolePrompt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public Map<String, PromptResultItemIF> prompt(
}
}
}
String resp = result.getResult();
String resp = result.getDisplayResult();
if (result instanceof ConfirmResult) {
ConfirmResult cr = (ConfirmResult) result;
if (cr.getConfirmed() == ConfirmChoice.ConfirmationValue.YES) {
Expand Down
8 changes: 5 additions & 3 deletions console-ui/src/main/java/org/jline/consoleui/prompt/InputResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@

public class InputResult implements PromptResultItemIF {
private final String input;
private final String displayInput;

public InputResult(String input) {
public InputResult(String input, String displayInput) {
this.input = input;
this.displayInput = displayInput;
}

public String getInput() {
return input;
public String getDisplayResult() {
return displayInput;
}

public String getResult() {
Expand Down
4 changes: 4 additions & 0 deletions console-ui/src/main/java/org/jline/consoleui/prompt/PromptResultItemIF.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@

public interface PromptResultItemIF {
String getResult();

default String getDisplayResult() {
return getResult();
}
}
Loading