repl: consider removeHistoryDuplicates when saving multiline history

Author: puskin

lib/internal/readline/interface.js

@@ -936,14 +936,17 @@ class Interface extends InterfaceConstructor {
   [kMoveDownOrHistoryNext]() {
     const { cols, rows } = this.getCursorPos();
     const splitLine = StringPrototypeSplit(this.line, '\n');
+    if (!this.historyIndex && rows === splitLine.length) {
+      return;
+    }
     // Go to the next history only if the cursor is in the first line of the multiline input.
     // Otherwise treat the "arrow down" as a movement to the next row.
     if (splitLine.length > 1 && rows < splitLine.length - 1) {
       const currentLine = splitLine[rows];
       const nextLine = splitLine[rows + 1];
       const amountToMove = (cols > nextLine.length) ?
-        +cols + nextLine.length - 1 :
-        +currentLine.length + 1;
+        currentLine.length - cols + nextLine.length + 1 :
+        currentLine.length + 1;
       // Go to the same position on the next line, or the end of the next line
       // If the current position does not exist in the next line.
       this[kMoveCursor](amountToMove);
@@ -963,9 +966,7 @@ class Interface extends InterfaceConstructor {
   [kHistoryNext]() {
     if (this.historyIndex >= 0) {
       this[kBeforeEdit](this.line, this.cursor);
-      const isLineMultiline = StringPrototypeIndexOf(this.line, '\n') !== -1;
-
-      const search = isLineMultiline ? '' : this[kSubstringSearch] || '';
+      const search = this[kSubstringSearch] || '';
       let index = this.historyIndex - 1;
       while (
         index >= 0 &&
@@ -987,6 +988,9 @@ class Interface extends InterfaceConstructor {
 
   [kMoveUpOrHistoryPrev]() {
     const { cols, rows } = this.getCursorPos();
+    if (this.historyIndex === this.history.length && rows) {
+      return;
+    }
     const splitLine = StringPrototypeSplit(this.line, '\n');
     // Go to the previous history only if the cursor is in the first line of the multiline input.
     // Otherwise treat the "arrow up" as a movement to the previous row.
@@ -1007,9 +1011,7 @@ class Interface extends InterfaceConstructor {
   [kHistoryPrev]() {
     if (this.historyIndex < this.history.length && this.history.length) {
       this[kBeforeEdit](this.line, this.cursor);
-      const isLineMultiline = StringPrototypeIndexOf(this.line, '\n') !== -1;
-
-      const search = isLineMultiline ? '' : this[kSubstringSearch] || '';
+      const search = this[kSubstringSearch] || '';
       let index = this.historyIndex + 1;
       while (
         index < this.history.length &&
@@ -1122,7 +1124,8 @@ class Interface extends InterfaceConstructor {
       !key.meta &&
       !key.shift
     ) {
-      if (this[kSubstringSearch] === null) {
+      const isLineMultiline = StringPrototypeIndexOf(this.line, '\n') !== -1;
+      if (this[kSubstringSearch] === null && !isLineMultiline) {
         this[kSubstringSearch] = StringPrototypeSlice(
           this.line,
           0,

lib/repl.js

@@ -966,7 +966,10 @@ function REPLServer(prompt,
         ArrayPrototypePop(lines);
         // And replace them with the single command split by '\r'
         ArrayPrototypePush(lines, cmd);
-        ArrayPrototypeUnshift(self.history, ArrayPrototypeJoin(lines, '\r'));
+        const newHistoryLine = ArrayPrototypeJoin(lines, '\r');
+        if (self.history[0] !== newHistoryLine) {
+          ArrayPrototypeUnshift(self.history, newHistoryLine);
+        }
       }
 
       if (e) {

test/parallel/test-repl-history-navigation.js

@@ -814,7 +814,6 @@ function runTest() {
           try {
             assert.strictEqual(output, expected[i]);
           } catch (e) {
-            console.log({ output, expected: expected[i] });
             console.error(`Failed test # ${numtests - tests.length}`);
             console.error('Last outputs: ' + inspect(lastChunks, {
               breakLength: 5, colors: true