Skip to content
Merged
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
16 changes: 15 additions & 1 deletion Sources/CommandPalette/CurrentWorkPalettePresentation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,21 @@ struct CurrentWorkPalettePresentation {
parts.append(String(localized: "commandPalette.currentWork.attention", defaultValue: "Attention"))
}
let pullRequestFormat = String(localized: "cli.current.pullRequest", defaultValue: "PR: %@")
parts.append(contentsOf: item.pullRequests.map { String(format: pullRequestFormat, "#\($0.number)") })
if let placeholder = pullRequestFormat.range(of: "%@") {
let prefix = String(pullRequestFormat[..<placeholder.lowerBound])
let suffix = String(pullRequestFormat[placeholder.upperBound...])
for pullRequest in item.pullRequests {
let identifier = "#\(pullRequest.number)"
var label = String()
label.reserveCapacity(prefix.count + identifier.count + suffix.count)
label.append(contentsOf: prefix)
label.append(contentsOf: identifier)
label.append(contentsOf: suffix)
parts.append(label)
}
} else {
parts.append(contentsOf: item.pullRequests.map { _ in pullRequestFormat })
}
if item.freshness.state != "current" {
parts.append(String(localized: "commandPalette.currentWork.notCurrent", defaultValue: "May be out of date"))
}
Expand Down
23 changes: 23 additions & 0 deletions cmuxTests/CurrentWorkCommandPaletteTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,20 @@ struct CurrentWorkCommandPaletteTests {
#expect(!(subtitle.contains(String(localized: "commandPalette.currentWork.notCurrent", defaultValue: "May be out of date"))))
}

@Test
func testPullRequestSubtitleUsesTheLocalizedLabelFormat() {
var item = fixture()
item.pullRequests = [pullRequest(number: 123), pullRequest(number: 456)]

let subtitle = CurrentWorkPalettePresentation(item: item).subtitle(canFocus: true)
let format = String(localized: "cli.current.pullRequest", defaultValue: "PR: %@")
let expected = [123, 456].map { format.replacingOccurrences(of: "%@", with: "#\($0)") }

for label in expected {
#expect(subtitle.contains(label))
}
}

private func fixture() -> CurrentWorkSnapshot.Item {
let resource = SurfaceResourceID(machine: .cloud("test-machine"), kind: .terminal, key: "term_test").rawValue
return .init(
Expand All @@ -77,4 +91,13 @@ struct CurrentWorkCommandPaletteTests {
cursor: nil, receiptRefs: [], possibleHumanObligations: [], evidence: [], omitted: [:]
)
}

private func pullRequest(number: Int) -> CurrentWorkSnapshot.PullRequest {
let freshness = CurrentWorkSnapshot.Freshness(state: "current", reason: nil, observedAt: "2026-09-20T00:00:00Z")
let evidence = CurrentWorkSnapshot.Evidence(owner: "test", reference: "fixture", observedAt: freshness.observedAt)
return .init(
number: number, url: "https://github.com/manaflow-ai/cmux/pull/\(number)", label: "#\(number)",
status: "open", workspaceID: UUID(), freshness: freshness, evidence: evidence
)
}
}
Loading