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.

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

Fixed bug in _.sortedIndex that would put undefined at the start FIXES: https://github.com/jashkenas/underscore/issues/1834 #2041

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions test/arrays.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,37 @@
array[values[length]] = values[length];
}
equal(_.sortedIndex(array, 2147483648), 2147483648, 'should work with large indexes');

});

test('sortedIndex conforms to sortBy for undefined (#1834)', function() {
var sorted = _([{a: NaN}, {a: NaN}, {a: void 0}, {a: 0}, {a: 1}, {a: 2}, {a: 3}])
.sortBy('a');
_.each([0, 1, 2, 3, undefined], function(val) {
equal(_.sortedIndex(sorted, {a: val}, 'a'), _.findIndex(sorted, {a: val}), 'For val: ' + val);
});

sorted = _.sortBy([undefined, 1, undefined, 2]);
equal(_.sortedIndex(sorted, undefined, _.identity), 2);

var edgeCaseNumbers = [-Infinity, -Infinity, 0, Number.MAX_VALUE, Infinity, Infinity, undefined, undefined];

var indexForUndefined = _.sortedIndex(edgeCaseNumbers, undefined);
equal(indexForUndefined, 6, 'undefined should be inserted at index 6');

var indexForNegInfinity = _.sortedIndex(edgeCaseNumbers, -Infinity);
equal(indexForNegInfinity, 0, 'negative infinity should be inserted at index 0');

var indexForInfinity = _.sortedIndex(edgeCaseNumbers, Infinity);
equal(indexForInfinity, 4, 'infinity should be inserted at index 4');

var indexForZero = _.sortedIndex(edgeCaseNumbers, 0);
equal(indexForZero, 2, '0 should be inserted at index 2');

var numbers = [10, 20, 30, 40, 50];

var indexForUndefinedSimple = _.sortedIndex(numbers, undefined);
equal(indexForUndefinedSimple, 5, 'undefined should be inserted at index 5');
});

test('uniq', function() {
Expand Down
3 changes: 2 additions & 1 deletion underscore.js
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,8 @@
var low = 0, high = array.length;
while (low < high) {
var mid = Math.floor((low + high) / 2);
if (iteratee(array[mid]) < value) low = mid + 1; else high = mid;
var cur = iteratee(array[mid]);
if ( cur < value || (value === void 0 && cur <= Infinity || _.isNaN(cur))) low = mid + 1; else high = mid;
}
return low;
};
Expand Down