repl: add new line on ctrl+d

BridgeAR · addaleax · commit 2fa8170e51af · 2019-03-01T10:27:23.000+01:00
Currently the repl ends on the same line which procudes a weird output. To prevent that, just add a new line in case of ctrl+d. PR-URL: #26240 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com> Reviewed-By: Roman Reiss <me@silverwind.io> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
diff --git a/lib/repl.js b/lib/repl.js
@@ -701,6 +701,11 @@ function REPLServer(prompt,
       return;
     }
     if (!self.editorMode || !self.terminal) {
+      // Before exiting, make sure to clear the line.
+      if (key.ctrl && key.name === 'd' &&
+          self.cursor === 0 && self.line.length === 0) {
+        self.clearLine();
+      }
       ttyWrite(d, key);
       return;
     }
diff --git a/test/parallel/test-repl-save-load.js b/test/parallel/test-repl-save-load.js
@@ -70,7 +70,7 @@ assert.strictEqual(fs.readFileSync(saveFileName, 'utf8'),
   putIn.run([`.save ${saveFileName}`]);
   replServer.close();
   assert.strictEqual(fs.readFileSync(saveFileName, 'utf8'),
-                     `${cmds.join('\n')}\n`);
+                     `${cmds.join('\n')}\n\n`);
 }
 
 // make sure that the REPL data is "correct"

Original file line number	Diff line number	Diff line change
`@@ -701,6 +701,11 @@ function REPLServer(prompt,`
`701`	`701`	`return;`
`702`	`702`	`}`
`703`	`703`	`if (!self.editorMode \|\| !self.terminal) {`
	`704`	`+ // Before exiting, make sure to clear the line.`
	`705`	`+ if (key.ctrl && key.name === 'd' &&`
	`706`	`+ self.cursor === 0 && self.line.length === 0) {`
	`707`	`+ self.clearLine();`
	`708`	`+ }`
`704`	`709`	`ttyWrite(d, key);`
`705`	`710`	`return;`
`706`	`711`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ assert.strictEqual(fs.readFileSync(saveFileName, 'utf8'),`
`70`	`70`	putIn.run([`.save ${saveFileName}`]);
`71`	`71`	`replServer.close();`
`72`	`72`	`assert.strictEqual(fs.readFileSync(saveFileName, 'utf8'),`
`73`		- `${cmds.join('\n')}\n`);
	`73`	+ `${cmds.join('\n')}\n\n`);
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`// make sure that the REPL data is "correct"`