fix(editor): cache semantic highlight windows

Closes #6936
This commit is contained in:
t8y2 committed 2026-08-22 05:07:09 +00:00
1 parent 6aaac7133f
commit fcb6ea92db
2 files changed
+92 -15

No files matched your search

@@ -4780,34 +4780,86 @@ onMounted(async () => {
// The SQL grammar does not tokenize `//`, so those comments are highlighted by hand. // The SQL grammar does not tokenize `//`, so those comments are highlighted by hand.
queryEditorLineCommentToken(props.databaseType) === "//" ? shellLineCommentHighlightPlugin : [], queryEditorLineCommentToken(props.databaseType) === "//" ? shellLineCommentHighlightPlugin : [],
]; ];
const MAX_SQL_SEMANTIC_HIGHLIGHT_WINDOWS = 32;
buildSqlSemanticHighlightExtension = () => [ buildSqlSemanticHighlightExtension = () => [
ViewPlugin.fromClass( ViewPlugin.fromClass(
class { class {
decorations: import("@codemirror/view").DecorationSet; decorations: import("@codemirror/view").DecorationSet;
private cachedDoc: import("@codemirror/state").Text | null = null;
private cachedSql = "";
private cachedDialectId = "";
private cachedDatabaseType: DatabaseType | undefined;
private cachedWindows: Array<{
from: number;
to: number;
spans: Array<{ start: number; end: number }>;
}> = [];
constructor(currentView: import("@codemirror/view").EditorView) { constructor(currentView: import("@codemirror/view").EditorView) {
this.decorations = this.buildDecorations(currentView); this.decorations = this.buildDecorations(currentView);
} }
update(update: import("@codemirror/view").ViewUpdate) { update(update: import("@codemirror/view").ViewUpdate) {
if (update.docChanged || update.viewportChanged) this.decorations = this.buildDecorations(update.view); if (update.docChanged || update.viewportChanged) this.decorations = this.buildDecorations(update.view);
} }
buildDecorations(currentView: import("@codemirror/view").EditorView) { buildDecorations(currentView: import("@codemirror/view").EditorView) {
const sql = currentView.state.doc.toString();
const dialectId = resolveSqlDialectId({ databaseType: props.databaseType, dialect: sqlBehaviorDialect() }); const dialectId = resolveSqlDialectId({ databaseType: props.databaseType, dialect: sqlBehaviorDialect() });
const windows: Array<{ from: number; to: number }> = []; const doc = currentView.state.doc;
for (const visibleRange of currentView.visibleRanges) { if (this.cachedDoc !== doc || this.cachedDialectId !== dialectId || this.cachedDatabaseType !== props.databaseType) {
const next = expandToSqlStatementWindow(sql, visibleRange.from, visibleRange.to, dialectId); this.cachedDoc = doc;
const previous = windows[windows.length - 1]; this.cachedSql = doc.toString();
if (previous && next.from <= previous.to) previous.to = Math.max(previous.to, next.to); this.cachedDialectId = dialectId;
else windows.push(next); this.cachedDatabaseType = props.databaseType;
this.cachedWindows = [];
} }
const tree = ensureSyntaxTree(currentView.state, windows[windows.length - 1]?.to ?? 0, 25);
if (!tree) return Decoration.set([]); const sql = this.cachedSql;
const ranges = windows.flatMap((window) => const windows: Array<{
sqlSemanticTableNameSpansForSyntaxTree(sql, window, tree, { from: number;
databaseType: props.databaseType, to: number;
dialect: sqlBehaviorDialect(), spans: Array<{ start: number; end: number }>;
}), }> = [];
); const pendingWindows: Array<{ from: number; to: number }> = [];
for (const visibleRange of currentView.visibleRanges) {
const cached = this.cachedWindows.find((candidate) => candidate.from <= visibleRange.from && candidate.to >= visibleRange.to);
if (cached) {
if (!windows.includes(cached)) windows.push(cached);
continue;
}
const next = expandToSqlStatementWindow(sql, visibleRange.from, visibleRange.to, dialectId);
const cachedWindow = this.cachedWindows.find((candidate) => candidate.from <= next.from && candidate.to >= next.to);
if (cachedWindow) {
if (!windows.includes(cachedWindow)) windows.push(cachedWindow);
continue;
}
const previous = pendingWindows[pendingWindows.length - 1];
if (previous && next.from <= previous.to) previous.to = Math.max(previous.to, next.to);
else pendingWindows.push({ ...next });
}
if (pendingWindows.length > 0) {
const tree = ensureSyntaxTree(currentView.state, Math.max(...pendingWindows.map((window) => window.to)), 25);
if (!tree) return Decoration.set([]);
for (const window of pendingWindows) {
const entry = {
...window,
spans: sqlSemanticTableNameSpansForSyntaxTree(sql, window, tree, {
databaseType: props.databaseType,
dialect: sqlBehaviorDialect(),
}),
};
this.cachedWindows.push(entry);
windows.push(entry);
}
if (this.cachedWindows.length > MAX_SQL_SEMANTIC_HIGHLIGHT_WINDOWS) {
this.cachedWindows.splice(0, this.cachedWindows.length - MAX_SQL_SEMANTIC_HIGHLIGHT_WINDOWS);
}
}
const ranges = windows.flatMap((window) => window.spans);
return Decoration.set( return Decoration.set(
ranges.map((range) => ranges.map((range) =>
Decoration.mark({ Decoration.mark({
@@ -0,0 +1,25 @@
import { readFileSync } from "node:fs";
import { describe, expect, it } from "vitest";
import { expandToSqlStatementWindow } from "@/lib/sql/insertValueHints";
const queryEditorSource = readFileSync(new URL("../../../components/editor/QueryEditor.vue", import.meta.url), "utf8");
describe("QueryEditor semantic highlighting while scrolling", () => {
it("recognizes the large single-statement shape from the reported regression", () => {
const sql = `CREATE TABLE [dbo].[code] ([id] int, [label] nvarchar(32));\nINSERT INTO [dbo].[code] ([id], [label]) VALUES\n${Array.from({ length: 240 }, (_, index) => `(${index}, N'row-${String(index).padStart(4, "0")}'),`).join("\n")}`;
const insertStart = sql.indexOf("INSERT");
const window = expandToSqlStatementWindow(sql, insertStart + 80, insertStart + 120, "sqlserver");
expect(window.to - window.from).toBeGreaterThan(2_000);
expect(window.from).toBe(insertStart);
});
it("reuses semantic statement windows across viewport-only updates", () => {
expect(queryEditorSource).toContain('private cachedDoc: import("@codemirror/state").Text | null = null;');
expect(queryEditorSource).toContain("private cachedWindows: Array<{");
expect(queryEditorSource).toContain("const cached = this.cachedWindows.find");
expect(queryEditorSource).toContain("const pendingWindows: Array<{ from: number; to: number }>");
expect(queryEditorSource).toContain("MAX_SQL_SEMANTIC_HIGHLIGHT_WINDOWS = 32");
expect(queryEditorSource).toContain("this.cachedWindows.splice(0, this.cachedWindows.length - MAX_SQL_SEMANTIC_HIGHLIGHT_WINDOWS)");
});
});