repl: do not use the custom parser but split lines with \r

Author: puskin

benchmark/repl/parse-history-from-file.js

@@ -25,6 +25,7 @@ const {
   StringPrototypeCodePointAt,
   StringPrototypeEndsWith,
   StringPrototypeRepeat,
+  StringPrototypeReplaceAll,
   StringPrototypeSlice,
   StringPrototypeStartsWith,
   StringPrototypeTrim,
@@ -950,7 +951,7 @@ class Interface extends InterfaceConstructor {
       if (index === -1) {
         this.line = search;
       } else {
-        this.line = this.history[index];
+        this.line = StringPrototypeReplaceAll(this.history[index], '\r', '\n');
       }
       this.historyIndex = index;
       this.cursor = this.line.length; // Set cursor to end of line.
@@ -973,7 +974,7 @@ class Interface extends InterfaceConstructor {
       if (index === this.history.length) {
         this.line = search;
       } else {
-        this.line = this.history[index];
+        this.line = StringPrototypeReplaceAll(this.history[index], '\r', '\n');
       }
       this.historyIndex = index;
       this.cursor = this.line.length; // Set cursor to end of line.

lib/internal/readline/interface.js

@@ -2,10 +2,9 @@
 
 const {
   ArrayPrototypeJoin,
-  ArrayPrototypePush,
   Boolean,
   FunctionPrototype,
-  StringPrototypeSplit,
+  RegExpPrototypeSymbolSplit,
   StringPrototypeTrim,
 } = primordials;
 
@@ -18,7 +17,6 @@ let debug = require('internal/util/debuglog').debuglog('repl', (fn) => {
 });
 const permission = require('internal/process/permission');
 const { clearTimeout, setTimeout } = require('timers');
-const { parseHistoryFromFile } = require('internal/repl/history-utils');
 
 const noop = FunctionPrototype;
 
@@ -99,7 +97,7 @@ function setupHistory(repl, historyPath, ready) {
     }
 
     if (data) {
-      repl.history = parseHistoryFromFile(data, repl.historySize);
+      repl.history = RegExpPrototypeSymbolSplit(/[\n]+/, data, repl.historySize);
     } else {
       repl.history = [];
     }
@@ -136,30 +134,14 @@ function setupHistory(repl, historyPath, ready) {
     timer = setTimeout(flushHistory, kDebounceHistoryMS);
   }
 
-  function parseHistoryData() {
-    const eol = os.EOL;
-    const result = [];
-    const historyLength = repl.history.length;
-
-    for (let i = 0; i < historyLength; i++) {
-      const entry = repl.history[i];
-      const lines = StringPrototypeSplit(entry, eol);
-      for (let j = lines.length - 1; j >= 0; j--) {
-        ArrayPrototypePush(result, lines[j]);
-      }
-    }
-
-    return ArrayPrototypeJoin(result, eol) + eol;
-  }
-
   function flushHistory() {
     timer = null;
     if (writing) {
       pending = true;
       return;
     }
     writing = true;
-    const historyData = parseHistoryData();
+    const historyData = ArrayPrototypeJoin(repl.history, os.EOL);
     fs.write(repl._historyHandle, historyData, 0, 'utf8', onwritten);
   }
 

lib/internal/repl/history-utils.js

@@ -84,6 +84,7 @@ const {
   StringPrototypeEndsWith,
   StringPrototypeIncludes,
   StringPrototypeRepeat,
+  StringPrototypeReplaceAll,
   StringPrototypeSlice,
   StringPrototypeSplit,
   StringPrototypeStartsWith,
@@ -953,14 +954,21 @@ function REPLServer(prompt,
         self._domain.emit('error', e.err || e);
       }
 
-      if (self[kBufferedCommandSymbol]) {
+      if (cmd && cmd.indexOf(os.EOL) !== -1) { // If you are editing a multiline command
+        self.history[0] = StringPrototypeReplaceAll(cmd, os.EOL, '\r');
+      } else if (self[kBufferedCommandSymbol]) { // If a new multiline command was entered
         // Remove the first N lines from the self.history array
         // where N is the number of lines in the buffered command
-        const lines = StringPrototypeSplit(self[kBufferedCommandSymbol], os.EOL);
+
+        // Do not use os.EOL instead of '\n' because on Windows it is '\r\n'
+        const lines = StringPrototypeSplit(self[kBufferedCommandSymbol], '\n');
         self.history = ArrayPrototypeSlice(self.history, lines.length);
-        // And replace them with the single command divided into lines
-        ArrayPrototypeUnshift(self.history, self[kBufferedCommandSymbol] + cmd);
+        ArrayPrototypePop(lines);
+        // And replace them with the single command split by '\r'
+        ArrayPrototypePush(lines, cmd);
+        ArrayPrototypeUnshift(self.history, ArrayPrototypeJoin(lines, '\r'));
       }
+
       // Clear buffer if no SyntaxErrors
       self.clearBufferedCommand();
       sawCtrlD = false;

lib/internal/repl/history.js

@@ -0,0 +1,4 @@
+var d = [^M  {^M    a: 1,^M    b: 2,^M  },^M  {^M    a: 3,^M    b: 4,^M    c: [{ a: 1, b: 2 },^M      {^M        a: 3,^M        b: 4,^M      }^M    ]^M  }^M]
+const c = [^M  {^M    a: 1,^M    b: 2,^M  }^M]
+`const b = [^M  1,^M  2,^M  3,^M  4,^M]`
+a = `^MI am a multiline string^MI can be as long as I want`

lib/repl.js

@@ -236,22 +236,17 @@ const tests = [
     // K = Erase in line; 0 = right; 1 = left; 2 = total
     expected: [
       // 0. Start
-      '\x1B[1G',
-      '\x1B[0J',
-      `${prompt}`,
-      '\x1B[3G',
-      '\x1B[1G',
-      '\x1B[0J',
-      `${prompt}aut`,
-      '\x1B[6G',
-      ' // ocompleteMe',
-      '\x1B[6G',
-      '\n// 123',
-      '\x1B[6G',
-      '\x1B[1A',
-      '\x1B[1B',
-      '\x1B[2K',
-      '\x1B[1A',
+      '\x1B[1G', '\x1B[0J',
+      prompt, '\x1B[3G',
+      // 1. UP
+      // This exceeds the maximum columns (250):
+      // Whitespace + prompt + ' // '.length + 'autocompleteMe'.length
+      // 230 + 2 + 4 + 14
+      '\x1B[1G', '\x1B[0J',
+      `${prompt}${' '.repeat(230)} aut`, '\x1B[237G',
+      ' // ocompleteMe', '\x1B[237G',
+      '\n// 123', '\x1B[237G',
+      '\x1B[1A', '\x1B[1B', '\x1B[2K', '\x1B[1A',
       '\x1B[0K',
       // 2. UP
       '\x1B[1G', '\x1B[0J',