Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions Sources/SwiftNavigation/TextState.swift
Original file line number Diff line number Diff line change
Expand Up @@ -701,21 +701,27 @@ extension String {
comment: StaticString? = nil
) -> String {
let children = Array(Mirror(reflecting: self).children)
let key = children[0].value as! String
guard children.count > 2, let key = children[0].value as? String else {
return ""
}
let arguments: [any CVarArg] = Array(Mirror(reflecting: children[2].value).children)
.compactMap {
let children = Array(Mirror(reflecting: $0.value).children)
guard !children.isEmpty else { return nil }
let value: Any
let formatter: Formatter?
// `LocalizedStringKey.FormatArgument` differs depending on OS/platform.
if children[0].label == "storage" {
(value, formatter) =
Array(Mirror(reflecting: children[0].value).children)[0].value as! (Any, Formatter?)
guard let storage = Array(Mirror(reflecting: children[0].value).children).first?.value
as? (Any, Formatter?)
else { return nil }
(value, formatter) = storage
} else {
guard children.count > 1 else { return nil }
value = children[0].value
formatter = children[1].value as? Formatter
}
return formatter?.string(for: value) ?? value as! any CVarArg
return formatter?.string(for: value) ?? value as? any CVarArg
}

let format = NSLocalizedString(
Expand Down
12 changes: 12 additions & 0 deletions Tests/SwiftNavigationTests/LocalizedStringKeyTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#if canImport(SwiftUI)
import SwiftNavigation
import SwiftUI
import XCTest

final class LocalizedStringKeyTests: XCTestCase {
func testTextStateLocalizedStringKeyWithUnexpectedStorageDoesNotCrash() {
let text = TextState("\(AttributedString("Hello, world!"))")
XCTAssertFalse(String(state: text).isEmpty)
}
}
#endif