Skip to content
Open
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
24 changes: 5 additions & 19 deletions polyfill/lib/ecmascript.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3308,25 +3308,11 @@ function NudgeToCalendarUnit(
didExpandCalendarUnit = true;
}
} else if (sign == -1) {
if (!(nudgeWindow.endEpochNs.leq(destEpochNs) && destEpochNs.leq(nudgeWindow.startEpochNs))) {
// Retry nudge window if it's out of bounds
nudgeWindow = ComputeNudgeWindow(
sign,
duration,
originEpochNs,
isoDateTime,
timeZone,
calendar,
increment,
unit,
true
);
assert(
nudgeWindow.endEpochNs.leq(destEpochNs) && destEpochNs.leq(nudgeWindow.startEpochNs),
`${unit} was 0 days long`
);
didExpandCalendarUnit = true;
}
/* c8 ignore next */
assert(
nudgeWindow.endEpochNs.leq(destEpochNs) && destEpochNs.leq(nudgeWindow.startEpochNs),
`sign===-1 nudge window should always contain destEpochNs for ${unit}`
);
}
({ r1, r2, startEpochNs, endEpochNs, startDuration, endDuration } = nudgeWindow);

Expand Down
6 changes: 2 additions & 4 deletions spec/duration.html
Original file line number Diff line number Diff line change
Expand Up @@ -1672,10 +1672,8 @@ <h1>
1. Assert: _nudgeWindow_.[[StartEpochNs]] ≤ _destEpochNs_ ≤ _nudgeWindow_.[[EndEpochNs]].
1. Set _didExpandCalendarUnit_ to *true*.
1. Else,
1. If _endEpochNs_ ≤ _destEpochNs_ ≤ _startEpochNs_ is *false*, then
1. Set _nudgeWindow_ to ? ComputeNudgeWindow(_sign_, _duration_, _originEpochNs_, _isoDateTime_, _timeZone_, _calendar_, _increment_, _unit_, *true*).
1. Assert: _nudgeWindow_.[[EndEpochNs]] ≤ _destEpochNs_ ≤ _nudgeWindow_.[[StartEpochNs]].
1. Set _didExpandCalendarUnit_ to *true*.
1. Assert: _endEpochNs_ ≤ _destEpochNs_ ≤ _startEpochNs_.
1. NOTE: For negative durations, end-of-month constraining can only reduce the day number, which moves the endpoint further from the origin, so the nudge window always contains _destEpochNs_ without an additional shift.
1. Let _r1_ be _nudgeWindow_.[[R1]].
1. Let _r2_ be _nudgeWindow_.[[R2]].
1. Set _startEpochNs_ to _nudgeWindow_.[[StartEpochNs]].
Expand Down
Loading