1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "lib: repl multiline history support"

Browse Source 
This reverts commit dd7a3d246ded89cd0c910231c9adec279e72f9a9.

PR-URL: https://github.com/nodejs/node/pull/24804
Refs: https://github.com/nodejs/node/issues/24231
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
This commit is contained in:
Ruben Bridgewater 2018-12-03 13:10:15 +01:00 committed by Rich Trott
parent fd2467aeaa
commit b1ada6c9de
3 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/readline.js
View File

@ -225,7 +225,6 @@ function Interface(input, output, completer, terminal) {
// Current line // Current line
this.line = ''; this.line = '';
this.multiline = '';
this._setRawMode(true); this._setRawMode(true);
this.terminal = true; this.terminal = true;
@ -337,7 +336,6 @@ Interface.prototype._addHistory = function() {
if (dupIndex !== -1) this.history.splice(dupIndex, 1); if (dupIndex !== -1) this.history.splice(dupIndex, 1);
} }
this.multiline += this.line;
this.history.unshift(this.line); this.history.unshift(this.line);
// Only store so many // Only store so many
@ -348,29 +346,6 @@ Interface.prototype._addHistory = function() {
return this.history[0]; return this.history[0];
}; };
// Called when a multiline is seen by the repl
Interface.prototype.undoHistory = function() {
if (this.terminal) {
this.history.shift();
}
};
// If it's a multiline code, then add history
// accordingly.
Interface.prototype.multilineHistory = function() {
// check if we got a multiline code
if (this.multiline !== '' && this.terminal) {
const dupIndex = this.history.indexOf(this.multiline);
if (dupIndex !== -1) this.history.splice(dupIndex, 1);
// Remove the last entered line as multiline
// already contains them.
this.history.shift();
this.history.unshift(this.multiline);
}
// clear the multiline buffer
this.multiline = '';
};
Interface.prototype._refreshLine = function() { Interface.prototype._refreshLine = function() {
// line length // line length

2
lib/repl.js
View File

@ -774,7 +774,6 @@ exports.start = function(prompt,
REPLServer.prototype.clearBufferedCommand = function clearBufferedCommand() { REPLServer.prototype.clearBufferedCommand = function clearBufferedCommand() {
this[kBufferedCommandSymbol] = ''; this[kBufferedCommandSymbol] = '';
REPLServer.super_.prototype.multilineHistory.call(this);
}; };
REPLServer.prototype.close = function close() { REPLServer.prototype.close = function close() {
@ -889,7 +888,6 @@ REPLServer.prototype.displayPrompt = function(preserveCursor) {
const len = this.lines.level.length ? this.lines.level.length - 1 : 0; const len = this.lines.level.length ? this.lines.level.length - 1 : 0;
const levelInd = '..'.repeat(len); const levelInd = '..'.repeat(len);
prompt += levelInd + ' '; prompt += levelInd + ' ';
Interface.prototype.undoHistory.call(this);
} }
// Do not overwrite `_initialPrompt` here // Do not overwrite `_initialPrompt` here

7
test/parallel/test-repl-persistent-history.js
View File

@ -111,13 +111,6 @@ const tests = [
test: [UP], test: [UP],
expected: [prompt, replFailedRead, prompt, replDisabled, prompt] expected: [prompt, replFailedRead, prompt, replDisabled, prompt]
}, },
{ // Tests multiline history
env: {},
test: ['{', '}', UP, CLEAR],
expected: [prompt, '{', '... ', '}', '{}\n',
prompt, `${prompt}{}`, prompt],
clean: false
},
{ {
before: function before() { before: function before() {
if (common.isWindows) { if (common.isWindows) {