Repository navigation
Allow space as a bindable key in custom keybindings #3333
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
815f3a2
Add regression test for space modifier key parsing
austinywang d5ef12e
Allow space as a bindable key in custom keybindings
austinywang f3568f7
Bring space shortcut PR current with main
austinywang 5ccdc94
Clear PR checks for space shortcut support
austinywang 1233466
Address space shortcut review feedback
austinywang aaab39e
Keep shortcut schema aligned with rendered punctuation
austinywang eb2991a
Align shortcut schema with first-stroke rules
austinywang f91ca77
Let configured bare Space shortcuts reach routing
austinywang c0420eb
Keep bare Space routing within CI guardrails
austinywang 8d0c525
Keep bare shortcut cache invalidation on main
austinywang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| import AppKit | ||
| import Foundation | ||
|
|
||
| enum KeyboardShortcutBareStartCache { | ||
| private static var configuredKeys: Set<String>? | ||
| private static var observer: NSObjectProtocol? | ||
|
|
||
| static func hasConfiguredBareShortcutStart(key: String) -> Bool { | ||
| installObserverIfNeeded() | ||
|
|
||
| let normalizedKey = key.lowercased() | ||
| if let configuredKeys { | ||
| return configuredKeys.contains(normalizedKey) | ||
| } | ||
|
|
||
| let resolvedKeys = Set( | ||
| KeyboardShortcutSettings.Action.allCases.compactMap { action -> String? in | ||
| guard action != .showHideAllWindows else { return nil } | ||
| return KeyboardShortcutSettings.shortcut(for: action).bareShortcutStartKey | ||
| } | ||
| ) | ||
| configuredKeys = resolvedKeys | ||
| return resolvedKeys.contains(normalizedKey) | ||
| } | ||
|
|
||
| private static func installObserverIfNeeded() { | ||
| guard observer == nil else { return } | ||
| observer = NotificationCenter.default.addObserver( | ||
| forName: KeyboardShortcutSettings.didChangeNotification, | ||
| object: nil, | ||
| queue: .main | ||
| ) { _ in | ||
| configuredKeys = nil | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension StoredShortcut { | ||
| var bareShortcutStartKey: String? { | ||
| guard !isUnbound, firstStroke.modifierFlags.isEmpty else { return nil } | ||
| return key.lowercased() | ||
| } | ||
| } | ||
|
|
||
| func bareShortcutFastPathKey(for event: NSEvent) -> String? { | ||
| if event.keyCode == 49 { | ||
| return "space" | ||
| } | ||
|
|
||
| guard event.specialKey != nil, | ||
| let stroke = ShortcutStroke.from(event: event, requireModifier: false), | ||
| stroke.modifierFlags.isEmpty else { | ||
| return nil | ||
| } | ||
| return stroke.key.lowercased() | ||
| } | ||
|
|
||
| extension AppDelegate { | ||
| func shouldBypassPlainKeyShortcutRouting( | ||
| event: NSEvent, | ||
| normalizedFlags: NSEvent.ModifierFlags | ||
| ) -> Bool { | ||
| guard normalizedFlags.isEmpty, | ||
| activeConfiguredShortcutChordPrefixForCurrentEvent == nil else { | ||
| return false | ||
| } | ||
|
|
||
| guard let bareShortcutKey = bareShortcutFastPathKey(for: event) else { | ||
| return true | ||
| } | ||
|
|
||
| guard !KeyboardShortcutBareStartCache.hasConfiguredBareShortcutStart(key: bareShortcutKey) else { | ||
| return false | ||
| } | ||
|
|
||
| let configuredCmuxShortcutContext = preferredMainWindowContextForShortcutRouting(event: event) | ||
| return !configuredCmuxShortcutActions(for: configuredCmuxShortcutContext).contains { | ||
| $0.shortcut?.bareShortcutStartKey == bareShortcutKey | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.