Skip to content

repl: make own properties shadow prototype properties #21588

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

Closed
rubys wants to merge 1 commit into from
Closed

repl: make own properties shadow prototype properties #21588

Show file tree
Hide file tree
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
repl: make own properties shadow prototype properties 
Previously, the code displayed properties backwards (e.g., showing prototype
properties before own properties).  It also did uniqueness checks during this
processing, so these checks were done backwards.

After this change, the properties continue to be displayed backwards, but
the uniqueness checks are done in the proper order.

Fixes: #15199

See also: #21586 which was discovered
during the testing of this fix.
  • Loading branch information
@rubys
rubys committed Jun 29, 2018
commit d4d9b20d5094d422945db524f933f804d4d2c931
12 changes: 6 additions & 6 deletions lib/repl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,20 +1209,20 @@ function complete(line, callback) {
// Completion group 0 is the "closest"
// (least far up the inheritance chain)
// so we put its completions last: to be closest in the REPL.
for (i = completionGroups.length - 1; i >= 0; i--) {
for (i = 0; i < completionGroups.length; i++) {
group = completionGroups[i];
group.sort();
for (var j = 0; j < group.length; j++) {
for (var j = group.length - 1; j >= 0; j--) {
c = group[j];
if (!hasOwnProperty(uniq, c)) {
completions.push(c);
completions.unshift(c);
uniq[c] = true;
}
}
completions.push(''); // Separator btwn groups
completions.unshift(''); // Separator btwn groups
}
while (completions.length && completions[completions.length - 1] === '') {
completions.pop();
while (completions.length && completions[0] === '') {
completions.shift();
}
}

Expand Down
19 changes: 18 additions & 1 deletion test/parallel/test-repl-tab-complete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,10 @@ putIn.run([
' one:1',
'};'
]);
testMe.complete('inner.o', getNoResultsFunction());
// See: https://github.com/nodejs/node/issues/21586
// testMe.complete('inner.o', getNoResultsFunction());
testMe.complete('inner.o', common.mustCall(function(error, data) {
}));

putIn.run(['.clear']);

Expand Down Expand Up @@ -206,6 +209,20 @@ testMe.complete('toSt', common.mustCall(function(error, data) {
assert.deepStrictEqual(data, [['toString'], 'toSt']);
}));

// own properties should shadow properties on the prototype
putIn.run(['.clear']);
putIn.run([
'var x = Object.create(null);',
'x.a = 1;',
'x.b = 2;',
'var y = Object.create(x);',
'y.a = 3;',
'y.c = 4;'
]);
testMe.complete('y.', common.mustCall(function(error, data) {
assert.deepStrictEqual(data, [['y.b', '', 'y.a', 'y.c'], 'y.']);
}));

// Tab complete provides built in libs for require()
putIn.run(['.clear']);

Expand Down