feat(sql-library): show matching line snippets with jump in search

This commit is contained in:
lxk955 authored and GitHub committed 2026-10-01 23:47:24 +08:00
1 parent eeeb67e62c
commit 51f9dfc854
19 files changed
+686 -106

No files matched your search

@@ -0,0 +1,69 @@
import { createPinia, setActivePinia } from "pinia";
import { beforeEach, describe, expect, it, vi } from "vitest";
import { useQueryStore } from "@/stores/queryStore";
import type { SavedSqlFile } from "@/types/database";
const savedFile: SavedSqlFile = {
id: "saved-sql-reveal-1",
connectionId: "conn-1",
database: "main",
name: "query.sql",
sql: "SELECT 1;\nSELECT 2;\nSELECT 3;",
sqlLoaded: true,
createdAt: "2026-10-01T00:00:00.000Z",
updatedAt: "2026-10-01T00:00:00.000Z",
};
function installLocalStorage() {
const data = new Map<string, string>();
vi.stubGlobal("localStorage", {
getItem: (key: string) => data.get(key) ?? null,
setItem: (key: string, value: string) => data.set(key, value),
removeItem: (key: string) => data.delete(key),
});
}
describe("queryStore openSavedSql with reveal", () => {
beforeEach(() => {
vi.clearAllMocks();
vi.unstubAllGlobals();
installLocalStorage();
setActivePinia(createPinia());
});
it("sets editorRevealRequest when opening a new tab with reveal", () => {
const store = useQueryStore();
const tabId = store.openSavedSql(savedFile, {
reveal: { line: 2, column: 5 },
});
const tab = store.tabs.find((t) => t.id === tabId);
expect(tab).toBeDefined();
expect(tab?.editorRevealRequest).toEqual(
expect.objectContaining({
line: 2,
column: 5,
}),
);
expect(tab?.editorRevealRequest?.id).toBeGreaterThan(0);
});
it("updates editorRevealRequest when focusing an existing tab with reveal", () => {
const store = useQueryStore();
const tabId = store.openSavedSql(savedFile);
const tab = store.tabs.find((t) => t.id === tabId)!;
expect(tab.editorRevealRequest).toBeUndefined();
// Reopen same file with reveal
store.openSavedSql(savedFile, {
reveal: { line: 3, column: 1 },
});
expect(tab.editorRevealRequest).toEqual(
expect.objectContaining({
line: 3,
column: 1,
}),
);
});
});
+6 -1
View File
@@ -212,8 +212,9 @@ interface BuildQueryResultExportRequestOptions {
insertMode?: SqlInsertMode;
}
interface OpenSavedSqlOptions {
export interface OpenSavedSqlOptions {
targetMode?: SavedSqlOpenTargetMode;
reveal?: { line: number; column?: number };
}
interface OpenObjectSourceTabOptions {
@@ -5432,6 +5433,9 @@ export const useQueryStore = defineStore("query", () => {
existing.editorViewport = restored.viewport;
}
applySavedSqlExecutionTarget(existing, target);
if (options.reveal) {
existing.editorRevealRequest = { id: ++contentRevealSeq, line: options.reveal.line, column: options.reveal.column };
}
switchTab(existing.id);
return existing.id;
}
@@ -5455,6 +5459,7 @@ export const useQueryStore = defineStore("query", () => {
isExplaining: false,
mode: "query",
autoCommit: defaultAutoCommitForDbTypeWithSetting(dbType),
editorRevealRequest: options.reveal ? { id: ++contentRevealSeq, line: options.reveal.line, column: options.reveal.column } : undefined,
editorSelection: restoredPosition.selection,
editorViewport: restoredPosition.viewport,
};
+11 -2
View File
@@ -690,8 +690,9 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
}
}
async function syncEntries() {
if (files.value.some((file) => file.sqlLoaded === false)) {
async function ensureAllFilesLoaded() {
if (!files.value.some((file) => file.sqlLoaded === false)) return;
try {
const loadedFiles = await api.loadSavedSqlFilesForSync();
const loadedById = new Map(loadedFiles.map((file) => [file.id, file]));
files.value = files.value.map((file) => {
@@ -700,7 +701,14 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
return loaded ? { ...file, sql: loaded.sql, sqlLoaded: true } : file;
});
bumpVersion();
} catch {
const unloaded = files.value.filter((file) => file.sqlLoaded === false);
await Promise.allSettled(unloaded.map((file) => ensureFileContent(file.id)));
}
}
async function syncEntries() {
await ensureAllFilesLoaded();
const folderById = new Map(folders.value.map((folder) => [folder.id, folder]));
const folderPath = (folderId?: string): string | undefined => {
@@ -941,6 +949,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
listFiles,
getFile,
ensureFileContent,
ensureAllFilesLoaded,
createFolder,
renameFolder,
deleteFolder,