Skip to content

Commit 2b1dc00

Browse files
jmschonfeldjmschonfeld
committed
Add FoundationAttributedString availability macro
1 parent bca5d3d commit 2b1dc00

File tree

52 files changed

+669
-338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+669
-338
lines changed

‎CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ set(_SwiftFoundation_FutureAvailability "macOS 10000, iOS 10000, tvOS 10000, wat
9999

100100
# All versions to define for each availability name
101101
list(APPEND _SwiftFoundation_versions
102+
"5.7"
103+
"5.8"
104+
"5.9"
105+
"6.0"
102106
"6.0.2"
103107
"6.1"
104108
"6.2"
@@ -107,10 +111,12 @@ list(APPEND _SwiftFoundation_versions
107111
# Each availability name to define
108112
list(APPEND _SwiftFoundation_availability_names
109113
"FoundationPreview"
114+
"FoundationAttributedString"
110115
"FoundationSpan")
111116

112117
# The aligned availability for each name (in the same order)
113118
list(APPEND _SwiftFoundation_availability_releases
119+
${_SwiftFoundation_BaseAvailability}
114120
${_SwiftFoundation_BaseAvailability}
115121
${_SwiftFoundation_macOS26Availability})
116122

‎Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ import CompilerPluginSupport
88

99
let availabilityTags: [_Availability] = [
1010
_Availability("FoundationPreview"), // Default FoundationPreview availability
11+
_Availability("FoundationAttributedString"),
1112
_Availability("FoundationSpan", availability: .macOS26), // Availability of Span types
1213
]
13-
let versionNumbers = ["6.0.2", "6.1", "6.2"]
14+
let versionNumbers = ["5.5", "5.7", "5.8", "5.9", "6.0", "6.0.2", "6.1", "6.2"]
1415

1516
// Availability Macro Utilities
1617

‎Sources/FoundationEssentials/AttributedString/AttributeContainer.swift‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
@dynamicMemberLookup
14-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
14+
@available(FoundationAttributedString 5.5, *)
1515
public struct AttributeContainer : Sendable {
1616
internal var storage : AttributedString._AttributeStorage
1717

@@ -24,7 +24,7 @@ public struct AttributeContainer : Sendable {
2424
}
2525
}
2626

27-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
27+
@available(FoundationAttributedString 5.5, *)
2828
extension AttributeContainer {
2929
@preconcurrency
3030
public subscript<T: AttributedStringKey>(_: T.Type) -> T.Value? where T.Value : Sendable {
@@ -87,26 +87,27 @@ extension AttributeContainer {
8787
}
8888
}
8989

90-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
90+
@available(FoundationAttributedString 5.5, *)
9191
extension AttributeContainer: Equatable {}
9292

93-
@available(macOS 13, iOS 16, tvOS 16, watchOS 9, *)
93+
@available(FoundationAttributedString 5.7, *)
9494
extension AttributeContainer: Hashable {}
9595

96-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
96+
@available(FoundationAttributedString 5.5, *)
9797
extension AttributeContainer: CustomStringConvertible {
9898
public var description: String {
9999
storage.description
100100
}
101101
}
102102

103+
@available(FoundationAttributedString 5.5, *)
103104
extension AttributeContainer {
104105
internal var _hasConstrainedAttributes: Bool {
105106
storage.hasConstrainedAttributes
106107
}
107108
}
108109

109-
@available(FoundationPreview 6.2, *)
110+
@available(FoundationAttributedString 6.2, *)
110111
extension AttributeContainer {
111112
/// Returns a copy of the attribute container with only attributes that specify the provided inheritance behavior.
112113
/// - Parameter inheritedByAddedText: An `inheritedByAddedText` value to filter. Attributes matching this value are included in the returned container.

‎Sources/FoundationEssentials/AttributedString/AttributeScope.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
// var foregroundColor : ForegroundColor
1717
// }
1818
// An AttributeScope can contain other scopes as well.
19-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
19+
@available(FoundationAttributedString 5.5, *)
2020
public protocol AttributeScope : DecodingConfigurationProviding, EncodingConfigurationProviding {
2121
static var decodingConfiguration: AttributeScopeCodableConfiguration { get }
2222
static var encodingConfiguration: AttributeScopeCodableConfiguration { get }
2323
}
2424

2525
@frozen
26-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
26+
@available(FoundationAttributedString 5.5, *)
2727
public enum AttributeScopes { }
2828

2929
@available(macOS, unavailable, introduced: 12.0)
@@ -171,7 +171,7 @@ internal func _loadDefaultAttributes() -> [String : any AttributedStringKey.Type
171171
}
172172

173173
// TODO: Support AttributeScope key finding in FoundationPreview
174-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
174+
@available(FoundationAttributedString 5.5, *)
175175
extension AttributeScope {
176176
private static var scopeDescription: ScopeDescription {
177177
if let cached = _loadedScopeCache.withLock({ $0[Self.self] }) {
@@ -207,7 +207,7 @@ extension AttributeScope {
207207
}
208208

209209
/// A list of all attribute keys contained within this scope and any sub-scopes.
210-
@available(FoundationPreview 6.2, *)
210+
@available(FoundationAttributedString 6.2, *)
211211
public static var attributeKeys: some Sequence<any AttributedStringKey.Type> {
212212
Self.scopeDescription.attributes.values
213213
}

‎Sources/FoundationEssentials/AttributedString/AttributedString+AttributeTransformation.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal import _RopeModule
1818
internal import _FoundationCollections
1919
#endif
2020

21-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
21+
@available(FoundationAttributedString 5.5, *)
2222
extension AttributedString {
2323
@preconcurrency
2424
public struct SingleAttributeTransformer<T: AttributedStringKey> : Sendable where T.Value : Sendable {
@@ -45,7 +45,7 @@ extension AttributedString {
4545
}
4646
}
4747

48-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
48+
@available(FoundationAttributedString 5.5, *)
4949
extension AttributedString {
5050
internal func applyRemovals<K>(
5151
withOriginal orig: AttributedString.SingleAttributeTransformer<K>,
@@ -78,7 +78,7 @@ extension AttributedString {
7878
}
7979
}
8080

81-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
81+
@available(FoundationAttributedString 5.5, *)
8282
extension AttributedString {
8383
@preconcurrency
8484
public func transformingAttributes<K>(
@@ -251,7 +251,7 @@ extension AttributedString {
251251
}
252252
}
253253

254-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
254+
@available(FoundationAttributedString 5.5, *)
255255
extension AttributedString {
256256
@preconcurrency
257257
public func transformingAttributes<K>(

‎Sources/FoundationEssentials/AttributedString/AttributedString+CharacterView.swift‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal import _RopeModule
1818
internal import _FoundationCollections
1919
#endif
2020

21-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
21+
@available(FoundationAttributedString 5.5, *)
2222
extension AttributedString {
2323
public struct CharacterView : Sendable {
2424
/// The guts of the base attributed string.
@@ -80,13 +80,14 @@ extension AttributedString {
8080
}
8181
}
8282

83-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
83+
@available(FoundationAttributedString 5.5, *)
8484
extension AttributedString.CharacterView {
8585
internal var _characters: BigSubstring {
8686
BigSubstring(_unchecked: _guts.string, in: _range)
8787
}
8888
}
8989

90+
@available(FoundationAttributedString 5.5, *)
9091
extension Slice<AttributedString.CharacterView> {
9192
internal var _rebased: AttributedString.CharacterView {
9293
let bounds = Range(uncheckedBounds: (self.startIndex._value, self.endIndex._value))
@@ -100,7 +101,7 @@ extension Slice<AttributedString.CharacterView> {
100101

101102
// FIXME: AttributedString.CharacterView needs to publicly conform to Equatable & Hashable.
102103

103-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
104+
@available(FoundationAttributedString 5.5, *)
104105
extension AttributedString.CharacterView: BidirectionalCollection {
105106
public typealias Element = Character
106107
public typealias Index = AttributedString.Index
@@ -123,7 +124,7 @@ extension AttributedString.CharacterView: BidirectionalCollection {
123124
return _defaultCount
124125
}
125126

126-
@available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
127+
@available(FoundationAttributedString 5.9, *)
127128
@usableFromInline
128129
internal var _count: Int {
129130
_characters.count
@@ -153,7 +154,7 @@ extension AttributedString.CharacterView: BidirectionalCollection {
153154
return _defaultIndex(i, offsetBy: distance)
154155
}
155156

156-
@available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
157+
@available(FoundationAttributedString 5.9, *)
157158
@usableFromInline
158159
internal func _index(_ i: AttributedString.Index, offsetBy distance: Int) -> AttributedString.Index {
159160
precondition(i >= startIndex && i <= endIndex, "AttributedString index out of bounds")
@@ -176,7 +177,7 @@ extension AttributedString.CharacterView: BidirectionalCollection {
176177
return _defaultIndex(i, offsetBy: distance, limitedBy: limit)
177178
}
178179

179-
@available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
180+
@available(FoundationAttributedString 5.9, *)
180181
@usableFromInline
181182
internal func _index(
182183
_ i: AttributedString.Index,
@@ -207,7 +208,7 @@ extension AttributedString.CharacterView: BidirectionalCollection {
207208
return _defaultDistance(from: start, to: end)
208209
}
209210

210-
@available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
211+
@available(FoundationAttributedString 5.9, *)
211212
@usableFromInline
212213
internal func _distance(from start: AttributedString.Index, to end: AttributedString.Index) -> Int {
213214
precondition(start >= startIndex && start <= endIndex, "AttributedString index out of bounds")
@@ -245,7 +246,7 @@ extension AttributedString.CharacterView: BidirectionalCollection {
245246
}
246247
}
247248

248-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
249+
@available(FoundationAttributedString 5.5, *)
249250
extension AttributedString.CharacterView: RangeReplaceableCollection {
250251
internal mutating func _ensureUniqueReference() {
251252
if !isKnownUniquelyReferenced(&_guts) {

‎Sources/FoundationEssentials/AttributedString/AttributedString+Guts.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ internal import _RopeModule
1818
internal import _FoundationCollections
1919
#endif
2020

21+
@available(FoundationAttributedString 5.5, *)
2122
extension AttributedString {
2223
internal final class Guts : @unchecked Sendable {
2324
typealias Index = AttributedString.Index
@@ -54,6 +55,7 @@ extension AttributedString {
5455
}
5556
}
5657

58+
@available(FoundationAttributedString 5.5, *)
5759
extension AttributedString.Guts {
5860
__consuming func copy() -> AttributedString.Guts {
5961
AttributedString.Guts(string: self.string, runs: self.runs)
@@ -73,6 +75,7 @@ extension AttributedString.Guts {
7375
}
7476
}
7577

78+
@available(FoundationAttributedString 5.5, *)
7679
extension AttributedString.Guts {
7780
internal static func characterwiseIsEqual(
7881
_ left: AttributedString.Guts,
@@ -182,6 +185,7 @@ extension AttributedString.Guts {
182185
}
183186
}
184187

188+
@available(FoundationAttributedString 5.5, *)
185189
extension AttributedString.Guts {
186190
internal func description(in range: Range<BigString.Index>) -> String {
187191
self.description(in: RangeSet(range))
@@ -199,6 +203,7 @@ extension AttributedString.Guts {
199203
}
200204
}
201205

206+
@available(FoundationAttributedString 5.5, *)
202207
extension AttributedString.Guts {
203208
var stringBounds: Range<BigString.Index> {
204209
Range(uncheckedBounds: (string.startIndex, string.endIndex))

‎Sources/FoundationEssentials/AttributedString/AttributedString+IndexTracking.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ internal import _FoundationCollections
2020

2121
// MARK: - Internal Index Updating
2222

23+
@available(FoundationAttributedString 5.5, *)
2324
extension AttributedString.Guts {
2425
func _prepareTrackedIndicesUpdate(mutationRange: Range<BigString.Index>) {
2526
// Move any range endpoints inside of the mutation range to outside of the mutation range since a range should never end up splitting a mutation
@@ -75,7 +76,7 @@ extension AttributedString.Guts {
7576

7677
// MARK: - Public API
7778

78-
@available(FoundationPreview 6.2, *)
79+
@available(FoundationAttributedString 6.2, *)
7980
extension AttributedString {
8081
// MARK: inout API
8182

‎Sources/FoundationEssentials/AttributedString/AttributedString+IndexValidity.swift‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
internal import Synchronization
1515
#endif
1616

17+
@available(FoundationAttributedString 5.5, *)
1718
extension AttributedString.Guts {
1819
typealias Version = UInt
1920

@@ -43,7 +44,7 @@ extension AttributedString.Guts {
4344

4445
// MARK: - Public API
4546

46-
@available(FoundationPreview 6.2, *)
47+
@available(FoundationAttributedString 6.2, *)
4748
extension AttributedString.Index {
4849
/// Indicates whether the index is valid for use with the provided attributed string.
4950
/// - Parameter text: An attributed string used to validate the index.
@@ -63,7 +64,7 @@ extension AttributedString.Index {
6364
}
6465
}
6566

66-
@available(FoundationPreview 6.2, *)
67+
@available(FoundationAttributedString 6.2, *)
6768
extension Range<AttributedString.Index> {
6869
/// Indicates whether the range is valid for use with the provided attributed string.
6970
/// - Parameter text: An attributed string used to validate the range.
@@ -88,7 +89,7 @@ extension Range<AttributedString.Index> {
8889
}
8990
}
9091

91-
@available(FoundationPreview 6.2, *)
92+
@available(FoundationAttributedString 6.2, *)
9293
extension RangeSet<AttributedString.Index> {
9394
/// Indicates whether the range set is valid for use with the provided attributed string.
9495
/// - Parameter text: An attributed string used to validate the range set.

‎Sources/FoundationEssentials/AttributedString/AttributedString+Runs+AttributeSlices.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
13+
@available(FoundationAttributedString 5.5, *)
1414
extension AttributedString.Runs {
1515
@preconcurrency
1616
public struct AttributesSlice1<T : AttributedStringKey> : BidirectionalCollection, Sendable
@@ -142,7 +142,7 @@ extension AttributedString.Runs {
142142
}
143143
}
144144

145-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
145+
@available(FoundationAttributedString 5.5, *)
146146
extension AttributedString.Runs {
147147
@preconcurrency
148148
public struct AttributesSlice2<
@@ -298,7 +298,7 @@ extension AttributedString.Runs {
298298
}
299299
}
300300

301-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
301+
@available(FoundationAttributedString 5.5, *)
302302
extension AttributedString.Runs {
303303
@preconcurrency
304304
public struct AttributesSlice3<
@@ -466,7 +466,7 @@ extension AttributedString.Runs {
466466
}
467467
}
468468

469-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
469+
@available(FoundationAttributedString 5.5, *)
470470
extension AttributedString.Runs {
471471
@preconcurrency
472472
public struct AttributesSlice4<
@@ -648,7 +648,7 @@ extension AttributedString.Runs {
648648
}
649649
}
650650

651-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
651+
@available(FoundationAttributedString 5.5, *)
652652
extension AttributedString.Runs {
653653
@preconcurrency
654654
public struct AttributesSlice5<
@@ -846,7 +846,7 @@ extension AttributedString.Runs {
846846

847847
#if FOUNDATION_FRAMEWORK
848848

849-
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
849+
@available(FoundationAttributedString 5.5, *)
850850
extension AttributedString.Runs {
851851
@_spi(AttributedString)
852852
public struct NSAttributesSlice : BidirectionalCollection, Sendable {

0 commit comments

Comments
 (0)