Files
archived-orca/src/shared/keybindings/profile-defaults.ts
Jinjing ec07019a12 Use Ctrl+K for search on Windows and Linux (#39767)
* Use Ctrl+K for search on Linux and Windows

Preserve existing search and terminal clear shortcuts for legacy profiles until reset.

* Preserve existing Windows and Linux search shortcuts on rollout

* Preserve saved shortcuts in new profiles

* Keep window shortcut tests independent of defaults
2026-11-07 23:16:47 -08:00

76 lines
2.6 KiB
TypeScript

import { findKeybindingConflicts } from './formatting'
import {
getKeybindingDefinition,
isKeybindingActionId,
getLegacySearchBindings,
LEGACY_TAB_SWITCH_BINDINGS
} from './definitions'
import { getDefaultBindings } from './effective'
import { getKeybindingConflictIdentity, keybindingConflictIdentities } from './matching-key'
import type { KeybindingActionId, KeybindingOverrides } from './types'
export function resolveKeybindingOverrides(
platform: NodeJS.Platform,
explicitOverrides: KeybindingOverrides,
defaultOverrides: KeybindingOverrides
): KeybindingOverrides {
const inherited = { ...defaultOverrides }
for (const actionId of Object.keys(explicitOverrides)) {
if (isKeybindingActionId(actionId)) {
delete inherited[actionId]
}
}
while (true) {
const conflicts = findKeybindingConflicts(
platform,
{ ...inherited, ...explicitOverrides },
{ includeMainProcessInterception: true }
)
let changed = false
for (const conflict of conflicts) {
const identity = getKeybindingConflictIdentity(conflict.binding, platform)
for (const actionId of conflict.actionIds) {
const definition = getKeybindingDefinition(actionId)
// Fresh profiles must also yield the new search default to shared explicit choices.
const bindings =
inherited[actionId] ??
(actionId === 'worktree.palette' &&
definition &&
!Object.hasOwn(explicitOverrides, actionId)
? getDefaultBindings(definition, platform)
: undefined)
if (!bindings) {
continue
}
const retained = bindings.filter(
(binding) => !keybindingConflictIdentities(actionId, binding, platform).includes(identity)
)
if (retained.length !== bindings.length) {
// Keep an empty mask: falling back to a swapped default can introduce another conflict.
inherited[actionId] = retained
changed = true
}
}
}
if (!changed) {
return { ...inherited, ...explicitOverrides }
}
}
}
export function getKeybindingResetBindings(
actionId: KeybindingActionId,
platform: NodeJS.Platform,
commonOverrides: KeybindingOverrides
): string[] | null {
if (Object.hasOwn(commonOverrides, actionId)) {
return null
}
// Persist rollout resets so another profile's inherited defaults cannot reappear.
const migratedAction =
Object.hasOwn(LEGACY_TAB_SWITCH_BINDINGS, actionId) ||
Object.hasOwn(getLegacySearchBindings(platform), actionId)
const definition = getKeybindingDefinition(actionId)
return migratedAction && definition ? getDefaultBindings(definition, platform) : null
}