marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keep cmd-p stable during workspace title churn

Browse source
This commit is contained in:
Lawrence Chen 2026-03-30 18:39:55 -07:00
parent ae00d5d2a7
commit c7bb691285
No known key found for this signature in database
1 changed files with 84 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

88
Sources/ContentView.swift
View file

@ -980,6 +980,7 @@ private final class WindowCommandPaletteOverlayController: NSObject {
private var focusLockTimer: DispatchSourceTimer?
private var scheduledFocusWorkItem: DispatchWorkItem?
private var isPaletteVisible = false
private var currentRenderFingerprint: Int?
private var windowDidBecomeKeyObserver: NSObjectProtocol?
private var windowDidResignKeyObserver: NSObjectProtocol?
@ -1230,7 +1231,7 @@ private final class WindowCommandPaletteOverlayController: NSObject {
editor.setSelectedRange(NSRange(location: length, length: 0))
}
func update(rootView: AnyView, isVisible: Bool) {
func update(rootView: AnyView, isVisible: Bool, renderFingerprint: Int) {
guard ensureInstalled() else { return }
let shouldPromote = CommandPaletteOverlayPromotionPolicy.shouldPromote(
previouslyVisible: isPaletteVisible,
@ -1238,7 +1239,10 @@ private final class WindowCommandPaletteOverlayController: NSObject {
)
isPaletteVisible = isVisible
if isVisible {
hostingView.rootView = rootView
if currentRenderFingerprint != renderFingerprint {
hostingView.rootView = rootView
currentRenderFingerprint = renderFingerprint
}
containerView.capturesMouseEvents = true
containerView.isHidden = false
containerView.alphaValue = 1
@ -1252,6 +1256,7 @@ private final class WindowCommandPaletteOverlayController: NSObject {
_ = window.makeFirstResponder(nil)
}
hostingView.rootView = AnyView(EmptyView())
currentRenderFingerprint = nil
containerView.capturesMouseEvents = false
containerView.alphaValue = 0
containerView.isHidden = true
@ -3037,7 +3042,11 @@ struct ContentView: View {
let tmuxOverlayController = tmuxWorkspacePaneWindowOverlayController(for: window)
tmuxOverlayController.update(state: tmuxWorkspacePaneWindowOverlayState(for: window))
let overlayController = commandPaletteWindowOverlayController(for: window)
overlayController.update(rootView: AnyView(commandPaletteOverlay), isVisible: isCommandPalettePresented)
overlayController.update(
rootView: AnyView(commandPaletteOverlay),
isVisible: isCommandPalettePresented,
renderFingerprint: commandPaletteOverlayRenderFingerprint
)
}
}))
@ -4160,6 +4169,77 @@ struct ContentView: View {
)
}
private var commandPaletteOverlayRenderFingerprint: Int {
var hasher = Hasher()
switch commandPaletteMode {
case .commands:
hasher.combine("commands")
case .renameInput(let target):
hasher.combine("renameInput")
combineCommandPaletteRenameTarget(target, into: &hasher)
case .renameConfirm(let target, let proposedName):
hasher.combine("renameConfirm")
combineCommandPaletteRenameTarget(target, into: &hasher)
hasher.combine(proposedName)
}
hasher.combine(commandPaletteQuery)
hasher.combine(commandPaletteRenameDraft)
hasher.combine(commandPaletteListScope.rawValue)
hasher.combine(commandPaletteSelectedResultIndex)
hasher.combine(commandPaletteSelectionAnchorCommandID)
hasher.combine(commandPaletteHoveredResultIndex)
hasher.combine(commandPaletteScrollTargetIndex)
hasher.combine(commandPaletteScrollTargetAnchor?.x)
hasher.combine(commandPaletteScrollTargetAnchor?.y)
hasher.combine(commandPaletteVisibleResultsScope?.rawValue)
hasher.combine(commandPaletteVisibleResultsFingerprint)
hasher.combine(cachedCommandPaletteScope?.rawValue)
hasher.combine(cachedCommandPaletteFingerprint)
hasher.combine(isCommandPaletteSearchPending)
hasher.combine(commandPaletteSearchRequestID)
hasher.combine(commandPaletteResolvedSearchRequestID)
hasher.combine(commandPaletteResolvedSearchScope?.rawValue)
hasher.combine(commandPaletteResolvedSearchFingerprint)
hasher.combine(commandPaletteResolvedMatchingQuery)
hasher.combine(commandPaletteResultsRevision)
combineCommandPalettePendingActivation(commandPalettePendingActivation, into: &hasher)
return hasher.finalize()
}
private func combineCommandPaletteRenameTarget(
_ target: CommandPaletteRenameTarget,
into hasher: inout Hasher
) {
switch target.kind {
case .workspace(let workspaceId):
hasher.combine("workspace")
hasher.combine(workspaceId)
case .tab(let workspaceId, let panelId):
hasher.combine("tab")
hasher.combine(workspaceId)
hasher.combine(panelId)
}
}
private func combineCommandPalettePendingActivation(
_ activation: CommandPalettePendingActivation?,
into hasher: inout Hasher
) {
switch activation {
case .selected(let requestID, let fallbackSelectedIndex, let preferredCommandID):
hasher.combine("selected")
hasher.combine(requestID)
hasher.combine(fallbackSelectedIndex)
hasher.combine(preferredCommandID)
case .command(let requestID, let commandID):
hasher.combine("command")
hasher.combine(requestID)
hasher.combine(commandID)
case nil:
hasher.combine("none")
}
}
nonisolated private static func commandPaletteListScope(for query: String) -> CommandPaletteListScope {
if query.hasPrefix(Self.commandPaletteCommandsPrefix) {
return .commands
@ -6508,7 +6588,7 @@ struct ContentView: View {
hasher.combine(context.workspaces.count)
for workspace in context.workspaces {
hasher.combine(workspace.id)
hasher.combine(workspace.displayName)
// Keep animated workspace titles from invalidating the live switcher corpus.
combineCommandPaletteSwitcherSearchMetadata(workspace.metadata, into: &hasher)
hasher.combine(workspace.surfaces.count)
for surface in workspace.surfaces {