Skip to content

Commit

Permalink
Revert "lib: repl multiline history support"
Browse files Browse the repository at this point in the history
This reverts commit dd7a3d2.

PR-URL: #24804
Refs: #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>
  • Loading branch information
BridgeAR committed Dec 7, 2018
1 parent adae559 commit f1bcf90
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 34 deletions.
25 changes: 0 additions & 25 deletions lib/readline.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ function Interface(input, output, completer, terminal) {

// Current line
this.line = '';
this.multiline = '';

this._setRawMode(true);
this.terminal = true;
Expand Down Expand Up @@ -336,7 +335,6 @@ Interface.prototype._addHistory = function() {
if (dupIndex !== -1) this.history.splice(dupIndex, 1);
}

this.multiline += this.line;
this.history.unshift(this.line);

// Only store so many
Expand All @@ -347,29 +345,6 @@ Interface.prototype._addHistory = function() {
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() {
// line length
Expand Down
2 changes: 0 additions & 2 deletions lib/repl.js
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,6 @@ exports.start = function(prompt,

REPLServer.prototype.clearBufferedCommand = function clearBufferedCommand() {
this[kBufferedCommandSymbol] = '';
REPLServer.super_.prototype.multilineHistory.call(this);
};

REPLServer.prototype.close = function close() {
Expand Down Expand Up @@ -888,7 +887,6 @@ REPLServer.prototype.displayPrompt = function(preserveCursor) {
const len = this.lines.level.length ? this.lines.level.length - 1 : 0;
const levelInd = '..'.repeat(len);
prompt += levelInd + ' ';
REPLServer.super_.prototype.undoHistory.call(this);
}

// Do not overwrite `_initialPrompt` here
Expand Down
7 changes: 0 additions & 7 deletions test/parallel/test-repl-persistent-history.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,6 @@ const tests = [
test: [UP],
expected: [prompt, replFailedRead, prompt, replDisabled, prompt]
},
{ // Tests multiline history
env: {},
test: ['{', '}', UP, CLEAR],
expected: [prompt, '{', '... ', '}', '{}\n',
prompt, `${prompt}{}`, prompt],
clean: false
},
{
before: function before() {
if (common.isWindows) {
Expand Down

0 comments on commit f1bcf90

Please sign in to comment.