Skip to content

fix(contracts): Space shortcuts reach clients instead of reverting to defaults #34799

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.

Sign up for GitHub

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
juliusmarminge merged 2 commits into from
Nov 12, 2026
+22 −1
Merged

fix(contracts): Space shortcuts reach clients instead of reverting to defaults #34799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
928d05d
test(contracts): resolved Space shortcuts survive the wire round trip
juliusmarminge Nov 12, 2026
ca10122
fix(contracts): Space shortcuts reach clients instead of reverting to…
juliusmarminge Nov 12, 2026
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
15 changes: 15 additions & 0 deletions packages/contracts/src/keybindings.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,21 @@ it.effect("drops resolved rules with commands this build does not know", () =>
}),
);

it.effect("round-trips resolved Space shortcuts", () =>
Effect.gen(function* () {
const codec = Schema.fromJsonString(ResolvedKeybindingsConfig);
const rules = [
{
command: "composer.dictation" as const,
shortcut: { ...shortcut, key: " ", metaKey: true, modKey: false },
},
];
const encoded = yield* Schema.encodeEffect(codec)(rules);
const parsed = yield* decode(codec, encoded);
assert.deepEqual(parsed, rules);
}),
);

it.effect("drops malformed resolved rule entries", () =>
Effect.gen(function* () {
const parsed = yield* decode(ResolvedKeybindingsConfig, [
Expand Down
8 changes: 7 additions & 1 deletion packages/contracts/src/keybindings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,14 @@ export const KeybindingsConfig = Schema.Array(KeybindingRule).check(
);
export type KeybindingsConfig = typeof KeybindingsConfig.Type;

// Untrimmed: the `space` token resolves to the key " ".
const KeybindingShortcutKey = Schema.String.check(
Schema.isMinLength(1),
Schema.isMaxLength(MAX_KEYBINDING_VALUE_LENGTH),
);

export const KeybindingShortcut = Schema.Struct({
key: KeybindingValue,
key: KeybindingShortcutKey,
metaKey: Schema.Boolean,
ctrlKey: Schema.Boolean,
shiftKey: Schema.Boolean,
Expand Down
Loading