Don't skip anchors with strict matching in Calendar.RecurrenceRule. Resolve #881 #1000
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci please test |
parkera
reviewed
Oct 23, 2024
itingliu
approved these changes
Oct 31, 2024
| // in case the start date falls on a leap month | ||
| componentsForEnumerating.month = 1 | ||
| componentsForEnumerating.isLeapMonth = nil | ||
| } |
There was a problem hiding this comment.
Would we also need to handle nth-weekday and yearly combination?
There was a problem hiding this comment.
Yes, good catch! Added more exhaustive checks and cleaned up the logic a bit to be easier to read
hristost
commented
Oct 31, 2024
Sources/FoundationEssentials/Calendar/Calendar_Recurrence.swift
Outdated
Show resolved
Hide resolved
…esolve #881 In recurrence rules that expand days or weekdays in a month, we first use a base recurrence to calculate "anchors" in the month, and then change the day of month or weekday to find results. Because the base recurrence used to match the day of month of the start date, we could miss anchors if matching was set to `.strict`. This change makes sure that if we know that the day of month is known to change, we reset it to 1 in the base recurrence. Likewise, we reset the month in case of leap month.
hristost
force-pushed
the
hs/recurrence-rule-fix-strict-start-date
branch
from
3a4da11 to
8ab1d1d
Compare
|
@swift-ci please test |
1 similar comment
|
@swift-ci please test |
cthielen
pushed a commit
to cthielen/swift-foundation
that referenced
this pull request
Nov 8, 2024
…esolve swiftlang#881 (swiftlang#1000) In recurrence rules that expand days or weekdays in a month, we first use a base recurrence to calculate "anchors" in the month, and then change the day of month or weekday to find results. Because the base recurrence used to match the day of month of the start date, we could miss anchors if matching was set to `.strict`. This change makes sure that if we know that the day of month is known to change, we reset it to 1 in the base recurrence. Likewise, we reset the month in case of leap month.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In recurrence rules that expand days or weekdays in a month, we first use a base recurrence to calculate "anchors" in the month, and then change the day of month or weekday to find results. Because the base recurrence used to match the day of month of the start date, we could miss anchors if matching was set to
.strict. This change makes sure that if we know that the day of month is known to change, we reset it to 1 in the base recurrence.