Skip to content

readline: support closing dumb terminals #29149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjihrig merged 2 commits into from
Aug 17, 2019
Merged

readline: support closing dumb terminals #29149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5edcee
readline: close dumb terminals on Control+C
cjihrig Aug 15, 2019
93b341e
readline: close dumb terminals on Control+D
cjihrig Aug 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
readline: close dumb terminals on Control+D 
This commit adds support for closing a readline interface
on Control+D when the terminal is dumb.

PR-URL: #29149
Fixes: #29111
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
@cjihrig
cjihrig committed Aug 17, 2019
commit 93b341ed01a735f671c84e72a30e5e55945ea27f
19 changes: 12 additions & 7 deletions lib/readline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,15 +816,20 @@ function _ttyWriteDumb(s, key) {
if (this._sawReturnAt && key.name !== 'enter')
this._sawReturnAt = 0;

if (key.ctrl && key.name === 'c') {
if (this.listenerCount('SIGINT') > 0) {
this.emit('SIGINT');
} else {
// This readline instance is finished
if (key.ctrl) {
if (key.name === 'c') {
if (this.listenerCount('SIGINT') > 0) {
this.emit('SIGINT');
} else {
// This readline instance is finished
this.close();
}

return;
} else if (key.name === 'd') {
this.close();
return;
}

return;
}

switch (key.name) {
Expand Down
18 changes: 17 additions & 1 deletion test/pseudo-tty/repl-dumb-tty.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use strict';
require('../common');
const common = require('../common');

process.env.TERM = 'dumb';

const repl = require('repl');
const ArrayStream = require('../common/arraystream');

repl.start('> ');
process.stdin.push('console.log("foo")\n');
Expand All @@ -13,3 +14,18 @@ process.stdin.push('console.dir({ a: 1 })\n');
process.stdin.push('{ a: 1 }\n');
process.stdin.push('\n');
process.stdin.push('.exit\n');

// Verify Control+D support.
{
const stream = new ArrayStream();
const replServer = repl.start({
prompt: '> ',
terminal: true,
input: stream,
output: stream,
useColors: false
});

replServer.on('close', common.mustCall());
replServer.write(null, { ctrl: true, name: 'd' });
}