From ba4a62eb0335805b6aeab55d55836a2dfbb6d5b5 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 17 Feb 2026 16:09:05 -0800 Subject: [PATCH] fmt --- apps/web/src/chat-scroll.test.ts | 5 +- apps/web/src/components/ChatView.tsx | 4 +- apps/web/src/components/GitActionsControl.tsx | 3 +- apps/web/src/keybindings.test.ts | 47 +++++++++++-------- packages/contracts/src/keybindings.ts | 30 +++++++----- 5 files changed, 50 insertions(+), 39 deletions(-) diff --git a/apps/web/src/chat-scroll.test.ts b/apps/web/src/chat-scroll.test.ts index 4d85278bc1fcd0c2d729d8a41c1462c363aa9613..5311fb40aed522803511cda90ee52b38988f0267 100644 --- a/apps/web/src/chat-scroll.test.ts +++ b/apps/web/src/chat-scroll.test.ts @@ -1,9 +1,6 @@ import { describe, expect, it } from "vitest"; -import { - AUTO_SCROLL_BOTTOM_THRESHOLD_PX, - isScrollContainerNearBottom, -} from "./chat-scroll"; +import { AUTO_SCROLL_BOTTOM_THRESHOLD_PX, isScrollContainerNearBottom } from "./chat-scroll"; describe("isScrollContainerNearBottom", () => { it("returns true when already at bottom", () => { diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx index 7a29f57e080b2300a58b297c40d8a33b632756fe..da90b9a86ecdb3316b003927649c917d9a837d42 100644 --- a/apps/web/src/components/ChatView.tsx +++ b/apps/web/src/components/ChatView.tsx @@ -1447,7 +1447,9 @@ const MessagesTimeline = memo(function MessagesTimeline({ if (!hasMessages && !isWorking) { return (
-

Send a message to start the conversation.

+

+ Send a message to start the conversation. +

); } diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx index 68599e0aace177d17ca41d7bc58df7d554ca0296..7890665a9d3ba767c352394da443812640f9edad 100644 --- a/apps/web/src/components/GitActionsControl.tsx +++ b/apps/web/src/components/GitActionsControl.tsx @@ -627,7 +627,8 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp : gitStatusForActions.aheadCount === 0 && gitStatusForActions.behindCount === 0 ? "Up to date" - : gitStatusForActions.aheadCount > 0 && gitStatusForActions.behindCount > 0 + : gitStatusForActions.aheadCount > 0 && + gitStatusForActions.behindCount > 0 ? `Diverged (+${gitStatusForActions.aheadCount} / -${gitStatusForActions.behindCount})` : gitStatusForActions.aheadCount > 0 ? `Ahead by ${gitStatusForActions.aheadCount}` diff --git a/apps/web/src/keybindings.test.ts b/apps/web/src/keybindings.test.ts index 2a3b9c3244e4dbba13dc5252971c884c056e8324..9c17ca40bd9ee9e4009c17f06f7e253f27d236c0 100644 --- a/apps/web/src/keybindings.test.ts +++ b/apps/web/src/keybindings.test.ts @@ -98,7 +98,9 @@ const DEFAULT_BINDINGS = compile([ describe("isTerminalToggleShortcut", () => { it("matches Cmd+J on macOS", () => { assert.isTrue( - isTerminalToggleShortcut(event({ metaKey: true }), DEFAULT_BINDINGS, { platform: "MacIntel" }), + isTerminalToggleShortcut(event({ metaKey: true }), DEFAULT_BINDINGS, { + platform: "MacIntel", + }), ); }); @@ -219,7 +221,10 @@ describe("shortcutLabelForCommand", () => { whenAst: whenNot(whenIdentifier("terminalFocus")), }, ]); - assert.strictEqual(shortcutLabelForCommand(bindings, "terminal.split", "Linux"), "Ctrl+Shift+\\"); + assert.strictEqual( + shortcutLabelForCommand(bindings, "terminal.split", "Linux"), + "Ctrl+Shift+\\", + ); }); it("returns labels for non-terminal commands", () => { @@ -247,22 +252,14 @@ describe("chat/editor shortcuts", () => { it("matches chat.newLocal shortcut", () => { assert.isTrue( - isChatNewLocalShortcut( - event({ key: "n", metaKey: true, shiftKey: true }), - DEFAULT_BINDINGS, - { - platform: "MacIntel", - }, - ), + isChatNewLocalShortcut(event({ key: "n", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, { + platform: "MacIntel", + }), ); assert.isTrue( - isChatNewLocalShortcut( - event({ key: "n", ctrlKey: true, shiftKey: true }), - DEFAULT_BINDINGS, - { - platform: "Linux", - }, - ), + isChatNewLocalShortcut(event({ key: "n", ctrlKey: true, shiftKey: true }), DEFAULT_BINDINGS, { + platform: "Linux", + }), ); }); @@ -344,11 +341,17 @@ describe("cross-command precedence", () => { describe("formatShortcutLabel", () => { it("formats labels for macOS", () => { - assert.strictEqual(formatShortcutLabel(modShortcut("d", { shiftKey: true }), "MacIntel"), "⇧⌘D"); + assert.strictEqual( + formatShortcutLabel(modShortcut("d", { shiftKey: true }), "MacIntel"), + "⇧⌘D", + ); }); it("formats labels for non-macOS", () => { - assert.strictEqual(formatShortcutLabel(modShortcut("d", { shiftKey: true }), "Linux"), "Ctrl+Shift+D"); + assert.strictEqual( + formatShortcutLabel(modShortcut("d", { shiftKey: true }), "Linux"), + "Ctrl+Shift+D", + ); }); it("formats labels for plus key", () => { @@ -368,7 +371,9 @@ describe("isTerminalClearShortcut", () => { }); it("ignores non-keydown events", () => { - assert.isFalse(isTerminalClearShortcut(event({ type: "keyup", key: "l", ctrlKey: true }), "Linux")); + assert.isFalse( + isTerminalClearShortcut(event({ type: "keyup", key: "l", ctrlKey: true }), "Linux"), + ); }); }); @@ -413,7 +418,9 @@ describe("terminalNavigationShortcutData", () => { "MacIntel", ), ); - assert.isNull(terminalNavigationShortcutData(event({ key: "ArrowLeft", metaKey: true }), "Linux")); + assert.isNull( + terminalNavigationShortcutData(event({ key: "ArrowLeft", metaKey: true }), "Linux"), + ); assert.isNull(terminalNavigationShortcutData(event({ key: "a", altKey: true }), "MacIntel")); }); diff --git a/packages/contracts/src/keybindings.ts b/packages/contracts/src/keybindings.ts index d9d8bfbf9eefd4228dfa9e8fdc1907d315c39f52..96f89de12b6706c0c42dbd937eb560748754969d 100644 --- a/packages/contracts/src/keybindings.ts +++ b/packages/contracts/src/keybindings.ts @@ -21,14 +21,16 @@ export const keybindingRuleSchema = z.object({ export const keybindingsConfigSchema = z.array(keybindingRuleSchema).max(256); -export const keybindingShortcutSchema = z.object({ - key: z.string().trim().min(1).max(32), - metaKey: z.boolean(), - ctrlKey: z.boolean(), - shiftKey: z.boolean(), - altKey: z.boolean(), - modKey: z.boolean(), -}).strict(); +export const keybindingShortcutSchema = z + .object({ + key: z.string().trim().min(1).max(32), + metaKey: z.boolean(), + ctrlKey: z.boolean(), + shiftKey: z.boolean(), + altKey: z.boolean(), + modKey: z.boolean(), + }) + .strict(); export type KeybindingWhenNode = | { type: "identifier"; name: string } @@ -59,11 +61,13 @@ export const keybindingWhenNodeSchema: z.ZodType = z.lazy(() ]), ); -export const resolvedKeybindingRuleSchema = z.object({ - command: keybindingCommandSchema, - shortcut: keybindingShortcutSchema, - whenAst: keybindingWhenNodeSchema.optional(), -}).strict(); +export const resolvedKeybindingRuleSchema = z + .object({ + command: keybindingCommandSchema, + shortcut: keybindingShortcutSchema, + whenAst: keybindingWhenNodeSchema.optional(), + }) + .strict(); export const resolvedKeybindingsConfigSchema = z.array(resolvedKeybindingRuleSchema).max(256); -- 2.54.0