Skip to content

repl: add reverse search #31006

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

Closed
BridgeAR wants to merge 8 commits into from
Closed

repl: add reverse search #31006

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e997e86
repl: fix preview of lines that exceed the terminal columns
BridgeAR Dec 17, 2019
be0fe19
repl: implement reverse search
BridgeAR Dec 16, 2019
4a41ffc
readline: small refactoring
BridgeAR Dec 17, 2019
7f38f0a
readline: set null as callback return in case there's no error
BridgeAR Dec 18, 2019
415d5a1
fixup: repl - fix very long search line
BridgeAR Dec 19, 2019
19ded67
fixup: add big todo comment
BridgeAR Dec 19, 2019
29fcab9
fixup: address comments
BridgeAR Dec 20, 2019
f3387ad
fixup: document the reverse-i-search
BridgeAR Dec 21, 2019
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
Prev Previous commit
Next Next commit
fixup: address comments
  • Loading branch information
@BridgeAR
BridgeAR committed Dec 20, 2019
commit 29fcab97828bd9b97701006c41ea8b5014fadcb7
21 changes: 9 additions & 12 deletions lib/internal/repl/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,7 @@ function setupReverseSearch(repl) {
let lastCursor = -1;
let promptPos;

function next() {
return historyIndex >= 0 && historyIndex < repl.history.length;
}

function isDirectionKey(keyName) {
function checkAndSetDirectionKey(keyName) {
if (!labels[keyName]) {
return false;
}
Expand Down Expand Up @@ -460,7 +456,7 @@ function setupReverseSearch(repl) {
historyIndex = repl.history.length - 1;
}
// Check the history entries until a match is found.
while (next()) {
while (historyIndex >= 0 && historyIndex < repl.history.length) {
let entry = repl.history[historyIndex];
// Visualize all potential matches only once.
if (alreadyMatched.has(entry)) {
Expand Down Expand Up @@ -504,9 +500,9 @@ function setupReverseSearch(repl) {
}

function print(outputLine, inputLine, cursor = repl.cursor) {
// TODO(BridgeAR): Resizing the terminal window breaks this. To fix that,
// readline must be aware of this information. It's probably best to add a
// couple of properties to readline that allow to do the following:
// TODO(BridgeAR): Resizing the terminal window hides the overlay. To fix
// that, readline must be aware of this information. It's probably best to
// add a couple of properties to readline that allow to do the following:
// 1. Add arbitrary data to the end of the current line while not counting
// towards the line. This would be useful for the completion previews.
// 2. Add arbitrary extra lines that do not count towards the regular line.
Expand All @@ -515,7 +511,8 @@ function setupReverseSearch(repl) {
// 3. Add arbitrary input that is "on top" of the current line. That is
// useful for the reverse search.
// 4. To trigger the line refresh, functions should be used to pass through
// the information.
// the information. Alternatively, getters and setters could be used.
// That might even be more elegant.
// The data would then be accounted for when calling `_refreshLine()`.
// This function would then look similar to:
// repl.overlay(outputLine);
Expand Down Expand Up @@ -599,13 +596,13 @@ function setupReverseSearch(repl) {

function reverseSearch(string, key) {
if (!isInReverseSearch) {
if (key.ctrl && isDirectionKey(key.name)) {
if (key.ctrl && checkAndSetDirectionKey(key.name)) {
historyIndex = repl.historyIndex;
promptPos = repl._getDisplayPos(`${repl._prompt}`);
print(repl.line, `${labels[dir]}_`);
isInReverseSearch = true;
}
} else if (key.ctrl && isDirectionKey(key.name)) {
} else if (key.ctrl && checkAndSetDirectionKey(key.name)) {
search();
} else if (key.name === 'backspace' ||
(key.ctrl && (key.name === 'h' || key.name === 'w'))) {
Expand Down