Skip to content

WIP solution to #3310, extra nudge #3318

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

Draft
arshaw wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP solution to #3310, extra nudge #3318

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
23 changes: 17 additions & 6 deletions polyfill/lib/ecmascript.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3209,16 +3209,16 @@ function ComputeNudgeWindow(
const weeksEnd = AddDaysToISODate(weeksStart, duration.date.days);
const untilResult = CalendarDateUntil(calendar, weeksStart, weeksEnd, 'week');
const weeks = RoundNumberToIncrement(duration.date.weeks + untilResult.weeks, increment, 'trunc');
r1 = weeks;
r2 = weeks + increment * sign;
r1 = !additionalShift ? weeks : weeks + increment * sign;
r2 = r1 + increment * sign;
startDuration = AdjustDateDurationRecord(duration.date, 0, r1);
endDuration = AdjustDateDurationRecord(duration.date, 0, r2);
break;
}
case 'day': {
const days = RoundNumberToIncrement(duration.date.days, increment, 'trunc');
r1 = days;
r2 = days + increment * sign;
r1 = !additionalShift ? days : days + increment * sign;
r2 = r1 + increment * sign;
startDuration = AdjustDateDurationRecord(duration.date, r1);
endDuration = AdjustDateDurationRecord(duration.date, r2);
break;
Expand Down Expand Up @@ -3290,7 +3290,13 @@ function NudgeToCalendarUnit(

// Round the smallestUnit within the epoch-nanosecond span
if (sign === 1) {
if (!(nudgeWindow.startEpochNs.leq(destEpochNs) && destEpochNs.leq(nudgeWindow.endEpochNs))) {
if (
!(nudgeWindow.startEpochNs.leq(destEpochNs) && destEpochNs.leq(nudgeWindow.endEpochNs)) ||
// If zero-size nudge window, try again
// TODO: maybe converge with condition above?
// TODO: might not need this when sign === 1
endEpochNs.equals(startEpochNs)
) {
// Retry nudge window if it's out of bounds
nudgeWindow = ComputeNudgeWindow(
sign,
Expand All @@ -3310,7 +3316,12 @@ function NudgeToCalendarUnit(
didExpandCalendarUnit = true;
}
} else if (sign == -1) {
if (!(nudgeWindow.endEpochNs.leq(destEpochNs) && destEpochNs.leq(nudgeWindow.startEpochNs))) {
if (
!(nudgeWindow.endEpochNs.leq(destEpochNs) && destEpochNs.leq(nudgeWindow.startEpochNs)) ||
// If zero-size nudge window, try again
// TODO: maybe converge with condition above?
endEpochNs.equals(startEpochNs)
) {
// Retry nudge window if it's out of bounds
nudgeWindow = ComputeNudgeWindow(
sign,
Expand Down
Loading