feat(editor): add configurable line comment shortcut

This commit is contained in:
t8y2 committed 2026-07-07 18:32:57 +08:00
1 parent 184e235999
commit 5a9ab5c036
13 files changed
+109 -11

No files matched your search

@@ -34,4 +34,8 @@ describe("shortcut display", () => {
expect(formatShortcutDisplay("Mod+Plus", "Win32")).toBe("Ctrl + +");
expect(formatShortcutDisplay("Shift+Mod++", "Win32")).toBe("Ctrl + Shift + +");
});
it("displays multi-stroke shortcuts", () => {
expect(formatShortcutDisplay("Ctrl+K Ctrl+C", "Win32")).toBe("Ctrl + K, Ctrl + C");
});
});
@@ -2,7 +2,24 @@ import { describe, expect, it } from "vitest";
import { DEFAULT_SHORTCUT_SETTINGS, SHORTCUT_DEFINITIONS, findShortcutConflict, formatShortcut, normalizeShortcutSettings, shortcutToCodeMirrorKey, type ShortcutActionId } from "@/lib/editor/shortcutRegistry";
describe("shortcutRegistry editor actions", () => {
const formatterEditorActionIds: ShortcutActionId[] = ["formatSql", "indentMore", "indentLess", "duplicateLine", "deleteLine", "moveLineUp", "moveLineDown", "copyLineUp", "copyLineDown", "undo", "redo", "selectAll", "uppercaseSelection", "lowercaseSelection", "exPasteSqlInCondition"];
const formatterEditorActionIds: ShortcutActionId[] = [
"formatSql",
"toggleLineComment",
"indentMore",
"indentLess",
"duplicateLine",
"deleteLine",
"moveLineUp",
"moveLineDown",
"copyLineUp",
"copyLineDown",
"undo",
"redo",
"selectAll",
"uppercaseSelection",
"lowercaseSelection",
"exPasteSqlInCondition",
];
const sidebarShortcutActionIds: ShortcutActionId[] = ["copySidebarSelection", "pasteSidebarSelection", "editSidebarConnection"];
it("registers formatter editor shortcuts in the generic editor scope", () => {
@@ -19,6 +36,7 @@ describe("shortcutRegistry editor actions", () => {
expect(shortcuts.executeSql).toBe("Mod+Shift+Enter");
expect(shortcuts.formatSql).toBe("Shift+Mod+F");
expect(shortcuts.toggleLineComment).toBe("Mod+/");
expect(shortcuts.indentMore).toBe("");
expect(shortcuts.indentLess).toBe("Shift+Tab");
expect(shortcuts.duplicateLine).toBe("Mod+D");
@@ -71,4 +89,12 @@ describe("shortcutRegistry editor actions", () => {
expect(shortcutToCodeMirrorKey("Mod+Plus")).toBe("Mod-+");
expect(shortcutToCodeMirrorKey("Shift+Mod++")).toBe("Shift-Mod-+");
});
it("converts slash shortcuts for CodeMirror keymaps", () => {
expect(shortcutToCodeMirrorKey("Mod+/")).toBe("Mod-/");
});
it("converts multi-stroke shortcuts for CodeMirror keymaps", () => {
expect(shortcutToCodeMirrorKey("Ctrl+K Ctrl+C")).toBe("Ctrl-k Ctrl-c");
});
});