repl: update to the history file, not using EOL

Author: puskin

lib/internal/readline/interface.js

@@ -535,7 +535,7 @@ class Interface extends InterfaceConstructor {
 
       // For continuation lines, add the "|" prefix
       for (let i = 1; i < lines.length; i++) {
-        this[kWriteToOutput]('\n| ' + lines[i]);
+        this[kWriteToOutput](`\n${kMultilinePrompt.description}` + lines[i]);
       }
     } else {
       // Write the prompt and the current buffer content.

lib/internal/repl/history.js

@@ -141,7 +141,7 @@ function setupHistory(repl, historyPath, ready) {
       return;
     }
     writing = true;
-    const historyData = ArrayPrototypeJoin(repl.history, os.EOL);
+    const historyData = ArrayPrototypeJoin(repl.history, '\n');
     fs.write(repl._historyHandle, historyData, 0, 'utf8', onwritten);
   }
 

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

@@ -9,7 +9,6 @@ const REPL = require('internal/repl');
 const assert = require('assert');
 const fs = require('fs');
 const os = require('os');
-const util = require('util');
 
 if (process.env.TERM === 'dumb') {
   common.skip('skipping - dumb terminal');
@@ -41,11 +40,11 @@ class ActionStream extends stream.Stream {
       if (typeof action === 'object') {
         this.emit('keypress', '', action);
       } else {
-        this.emit('data', `${action}\n`);
+        this.emit('data', action);
       }
       setImmediate(doAction);
     };
-    setImmediate(doAction);
+    doAction();
   }
   resume() {}
   pause() {}
@@ -97,8 +96,8 @@ const tests = [
     test: [UP, '21', ENTER, "'42'", ENTER],
     expected: [
       prompt,
-      '2', '1', '21\n', prompt, prompt,
-      "'", '4', '2', "'", "'42'\n", prompt, prompt,
+      '2', '1', '21\n', prompt,
+      "'", '4', '2', "'", "'42'\n", prompt,
     ],
     clean: false
   },
@@ -195,8 +194,6 @@ function runTest(assertCleaned) {
   const opts = tests.shift();
   if (!opts) return; // All done
 
-  console.log('NEW');
-
   if (assertCleaned) {
     try {
       assert.strictEqual(fs.readFileSync(defaultHistoryPath, 'utf8'), '');
@@ -221,7 +218,6 @@ function runTest(assertCleaned) {
     output: new stream.Writable({
       write(chunk, _, next) {
         const output = chunk.toString();
-        console.log('INPUT', util.inspect(output));
 
         // Ignore escapes and blank lines
         if (output.charCodeAt(0) === 27 || /^[\r\n]+$/.test(output))

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

@@ -7,7 +7,6 @@ const REPL = require('repl');
 const assert = require('assert');
 const fs = require('fs');
 const os = require('os');
-const util = require('util');
 
 if (process.env.TERM === 'dumb') {
   common.skip('skipping - dumb terminal');
@@ -39,11 +38,11 @@ class ActionStream extends stream.Stream {
       if (typeof action === 'object') {
         this.emit('keypress', '', action);
       } else {
-        this.emit('data', `${action}\n`);
+        this.emit('data', action);
       }
       setImmediate(doAction);
     };
-    setImmediate(doAction);
+    doAction();
   }
   resume() {}
   pause() {}
@@ -95,10 +94,8 @@ const tests = [
     test: [UP, '21', ENTER, "'42'", ENTER],
     expected: [
       prompt,
-      // TODO(BridgeAR): The line is refreshed too many times. The double prompt
-      // is redundant and can be optimized away.
-      '2', '1', '21\n', prompt, prompt,
-      "'", '4', '2', "'", "'42'\n", prompt, prompt,
+      '2', '1', '21\n', prompt,
+      "'", '4', '2', "'", "'42'\n", prompt,
     ],
     clean: false
   },
@@ -191,8 +188,6 @@ function runTest(assertCleaned) {
   const opts = tests.shift();
   if (!opts) return; // All done
 
-  console.log('NEW');
-
   if (assertCleaned) {
     try {
       assert.strictEqual(fs.readFileSync(defaultHistoryPath, 'utf8'), '');
@@ -218,7 +213,6 @@ function runTest(assertCleaned) {
     output: new stream.Writable({
       write(chunk, _, next) {
         const output = chunk.toString();
-        console.log('INPUT', util.inspect(output));
 
         // Ignore escapes and blank lines
         if (output.charCodeAt(0) === 27 || /^[\r\n]+$/.test(output))

test/parallel/test-repl-reverse-search.js

@@ -28,15 +28,17 @@ class ActionStream extends stream.Stream {
       const next = _iter.next();
       if (next.done) {
         // Close the repl. Note that it must have a clean prompt to do so.
-        this.emit('keypress', '', { ctrl: true, name: 'd' });
+        setImmediate(() => {
+          this.emit('keypress', '', { ctrl: true, name: 'd' });
+        });
         return;
       }
       const action = next.value;
 
       if (typeof action === 'object') {
         this.emit('keypress', '', action);
       } else {
-        this.emit('data', `${action}`);
+        this.emit('data', action);
       }
       setImmediate(doAction);
     };