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

readline: name some anonymous functions #14297

Closed
wants to merge 1 commit into from
Closed

readline: name some anonymous functions #14297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 24 additions & 18 deletions lib/readline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,11 @@ function Interface(input, output, completer, terminal) {

// Check arity, 2 - for async, 1 for sync
if (typeof completer === 'function') {
this.completer = completer.length === 2 ? completer : function(v, cb) {
cb(null, completer(v));
};
this.completer = completer.length === 2 ?
completer :
function completerWrapper(v, cb) {
cb(null, completer(v));
};
}

this.setPrompt(prompt);
Expand Down Expand Up @@ -175,15 +177,23 @@ function Interface(input, output, completer, terminal) {
}

if (!this.terminal) {
input.on('data', ondata);
input.on('end', onend);
self.once('close', function() {
function onSelfCloseWithoutTerminal() {
input.removeListener('data', ondata);
input.removeListener('end', onend);
});
this._decoder = new StringDecoder('utf8');
}

input.on('data', ondata);
input.on('end', onend);
self.once('close', onSelfCloseWithoutTerminal);
this._decoder = new StringDecoder('utf8');
} else {
function onSelfCloseWithTerminal() {
input.removeListener('keypress', onkeypress);
input.removeListener('end', ontermend);
if (output !== null && output !== undefined) {
output.removeListener('resize', onresize);
}
}

emitKeypressEvents(input, this);

Expand All @@ -206,13 +216,7 @@ function Interface(input, output, completer, terminal) {
if (output !== null && output !== undefined)
output.on('resize', onresize);

self.once('close', function() {
input.removeListener('keypress', onkeypress);
input.removeListener('end', ontermend);
if (output !== null && output !== undefined) {
output.removeListener('resize', onresize);
}
});
self.once('close', onSelfCloseWithTerminal);
}

input.resume();
Expand Down Expand Up @@ -460,7 +464,7 @@ Interface.prototype._tabComplete = function(lastKeypressWasTab) {
var self = this;

self.pause();
self.completer(self.line.slice(0, self.cursor), function(err, rv) {
self.completer(self.line.slice(0, self.cursor), function onComplete(err, rv) {
self.resume();

if (err) {
Expand All @@ -474,7 +478,7 @@ Interface.prototype._tabComplete = function(lastKeypressWasTab) {
// Apply/show completions.
if (lastKeypressWasTab) {
self._writeToOutput('\r\n');
var width = completions.reduce(function(a, b) {
var width = completions.reduce(function completionReducer(a, b) {
return a.length > b.length ? a : b;
}).length + 2; // 2 space padding
var maxColumns = Math.floor(self.columns / width);
Expand All @@ -495,7 +499,9 @@ Interface.prototype._tabComplete = function(lastKeypressWasTab) {
}

// If there is a common prefix to all matches, then apply that portion.
var f = completions.filter(function(e) { if (e) return e; });
var f = completions.filter(function completionFilter(e) {
if (e) return e;
});
var prefix = commonPrefix(f);
if (prefix.length > completeOn.length) {
self._insertString(prefix.slice(completeOn.length));
Expand Down