This repository has been archived by the owner on Apr 22, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
repl: make ^D emit an 'end' event on the readline instance
Also emit 'exit' on the repl when 'end' is emitted on the readline. Fixes `node debug test/fixtures/breakpoints.js` when ^D is pressed.
- Loading branch information
1 parent
0022477
commit f41901c
Showing
5 changed files
with
96 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -168,6 +168,11 @@ function REPLServer(prompt, stream, eval, useGlobal, ignoreUndefined) { | |
|
||
rli.setPrompt(self.prompt); | ||
|
||
rli.on('end', function() { | ||
self.rli.output.write('\n'); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
bnoordhuis
Member
|
||
self.emit('exit'); | ||
}); | ||
|
||
var sawSIGINT = false; | ||
rli.on('SIGINT', function() { | ||
var empty = rli.line.length === 0; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
// Copyright Joyent, Inc. and other Node contributors. | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a | ||
// copy of this software and associated documentation files (the | ||
// "Software"), to deal in the Software without restriction, including | ||
// without limitation the rights to use, copy, modify, merge, publish, | ||
// distribute, sublicense, and/or sell copies of the Software, and to permit | ||
// persons to whom the Software is furnished to do so, subject to the | ||
// following conditions: | ||
// | ||
// The above copyright notice and this permission notice shall be included | ||
// in all copies or substantial portions of the Software. | ||
// | ||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN | ||
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE | ||
// USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
|
||
var common = require('../common'), | ||
assert = require('assert'), | ||
Stream = require('stream'), | ||
repl = require('repl'), | ||
gotTerminalExit = false, | ||
gotRegularExit = false; | ||
|
||
// create a dummy stream that does nothing | ||
var stream = new Stream(); | ||
stream.write = stream.pause = stream.resume = function(){}; | ||
stream.readable = stream.writable = true; | ||
|
||
function testTerminalMode() { | ||
var r1 = repl.start({ | ||
input: stream, | ||
output: stream, | ||
terminal: true | ||
}); | ||
|
||
process.nextTick(function() { | ||
// manually fire a ^D keypress | ||
stream.emit('data', '\u0004'); | ||
}); | ||
|
||
r1.on('exit', function() { | ||
// should be fired from the simulated ^D keypress | ||
gotTerminalExit = true; | ||
testRegularMode(); | ||
}); | ||
} | ||
|
||
function testRegularMode() { | ||
var r2 = repl.start({ | ||
input: stream, | ||
output: stream, | ||
terminal: false | ||
}); | ||
|
||
process.nextTick(function() { | ||
stream.emit('end'); | ||
}); | ||
|
||
r2.on('exit', function() { | ||
// should be fired from the simulated 'end' event | ||
gotRegularExit = true; | ||
}); | ||
} | ||
|
||
process.on('exit', function() { | ||
assert(gotTerminalExit); | ||
assert(gotRegularExit); | ||
}); | ||
|
||
|
||
// start | ||
testTerminalMode(); |
In the case of a REPL in 'readline' mode (non-
terminal
), theend
event here will end up trying to write to a closed socket here. We should just remove thiswrite()
call.Can someone review? https://github.com/TooTallNate/node/commit/f39ff6a096d3ae3134e12d273559284596bae6f8