fix(editor): skip right quote on repeated single-quote input

Co-authored-by: zipg <4047349+zipg@users.noreply.github.com>
This commit is contained in:
zipgandzipg authored and GitHub committed 2026-07-09 18:25:27 +08:00
1 parent 5dfefbc0f5
commit 24370135eb
3 files changed
+59 -6

No files matched your search

@@ -0,0 +1,28 @@
import { describe, expect, it } from "vitest";
import { resolveSqlSingleQuoteKeyAction } from "@/lib/sql/sqlQuoteCaret";
describe("resolveSqlSingleQuoteKeyAction", () => {
it("skips over the auto-inserted closing single quote", () => {
expect(resolveSqlSingleQuoteKeyAction({ previousChar: "'", nextChar: "'" })).toBe("skipClosingQuote");
});
it("keeps escaped quote insertion when there is no closing quote to skip", () => {
expect(resolveSqlSingleQuoteKeyAction({ previousChar: "'", nextChar: "" })).toBe("insertEscapedQuote");
});
it("lets CodeMirror handle ordinary single quote input", () => {
expect(resolveSqlSingleQuoteKeyAction({ previousChar: "a", nextChar: "" })).toBe("pass");
});
it("does not skip an existing string opening quote after whitespace", () => {
expect(resolveSqlSingleQuoteKeyAction({ previousChar: " ", nextChar: "'" })).toBe("pass");
});
it("does not skip an existing string opening quote at the start of the document", () => {
expect(resolveSqlSingleQuoteKeyAction({ previousChar: "", nextChar: "'" })).toBe("pass");
});
it("does not intercept input when auto-close brackets is disabled", () => {
expect(resolveSqlSingleQuoteKeyAction({ previousChar: "'", nextChar: "'", autoCloseBrackets: false })).toBe("pass");
});
});
+10
View File
@@ -4,6 +4,16 @@ export interface SqlSingleQuoteCaretOptions {
selectionStart: number | null | undefined;
}
export type SqlSingleQuoteKeyAction = "pass" | "skipClosingQuote" | "insertEscapedQuote";
export function resolveSqlSingleQuoteKeyAction(options: { previousChar?: string; nextChar?: string; autoCloseBrackets?: boolean }): SqlSingleQuoteKeyAction {
const { previousChar = "", nextChar = "", autoCloseBrackets = true } = options;
if (!autoCloseBrackets) return "pass";
if (previousChar === "'" && nextChar === "'") return "skipClosingQuote";
if (previousChar === "'") return "insertEscapedQuote";
return "pass";
}
export function insertedSqlSingleQuoteAtCaret(options: SqlSingleQuoteCaretOptions): boolean {
const { previousValue, nextValue, selectionStart } = options;
if (typeof selectionStart !== "number" || selectionStart < 1) return false;