diff options
| author | Ruben Bridgewater <ruben@bridgewater.de> | 2018-12-03 13:08:14 +0100 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2018-12-05 23:36:06 -0800 |
| commit | fd2467aeaab584f93d2fd78b7d54cc737904e84b (patch) | |
| tree | d374f9cf3449ba63ef8c268fb6ef72a877c6fad9 /lib | |
| parent | aa943d098e0299ea87485a607353d152f5ea5012 (diff) | |
| download | android-node-v8-fd2467aeaab584f93d2fd78b7d54cc737904e84b.tar.gz android-node-v8-fd2467aeaab584f93d2fd78b7d54cc737904e84b.tar.bz2 android-node-v8-fd2467aeaab584f93d2fd78b7d54cc737904e84b.zip | |
Revert "repl: handle buffered string logic on finish"
This reverts commit eb42c1eb4f2502433a22c49ede9e657fb6cd86e0.
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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/readline.js | 6 | ||||
| -rw-r--r-- | lib/repl.js | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/lib/readline.js b/lib/readline.js index e55507416b..8d03cd6e33 100644 --- a/lib/readline.js +++ b/lib/readline.js @@ -357,9 +357,9 @@ Interface.prototype.undoHistory = function() { // If it's a multiline code, then add history // accordingly. -Interface.prototype.multilineHistory = function(clearBuffer) { - // if not clear buffer, add multiline history - if (!clearBuffer && this.terminal) { +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 diff --git a/lib/repl.js b/lib/repl.js index 1ab4031f09..bb5ea3d950 100644 --- a/lib/repl.js +++ b/lib/repl.js @@ -666,13 +666,6 @@ function REPLServer(prompt, } } - // handle multiline history - if (self[kBufferedCommandSymbol].length) - Interface.prototype.multilineHistory.call(self, false); - else { - Interface.prototype.multilineHistory.call(self, true); - } - // Clear buffer if no SyntaxErrors self.clearBufferedCommand(); sawCtrlD = false; @@ -781,6 +774,7 @@ exports.start = function(prompt, REPLServer.prototype.clearBufferedCommand = function clearBufferedCommand() { this[kBufferedCommandSymbol] = ''; + REPLServer.super_.prototype.multilineHistory.call(this); }; REPLServer.prototype.close = function close() { |