Skip to content
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

Jump to bottom

repl: properly handle repl.repl #30981

Closed
wants to merge 2 commits into from
Closed

repl: properly handle repl.repl #30981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b3385f
repl: properly handle `repl.repl`
BridgeAR Dec 15, 2019
b87844c
fixup: fix broken test
BridgeAR Jan 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 10 additions & 12 deletions lib/repl.js
View file
Open in desktop
Expand Up @@ -234,10 +234,14 @@ function REPLServer(prompt,
throw new ERR_INVALID_REPL_EVAL_CONFIG();
}

// Add this listener only once and use a WeakSet that contains the REPLs
// domains. Otherwise we'd have to add a single listener to each REPL instance
// and that could trigger the `MaxListenersExceededWarning`.
if (!options[kStandaloneREPL] && !addedNewListener) {
if (options[kStandaloneREPL]) {
// It is possible to introspect the running REPL accessing this variable
// from inside the REPL. This is useful for anyone working on the REPL.
exports.repl = this;
} else if (!addedNewListener) {
// Add this listener only once and use a WeakSet that contains the REPLs
// domains. Otherwise we'd have to add a single listener to each REPL
// instance and that could trigger the `MaxListenersExceededWarning`.
process.prependListener('newListener', (event, listener) => {
if (event === 'uncaughtException' &&
process.domain &&
Expand Down Expand Up @@ -895,14 +899,8 @@ exports.start = function(prompt,
useGlobal,
ignoreUndefined,
replMode) {
const repl = new REPLServer(prompt,
source,
eval_,
useGlobal,
ignoreUndefined,
replMode);
if (!exports.repl) exports.repl = repl;
return repl;
return new REPLServer(
prompt, source, eval_, useGlobal, ignoreUndefined, replMode);
};

REPLServer.prototype.setupHistory = function setupHistory(historyFile, cb) {
Expand Down
25 changes: 25 additions & 0 deletions test/parallel/test-repl-options.js
View file
Open in desktop
Expand Up @@ -24,6 +24,9 @@ const common = require('../common');
const ArrayStream = require('../common/arraystream');
const assert = require('assert');
const repl = require('repl');
const cp = require('child_process');

assert.strictEqual(repl.repl, undefined);

common.expectWarning({
DeprecationWarning: {
Expand Down Expand Up @@ -120,3 +123,25 @@ assert.strictEqual(r4.ignoreUndefined, false);
assert.strictEqual(r4.replMode, repl.REPL_MODE_SLOPPY);
assert.strictEqual(r4.historySize, 30);
r4.close();

// Check the standalone REPL
{
const child = cp.spawn(process.execPath, ['--interactive']);
let output = '';

child.stdout.setEncoding('utf8');
child.stdout.on('data', (data) => {
output += data;
});

child.on('exit', common.mustCall(() => {
const results = output.replace(/^> /mg, '').split('\n').slice(2);
assert.deepStrictEqual(results, ['undefined', '']);
}));

child.stdin.write(
'assert.ok(util.inspect(repl.repl, {depth: -1}).includes("REPLServer"));\n'
);
child.stdin.write('.exit');
child.stdin.end();
}
4 changes: 2 additions & 2 deletions test/parallel/test-repl-reverse-search.js
View file
Open in desktop
Expand Up @@ -251,8 +251,8 @@ const tests = [
'\x1B[1G', '\x1B[0J',
`${prompt}ab = "aaaa"`, '\x1B[14G',
'\x1B[1G', '\x1B[0J',
`${prompt}repl.repl.historyIndex`, '\x1B[25G', '\n// -1',
'\x1B[19C\x1B[1A',
`${prompt}repl.repl.historyIndex`, '\x1B[25G', '\n// 8',
'\x1B[20C\x1B[1A',
'\x1B[1B', '\x1B[2K', '\x1B[1A',
'\nfwd-i-search: _', '\x1B[1A', '\x1B[25G',
'\x1B[3G', '\x1B[0J',
Expand Down