25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(editor): confirm first keyword completion on Space for SQL Server
lxk955b72f03e60e54
diff --git a/apps/desktop/src/components/editor/__tests__/useQueryEditorCompletionKeys.spec.ts b/apps/desktop/src/components/editor/__tests__/useQueryEditorCompletionKeys.spec.tsindex c1473e6c94..e84b5f9b7e 100644--- a/apps/desktop/src/components/editor/__tests__/useQueryEditorCompletionKeys.spec.ts+++ b/apps/desktop/src/components/editor/__tests__/useQueryEditorCompletionKeys.spec.ts@@ -200,6 +200,29 @@ describe("QueryEditor completion-key ownership", () => {expect(view.state.selection.main.head).toBe(6);});+ it("accepts the first unselected keyword completion on Space in SQL Server", () => {+ const { keys, view, runtime, status, accept } = createHarness({ modelValue: "select", databaseType: "sqlserver" });+ view.dispatch({ selection: { anchor: 6 } });+ status.mockReturnValue("active");+ runtime.codeMirrorSelectedCompletion = () => null;+ runtime.codeMirrorCurrentCompletions = () => [{ label: "SELECT", type: "keyword" }];+ runtime.codeMirrorSelectFirstCompletion = vi.fn(() => {+ runtime.codeMirrorSelectedCompletionIndex = () => 0;+ runtime.codeMirrorSelectedCompletion = () => ({ label: "SELECT", type: "keyword" });+ return true;+ });+ accept.mockImplementation((currentView: EditorView) => {+ currentView.dispatch({ changes: { from: 0, to: 6, insert: "SELECT" }, selection: { anchor: 6 } });+ return true;+ });++ expect(keys.handleSpace(view)).toBe(true);+ expect(runtime.codeMirrorSelectFirstCompletion).toHaveBeenCalledOnce();+ expect(accept).toHaveBeenCalledOnce();+ expect(view.state.doc.toString()).toBe("SELECT ");+ expect(view.state.selection.main.head).toBe(7);+ });+it("accepts snippet completion on Tab when snippetTriggerKey is tab or both", () => {const { keys, view, status, runtime, accept } = createHarness();status.mockReturnValue("active");diff --git a/apps/desktop/src/components/editor/useQueryEditorCompletionKeys.ts b/apps/desktop/src/components/editor/useQueryEditorCompletionKeys.tsindex b70560da4d..05e18ee1ae 100644--- a/apps/desktop/src/components/editor/useQueryEditorCompletionKeys.ts+++ b/apps/desktop/src/components/editor/useQueryEditorCompletionKeys.ts@@ -181,11 +181,13 @@ export function useQueryEditorCompletionKeys(options: QueryEditorCompletionKeysO// A non-empty selection belongs to block editing, not word completion.if (!view.state.selection.main.empty) return false;const selected = codeMirrorRuntime.codeMirrorSelectedCompletion?.(view.state) as QueryCompletionOption | null | undefined;- const completionType = selected?.type;+ const target = selected ?? getTargetCompletion(view);+ const completionType = target?.type;if (completionType !== "keyword" && completionType !== "table" && completionType !== "column") return false;// Batch-selection rows own Space for checkbox toggling; this Prec.highest binding outranks their keymap.- if (selected?.dbxBatchColumnSelection || selected?.dbxBatchColumnSelectionAction) return false;- if (!(codeMirrorRuntime.codeMirrorAcceptCompletion?.(view) ?? false)) return false;+ if (target?.dbxBatchColumnSelection || target?.dbxBatchColumnSelectionAction) return false;+ const accepted = selected ? (codeMirrorRuntime.codeMirrorAcceptCompletion?.(view) ?? false) : acceptSelectedOrFirstCompletion(view, codeMirrorRuntime.codeMirrorAcceptCompletion, codeMirrorRuntime.codeMirrorSelectedCompletionIndex, codeMirrorRuntime.codeMirrorSelectFirstCompletion);+ if (!accepted) return false;const selection = view.state.selection.main;if (!selection.empty) return true;diff --git a/apps/desktop/src/lib/__tests__/editor/queryEditorCompletionKeymap.spec.ts b/apps/desktop/src/lib/__tests__/editor/queryEditorCompletionKeymap.spec.tsindex b4ee71cb39..087e3b76d9 100644--- a/apps/desktop/src/lib/__tests__/editor/queryEditorCompletionKeymap.spec.ts+++ b/apps/desktop/src/lib/__tests__/editor/queryEditorCompletionKeymap.spec.ts@@ -69,6 +69,7 @@ function createHarness(options: {databaseType?: string;completionStatus: (state: MockState) => "active" | "pending" | null;selectedCompletion?: (state: MockState) => { type?: string } | null;+ currentCompletions?: (state: MockState) => { type?: string }[];acceptCompletion?: (view: MockView) => boolean;selectedCompletionIndex?: (state: MockState) => number | null;selectFirstCompletion?: (view: MockView) => boolean;@@ -117,6 +118,7 @@ function createHarness(options: {const factory = new Function("codeMirrorCompletionStatus","codeMirrorSelectedCompletion",+ "codeMirrorCurrentCompletions","isBatchColumnSelectionCompletionActive","codeMirrorAcceptCompletion","codeMirrorSelectedCompletionIndex",@@ -139,6 +141,7 @@ function createHarness(options: {return factory(options.completionStatus,options.selectedCompletion ?? (() => ({ type: "column" })),+ options.currentCompletions ?? (() => undefined),(status: "active" | "pending" | null) => status === "active",options.acceptCompletion ?? (() => false),options.selectedCompletionIndex ?? (() => 0),@@ -658,4 +661,47 @@ describe("QueryEditor SQL Server completion Space keymap", () => {expect(harness.acceptSqlServerCompletionOnSpace(createView())).toBe(false);expect(acceptCompletion).not.toHaveBeenCalled();});++ it("accepts the first unselected keyword completion on Space", () => {+ const acceptCompletion = vi.fn(() => true);+ const selectFirstCompletion = vi.fn(() => true);+ const harness = createHarness({+ databaseType: "sqlserver",+ completionStatus: () => "active",+ selectedCompletion: () => null,+ currentCompletions: () => [{ type: "keyword" }],+ selectedCompletionIndex: () => null,+ selectFirstCompletion,+ acceptCompletion,+ });+ const view = createView("select");++ expect(harness.acceptSqlServerCompletionOnSpace(view)).toBe(true);+ expect(selectFirstCompletion).toHaveBeenCalledWith(view);+ expect(acceptCompletion).toHaveBeenCalledWith(view);+ expect(view.dispatch).toHaveBeenCalledWith({+ changes: { from: 6, insert: " " },+ selection: { anchor: 7 },+ scrollIntoView: true,+ });+ });++ it("does not accept on Space when the first unselected completion is not a keyword/table/column", () => {+ const acceptCompletion = vi.fn(() => true);+ const selectFirstCompletion = vi.fn(() => true);+ const harness = createHarness({+ databaseType: "sqlserver",+ completionStatus: () => "active",+ selectedCompletion: () => null,+ currentCompletions: () => [{ type: "function" }],+ selectedCompletionIndex: () => null,+ selectFirstCompletion,+ acceptCompletion,+ });+ const view = createView("count");++ expect(harness.acceptSqlServerCompletionOnSpace(view)).toBe(false);+ expect(selectFirstCompletion).not.toHaveBeenCalled();+ expect(acceptCompletion).not.toHaveBeenCalled();+ });});