Skip to content

Fix-up newer AttributedString availability/deprecation annotations #1413

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

Merged
merged 1 commit into from
Jul 10, 2025
Merged

Fix-up newer AttributedString availability/deprecation annotations #1413

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
24 changes: 14 additions & 10 deletions Sources/FoundationEssentials/AttributedString/AttributedString+Runs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,26 +209,24 @@ extension AttributedString.Runs.Index: Comparable {
}
}

#if !FOUNDATION_FRAMEWORK
@available(macOS, deprecated: 10000, introduced: 12, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
@available(iOS, deprecated: 10000, introduced: 15, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
@available(tvOS, deprecated: 10000, introduced: 15, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
@available(watchOS, deprecated: 10000, introduced: 8, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
@available(visionOS, deprecated: 10000, introduced: 1, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
@available(macOS, deprecated: 26, introduced: 12, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
@available(iOS, deprecated: 26, introduced: 15, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
@available(tvOS, deprecated: 26, introduced: 15, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
@available(watchOS, deprecated: 26, introduced: 8, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
@available(visionOS, deprecated: 26, introduced: 1, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
@available(*, deprecated, message: "AttributedString.Runs.Index should not be used as a Strideable and should instead be offset using the API provided by AttributedString.Runs")
extension AttributedString.Runs.Index: Strideable {
public func distance(to other: Self) -> Int {
// This isn't perfect (since two non-sliced indices might have other sliced runs between them) but checking is better than nothing
precondition(!self._withinDiscontiguous && !other._withinDiscontiguous, "AttributedString.Runs.Index's Strideable conformance may not be used with discontiguous sliced runs")
return other._runOffset - self._runOffset
}

public func advanced(by n: Int) -> Self {
precondition(!self._withinDiscontiguous, "AttributedString.Runs.Index's Strideable conformance may not be used with discontiguous sliced runs")
return Self(_runOffset: self._runOffset + n, withinDiscontiguous: false)
}
}
#endif

@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
extension Range<AttributedString.Runs.Index> {
Expand Down Expand Up @@ -332,12 +330,18 @@ extension AttributedString.Runs: BidirectionalCollection {
}
}

#if !FOUNDATION_FRAMEWORK
@_alwaysEmitIntoClient
public func distance(from start: Index, to end: Index) -> Int {
#if FOUNDATION_FRAMEWORK
if #available(macOS 26, iOS 26, tvOS 26, watchOS 26, visionOS 26, *) {
_distance(from: start, to: end)
} else {
start.distance(to: end)
}
#else
_distance(from: start, to: end)
#endif
}
#endif

@available(FoundationPreview 6.2, *)
@usableFromInline
Expand Down