Skip to content
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.

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

readline: refactor readline module #12755

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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 escape codes into internal/readline
Moves escape codes into internal/readline for easier management.
  • Loading branch information
jasnell committed May 1, 2017
commit 291a464528af0ab0c52aeff527c8a21965c6bfc4
27 changes: 23 additions & 4 deletions lib/internal/readline.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,27 @@
const ansi =
/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;

const kEscape = '\x1b';

var getStringWidth;
var isFullWidthCodePoint;

function CSI(strings, ...args) {
let ret = `${kEscape}[`;
for (var n = 0; n < strings.length; n++) {
ret += strings[n];
if (n < args.length)
ret += args[n];
}
return ret;
}

CSI.kEscape = kEscape;
CSI.kClearToBeginning = CSI`1K`;
CSI.kClearToEnd = CSI`0K`;
CSI.kClearLine = CSI`2K`;
CSI.kClearScreenDown = CSI`0J`;

if (process.binding('config').hasIntl) {
const icu = process.binding('icu');
getStringWidth = function getStringWidth(str, options) {
Expand Down Expand Up @@ -151,11 +169,11 @@ function* emitKeys(stream) {
shift: false
};

if (ch === '\x1b') {
if (ch === kEscape) {
escaped = true;
s += (ch = yield);

if (ch === '\x1b') {
if (ch === kEscape) {
s += (ch = yield);
}
}
Expand Down Expand Up @@ -370,7 +388,7 @@ function* emitKeys(stream) {
// backspace or ctrl+h
key.name = 'backspace';
key.meta = escaped;
} else if (ch === '\x1b') {
} else if (ch === kEscape) {
// escape key
key.name = 'escape';
key.meta = escaped;
Expand Down Expand Up @@ -409,5 +427,6 @@ module.exports = {
emitKeys,
getStringWidth,
isFullWidthCodePoint,
stripVTControlCharacters
stripVTControlCharacters,
CSI
};
31 changes: 20 additions & 11 deletions lib/readline.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,21 @@ const { debug, inherits } = require('util');
const Buffer = require('buffer').Buffer;
const EventEmitter = require('events');
const {
CSI,
emitKeys,
getStringWidth,
isFullWidthCodePoint,
stripVTControlCharacters
} = require('internal/readline');

const {
kEscape,
kClearToBeginning,
kClearToEnd,
kClearLine,
kClearScreenDown
} = CSI;

const kHistorySize = 30;
const kMincrlfDelay = 100;
const kMaxcrlfDelay = 2000;
Expand Down Expand Up @@ -995,7 +1004,7 @@ function emitKeypressEvents(stream, iface) {
try {
stream[ESCAPE_DECODER].next(r[i]);
// Escape letter at the tail position
if (r[i] === '\x1b' && i + 1 === r.length) {
if (r[i] === kEscape && i + 1 === r.length) {
timeoutId = setTimeout(escapeCodeTimeout, ESCAPE_CODE_TIMEOUT);
}
} catch (err) {
Expand Down Expand Up @@ -1047,9 +1056,9 @@ function cursorTo(stream, x, y) {
throw new Error('Can\'t set cursor row without also setting it\'s column');

if (typeof y !== 'number') {
stream.write('\x1b[' + (x + 1) + 'G');
stream.write(CSI`${x + 1}G`);
} else {
stream.write('\x1b[' + (y + 1) + ';' + (x + 1) + 'H');
stream.write(CSI`${y + 1};${x + 1}H`);
}
}

Expand All @@ -1062,15 +1071,15 @@ function moveCursor(stream, dx, dy) {
return;

if (dx < 0) {
stream.write('\x1b[' + (-dx) + 'D');
stream.write(CSI`${-dx}D`);
} else if (dx > 0) {
stream.write('\x1b[' + dx + 'C');
stream.write(CSI`${dx}C`);
}

if (dy < 0) {
stream.write('\x1b[' + (-dy) + 'A');
stream.write(CSI`${-dy}A`);
} else if (dy > 0) {
stream.write('\x1b[' + dy + 'B');
stream.write(CSI`${dy}B`);
}
}

Expand All @@ -1087,13 +1096,13 @@ function clearLine(stream, dir) {

if (dir < 0) {
// to the beginning
stream.write('\x1b[1K');
stream.write(kClearToBeginning);
} else if (dir > 0) {
// to the end
stream.write('\x1b[0K');
stream.write(kClearToEnd);
} else {
// entire line
stream.write('\x1b[2K');
stream.write(kClearLine);
}
}

Expand All @@ -1105,7 +1114,7 @@ function clearScreenDown(stream) {
if (stream === null || stream === undefined)
return;

stream.write('\x1b[0J');
stream.write(kClearScreenDown);
}

module.exports = {
Expand Down