Skip to content

#48: improve history behavior #49

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
javier-godoy merged 1 commit into from
Sep 6, 2022
Merged

#48: improve history behavior #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/main/java/com/flowingcode/vaadin/addons/xterm/TerminalHistory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ public void setEnabled(boolean enabled) {
registrations = null;
} else if (enabled && registrations == null) {
registrations = new ArrayList<>();
registrations.add(((ITerminalConsole) terminal).addLineListener(ev -> add(ev.getLine())));
registrations.add(((ITerminalConsole) terminal).addLineListener(ev -> {
add(ev.getLine());
resetIterator();
}));
registrations.add(terminal.addCustomKeyListener(ev -> handleArrowUp(), Key.ARROW_UP));
registrations.add(terminal.addCustomKeyListener(ev -> handleArrowDown(), Key.ARROW_DOWN));
}
Expand Down Expand Up @@ -168,13 +171,19 @@ public void add(String line) {
line = line.trim();
if (!line.isEmpty()) {
history.add(Objects.requireNonNull(line));
iterator = null;
resetIterator();
if (maxSize != null && history.size() > maxSize) {
history.removeLast();
}
}
}

private void resetIterator()
{
lastRet = null;
iterator = null;
}

private Optional<String> find(Iterator<String> iterator, Predicate<String> predicate) {
while (iterator.hasNext()) {
String line = iterator.next();
Expand Down
40 changes: 40 additions & 0 deletions src/test/java/com/flowingcode/vaadin/addons/xterm/integration/TerminalHistoryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,44 @@ public void testArrowKeysAndRestore() {
assertThat(term.currentLine(), is("bar"));
}

@Test
public void testArrowUpAfterRunningLastCommandFromHistory() {
XTermElement term = $(XTermElement.class).first();

term.sendKeys("foo1\n");
term.sendKeys("foo2\n");

assertThat(term.currentLine(), isEmptyString());

term.sendKeys(Keys.ARROW_UP);
assertThat(term.currentLine(), is("foo2"));
term.sendKeys("\n");

term.sendKeys(Keys.ARROW_UP);
assertThat(term.currentLine(), is("foo2"));

term.sendKeys(Keys.ARROW_UP);
assertThat(term.currentLine(), is("foo1"));
}

@Test
public void testArrowUpAfterRunningEmptyCommand() {
XTermElement term = $(XTermElement.class).first();

term.sendKeys("foo1\n");
term.sendKeys("foo2\n");

assertThat(term.currentLine(), isEmptyString());

term.sendKeys(Keys.ARROW_UP);
assertThat(term.currentLine(), is("foo2"));
term.sendKeys("\u0008\u0008\u0008\u0008"); // 4 backspaces
assertThat(term.currentLine(), isEmptyString());
term.sendKeys("\n");

term.sendKeys(Keys.ARROW_UP);
// The position in the history should be back at the end
assertThat(term.currentLine(), is("foo2"));
}

}