Skip to content

Add an SPI Attachment.uncheckedPreferredName property. #1379

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

Closed
wants to merge 1 commit into from
Closed

Add an SPI Attachment.uncheckedPreferredName property. #1379

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
2 changes: 1 addition & 1 deletion Sources/Testing/ABI/Encoded/ABI.EncodedAttachment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ extension ABI {
path = attachment.fileSystemPath

if V.includesExperimentalFields {
_preferredName = attachment.preferredName
_preferredName = attachment.uncheckedPreferredName

if path == nil {
_bytes = try? attachment.withUnsafeBytes { bytes in
Expand Down
20 changes: 14 additions & 6 deletions Sources/Testing/Attachments/Attachment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,19 @@ public struct Attachment<AttachableValue> where AttachableValue: Attachable & ~C
/// Storage for ``preferredName``.
fileprivate var _preferredName: String?

/// A filename to use when saving this attachment.
///
/// The value of this property is equal to ``preferredName`` if the test
/// author specified a preferred name when creating the attachment. Otherwise,
/// the value of this property is `nil`.
@_spi(ForToolsIntegrationOnly)
public var uncheckedPreferredName: String? {
if let _preferredName, !_preferredName.isEmpty {
return attachableValue.preferredName(for: self, basedOn: _preferredName)
}
return nil
}

/// A filename to use when saving this attachment.
///
/// The value of this property is used as a hint to the testing library. The
Expand All @@ -88,12 +101,7 @@ public struct Attachment<AttachableValue> where AttachableValue: Attachable & ~C
/// @Available(Xcode, introduced: 26.0)
/// }
public var preferredName: String {
let suggestedName = if let _preferredName, !_preferredName.isEmpty {
_preferredName
} else {
Self.defaultPreferredName
}
return attachableValue.preferredName(for: self, basedOn: suggestedName)
uncheckedPreferredName ?? attachableValue.preferredName(for: self, basedOn: Self.defaultPreferredName)
}

/// The source location of this instance.
Expand Down