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

repl: handle buffered string logic on finish

Browse Source 
Looks like `clearBufferedCommand` will be called on almost all flows.
Hence history was broken.

PR-URL: https://github.com/nodejs/node/pull/24389
Fixes: https://github.com/nodejs/node/issues/24385
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
This commit is contained in:
Anto Aravinth 2018-11-18 09:07:48 +05:30 committed by Jeremiah Senkpiel
parent 7778c035a0
commit eb42c1eb4f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/readline.js
View File

@ -348,9 +348,9 @@ Interface.prototype.undoHistory = function() {
// If it's a multiline code, then add history // If it's a multiline code, then add history
// accordingly. // accordingly.
Interface.prototype.multilineHistory = function() { Interface.prototype.multilineHistory = function(clearBuffer) {
// check if we got a multiline code // if not clear buffer, add multiline history
if (this.multiline !== '' && this.terminal) { if (!clearBuffer && this.terminal) {
const dupIndex = this.history.indexOf(this.multiline); const dupIndex = this.history.indexOf(this.multiline);
if (dupIndex !== -1) this.history.splice(dupIndex, 1); if (dupIndex !== -1) this.history.splice(dupIndex, 1);
// Remove the last entered line as multiline // Remove the last entered line as multiline

8
lib/repl.js
View File

@ -667,6 +667,13 @@ function REPLServer(prompt,
} }
} }
// handle multiline history
if (self[kBufferedCommandSymbol].length)
REPLServer.super_.prototype.multilineHistory.call(self, false);
else {
REPLServer.super_.prototype.multilineHistory.call(self, true);
}
// Clear buffer if no SyntaxErrors // Clear buffer if no SyntaxErrors
self.clearBufferedCommand(); self.clearBufferedCommand();
sawCtrlD = false; sawCtrlD = false;
@ -773,7 +780,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() {