Skip to content

Remove unused AttributedString initializers #948

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
Sep 26, 2024
+0 −28
Merged

Remove unused AttributedString initializers #948

Show file tree
Hide file tree
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
22 changes: 0 additions & 22 deletions Sources/FoundationEssentials/AttributedString/Conversion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,6 @@ extension Dictionary where Key == NSAttributedString.Key, Value == Any {
try self.init(container, attributeTable: S.attributeKeyTypes())
}

// These includingOnly SPI initializers were provided originally when conversion boxed attributes outside of the given scope as an AnyObject
// After rdar://80201634, these SPI initializers have the same behavior as the API initializers
@_spi(AttributedString)
public init<S: AttributeScope>(_ container: AttributeContainer, includingOnly scope: KeyPath<AttributeScopes, S.Type>) throws {
try self.init(container, including: S.self)
}

@_spi(AttributedString)
public init<S: AttributeScope>(_ container: AttributeContainer, includingOnly scope: S.Type) throws {
try self.init(container, including: S.self)
}

fileprivate init(_ container: AttributeContainer, attributeTable: [String : any AttributedStringKey.Type], options: _AttributeConversionOptions = []) throws {
self.init()
for key in container.storage.keys {
Expand Down Expand Up @@ -186,16 +174,6 @@ extension NSAttributedString {
try self.init(attrStr, attributeTable: scope.attributeKeyTypes())
}

@_spi(AttributedString)
public convenience init<S: AttributeScope>(_ attrStr: AttributedString, includingOnly scope: KeyPath<AttributeScopes, S.Type>) throws {
try self.init(attrStr, including: S.self)
}

@_spi(AttributedString)
public convenience init<S: AttributeScope>(_ attrStr: AttributedString, includingOnly scope: S.Type) throws {
try self.init(attrStr, including: scope)
}

internal convenience init(
_ attrStr: AttributedString,
attributeTable: [String : any AttributedStringKey.Type],
Expand Down
6 changes: 0 additions & 6 deletions Tests/FoundationEssentialsTests/AttributedString/AttributedStringTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,12 +1774,6 @@ E {
#endif
}

func testConversionIncludingOnly() throws {
let str = AttributedString("Hello, world", attributes: .init().testInt(2).link(URL(string: "http://apple.com")!))
let nsStr = try NSAttributedString(str, includingOnly: \.test)
XCTAssertEqual(nsStr, NSAttributedString(string: "Hello, world", attributes: [.testInt: 2]))
}

func testConversionCoalescing() throws {
let nsStr = NSMutableAttributedString("Hello, world")
nsStr.setAttributes([.link : NSURL(string: "http://apple.com")!, .testInt : NSNumber(integerLiteral: 2)], range: NSRange(location: 0, length: 6))
Expand Down