Skip to content

readline,repl: add substring history search #31112

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 14 commits into from
Closed

readline,repl: add substring history search #31112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
05c19bd
repl: improve preview length calculation
BridgeAR Dec 26, 2019
470e87f
readline,repl: add substring based history search
BridgeAR Dec 27, 2019
6efc2b9
readline,repl: skip history entries identical to the current line
BridgeAR Dec 27, 2019
5a213fe
readline,repl: improve history up/previous
BridgeAR Dec 29, 2019
3b8315c
readline: simplify getStringWidth()
BridgeAR Dec 31, 2019
d6b1bac
readline: move charLengthLeft() and charLengthAt()
BridgeAR Dec 31, 2019
9f7730e
src: improve GetColumnWidth performance
BridgeAR Dec 31, 2019
e9bc956
src: change GetStringWidth's expand_emoji_sequence option default
BridgeAR Dec 31, 2019
6dd223b
readline,repl: support tabs properly
BridgeAR Dec 31, 2019
26d4643
repl: activate previews for lines exceeding the terminal columns
BridgeAR Jan 4, 2020
387a327
test: add repl tests to verify unicode support in previews
BridgeAR Jan 4, 2020
9f5aa54
util: add todo comments for inspect to add unicode support
BridgeAR Jan 4, 2020
f278c06
squash: readline: simplify getStringWidth()
BridgeAR Jan 9, 2020
b1879aa
fixup
BridgeAR Jan 9, 2020
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
readline: move charLengthLeft() and charLengthAt() 
This moves the charLengthLeft() and charLengthAt() into the internal
readline file. This allows sharing the functions internally with
other code.
  • Loading branch information
@BridgeAR
BridgeAR committed Jan 8, 2020
commit d6b1bacf5dfc76c7e44a832f2e680cb7524b7bfd
25 changes: 25 additions & 0 deletions lib/internal/readline/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,29 @@ CSI.kClearToLineEnd = CSI`0K`;
CSI.kClearLine = CSI`2K`;
CSI.kClearScreenDown = CSI`0J`;

// TODO(BridgeAR): Treat combined characters as single character, i.e,
// 'a\u0301' and '\u0301a' (both have the same visual output).
// Check Canonical_Combining_Class in
// http://userguide.icu-project.org/strings/properties
function charLengthLeft(str, i) {
if (i <= 0)
return 0;
if ((i > 1 && str.codePointAt(i - 2) >= kUTF16SurrogateThreshold) ||
str.codePointAt(i - 1) >= kUTF16SurrogateThreshold) {
return 2;
}
return 1;
}

function charLengthAt(str, i) {
if (str.length <= i) {
// Pretend to move to the right. This is necessary to autocomplete while
// moving to the right.
return 1;
}
return str.codePointAt(i) >= kUTF16SurrogateThreshold ? 2 : 1;
}

if (internalBinding('config').hasIntl) {
const icu = internalBinding('icu');
// icu.getStringWidth(string, ambiguousAsFullWidth, expandEmojiSequence)
Expand Down Expand Up @@ -438,6 +461,8 @@ function commonPrefix(strings) {
}

module.exports = {
charLengthAt,
charLengthLeft,
commonPrefix,
emitKeys,
getStringWidth,
Expand Down
21 changes: 2 additions & 19 deletions lib/readline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ const { validateString } = require('internal/validators');
const { inspect } = require('internal/util/inspect');
const EventEmitter = require('events');
const {
charLengthAt,
charLengthLeft,
commonPrefix,
CSI,
emitKeys,
Expand Down Expand Up @@ -591,25 +593,6 @@ Interface.prototype._wordRight = function() {
}
};

function charLengthLeft(str, i) {
if (i <= 0)
return 0;
if ((i > 1 && str.codePointAt(i - 2) >= kUTF16SurrogateThreshold) ||
str.codePointAt(i - 1) >= kUTF16SurrogateThreshold) {
return 2;
}
return 1;
}

function charLengthAt(str, i) {
if (str.length <= i) {
// Pretend to move to the right. This is necessary to autocomplete while
// moving to the right.
return 1;
}
return str.codePointAt(i) >= kUTF16SurrogateThreshold ? 2 : 1;
}

Interface.prototype._deleteLeft = function() {
if (this.cursor > 0 && this.line.length > 0) {
// The number of UTF-16 units comprising the character to the left
Expand Down