diffing 0.10.5 → 0.11.0

package/dist/{settings-bwe7yQ8U.mjs → search-BMPY_ZW8.mjs}

@@ -1,16 +1,15 @@
 import { d as getProjectStorageDir, p as getRepoRoot } from "./git-Czo96ymM.mjs";
 import { join } from "node:path";
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
+import { mkdirSync } from "node:fs";
 //#region src/lib/symbols.ts
 const SYMBOL_PATTERNS = [
 	{
-		pattern: /^\s*(?:export\s+)?(?:async\s+)?function\s+(\w[\w$]*)\s*[<(]/i,
+		pattern: /^\s*(?:(?:export|declare)\s+)*(?:default\s+)?(?:async\s+)?function\s+(\w[\w$]*)\s*[<(]/i,
 		kind: "function",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:export\s+)?(?:const|let|var)\s+(\w[\w$]*)\s*=\s*(?:async\s*)?\(/i,
+		pattern: /^\s*(?:export\s+)?(?:const|let|var)\s+(\w[\w$]*)\s*=\s*(?:async\s*)?(?:\([^)]*\)|\w[\w$]*)\s*=>/i,
 		kind: "function",
 		nameGroup: 1
 	},
@@ -20,58 +19,93 @@ const SYMBOL_PATTERNS = [
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:export\s+)?class\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:(?:export|declare)\s+)*(?:default\s+)?(?:abstract\s+)?class\s+(\w[\w$]*)/i,
 		kind: "class",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:export\s+)?interface\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:(?:export|declare)\s+)*interface\s+(\w[\w$]*)/i,
 		kind: "interface",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:export\s+)?type\s+(\w[\w$]*)\s*=/i,
+		pattern: /^\s*(?:(?:export|declare)\s+)*type\s+(\w[\w$]*)\s*=/i,
 		kind: "type",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:export\s+)?enum\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:(?:export|declare)\s+)*(?:const\s+)?enum\s+(\w[\w$]*)/i,
 		kind: "enum",
 		nameGroup: 1
 	},
+	{
+		pattern: /^\s*(?:(?:export|declare)\s+)*namespace\s+(\w[\w$]*)/i,
+		kind: "namespace",
+		nameGroup: 1
+	},
 	{
 		pattern: /^\s*(?:export\s+)?(?:const|let|var)\s+(\w[\w$]*)\s*=/i,
 		kind: "variable",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*def\s+(\w[\w$]*)\s*\(/i,
+		pattern: /^\s*(?!(?:if|for|while|switch|catch)\b)(?:(?:public|private|protected|static|async|abstract|readonly|override|get|set)\s+)*(\w[\w$]*)\s*(?:<[^>]+>)?\s*\([^)]*\)\s*(?:\{|:[^={]+[;{])/i,
+		kind: "method",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:async\s+)?def\s+(\w[\w$]*)\s*\(/i,
 		kind: "function",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:pub(?:\s*\(\w+\))?\s+)?fn\s+(\w[\w$]*)\s*[<(]/i,
+		pattern: /^\s*class\s+(\w[\w$]*)\s*(?:\(|:)/i,
+		kind: "class",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?(?:(?:async|const|unsafe)\s+|extern(?:\s+"[^"]+")?\s+)*fn\s+(\w[\w$]*)\s*[<(]/i,
 		kind: "function",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:pub(?:\s*\(\w+\))?\s+)?struct\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?struct\s+(\w[\w$]*)/i,
 		kind: "struct",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:pub(?:\s*\(\w+\))?\s+)?enum\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?enum\s+(\w[\w$]*)/i,
 		kind: "enum",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:pub(?:\s*\(\w+\))?\s+)?impl\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?trait\s+(\w[\w$]*)/i,
+		kind: "trait",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?(?:type|mod)\s+(\w[\w$]*)/i,
+		kind: "type",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?impl(?:<[^>]+>)?\s+[^\s]+\s+for\s+(\w[\w$]*)/i,
 		kind: "impl",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:pub(?:\s*\(\w+\))?\s+)?trait\s+(\w[\w$]*)/i,
-		kind: "trait",
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?impl(?:<[^>]+>)?\s+(\w[\w$]*)/i,
+		kind: "impl",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?(?:const|static)\s+(\w[\w$]*)\s*[:=]/i,
+		kind: "variable",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*func\s+\([^)]*\)\s+(\w[\w$]*)\s*\(/i,
+		kind: "method",
 		nameGroup: 1
 	},
 	{
@@ -80,9 +114,14 @@ const SYMBOL_PATTERNS = [
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:func\s+)?\((\w[\w$]*)\s+\*?\w+\)\s+(\w[\w$]*)\s*\(/i,
-		kind: "method",
-		nameGroup: 2
+		pattern: /^\s*type\s+(\w[\w$]*)\s+(?:struct|interface|=)/i,
+		kind: "type",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:var|const)\s+(\w[\w$]*)\b/i,
+		kind: "variable",
+		nameGroup: 1
 	}
 ];
 /**
@@ -206,10 +245,13 @@ async function searchFiles(query, opts = {}) {
 		error: res.error
 	};
 	const items = [];
+	let filteredTotal = 0;
 	const { items: raw, scores } = res.value;
-	for (let i = 0; i < raw.length && items.length < limit; i++) {
+	for (let i = 0; i < raw.length; i++) {
 		const it = raw[i];
 		if (pathSet && !pathSet.has(it.relativePath)) continue;
+		filteredTotal++;
+		if (items.length >= limit) continue;
 		const score = scores[i];
 		items.push({
 			path: it.relativePath,
@@ -222,7 +264,7 @@ async function searchFiles(query, opts = {}) {
 	return {
 		scope: "files",
 		items,
-		total: res.value.totalMatched,
+		total: pathSet ? filteredTotal : res.value.totalMatched,
 		indexing: isIndexing(f)
 	};
 }
@@ -259,15 +301,17 @@ async function searchContent(query, opts = {}) {
 		error: res.error
 	};
 	const items = [];
+	let filteredTotal = 0;
 	for (const m of res.value.items) {
-		if (items.length >= limit) break;
 		if (pathSet && !pathSet.has(m.relativePath)) continue;
+		filteredTotal++;
+		if (items.length >= limit) continue;
 		items.push(toContentHit(m));
 	}
 	return {
 		scope: "text",
 		items,
-		total: res.value.totalMatched,
+		total: pathSet ? filteredTotal : res.value.totalMatched,
 		indexing: isIndexing(f),
 		regexError: res.value.regexFallbackError || void 0
 	};
@@ -318,8 +362,8 @@ async function searchSymbols(query, opts = {}) {
 	const items = [];
 	const ql = query.toLowerCase();
 	const seen = /* @__PURE__ */ new Set();
+	let total = 0;
 	for (const m of res.value.items) {
-		if (items.length >= limit) break;
 		if (pathSet && !pathSet.has(m.relativePath)) continue;
 		const sym = classifySymbolLine(m.lineContent);
 		if (!sym) continue;
@@ -327,6 +371,8 @@ async function searchSymbols(query, opts = {}) {
 		const key = `${m.relativePath}:${m.lineNumber}:${sym.name}`;
 		if (seen.has(key)) continue;
 		seen.add(key);
+		total++;
+		if (items.length >= limit) continue;
 		const nameIdx = m.lineContent.indexOf(sym.name);
 		const matchRanges = nameIdx >= 0 ? [[nameIdx, nameIdx + sym.name.length]] : m.matchRanges ?? [];
 		items.push({
@@ -343,7 +389,7 @@ async function searchSymbols(query, opts = {}) {
 	return {
 		scope: "symbols",
 		items,
-		total: items.length,
+		total,
 		indexing: isIndexing(f)
 	};
 }
@@ -363,30 +409,57 @@ async function searchAll(query, opts = {}) {
 			limit
 		})
 	]);
-	const items = [];
-	for (const hit of filesRes.items) items.push({
+	return mergeSearchResponses(filesRes, contentRes, symbolsRes, limit);
+}
+/** Merge the three engines into the All scope without duplicating definition
+* lines as both Symbol and Text rows. Exported to keep the result contract
+* independently testable without loading the native fff addon. */
+function mergeSearchResponses(filesRes, contentRes, symbolsRes, limit = DEFAULT_LIMIT) {
+	const boundedLimit = clampLimit(limit);
+	const fileItems = filesRes.items.map((hit) => ({
 		kind: "file",
 		hit
+	}));
+	const symbolLocations = /* @__PURE__ */ new Set();
+	const symbolItems = symbolsRes.items.map((hit) => {
+		symbolLocations.add(`${hit.path}:${hit.line}`);
+		return {
+			kind: "symbol",
+			hit
+		};
 	});
-	for (const hit of symbolsRes.items) items.push({
-		kind: "symbol",
-		hit
-	});
-	for (const hit of contentRes.items) items.push({
-		kind: "text",
-		hit
-	});
-	const total = (filesRes.total || 0) + (contentRes.total || 0) + (symbolsRes.total || 0);
-	const indexing = filesRes.indexing || contentRes.indexing || symbolsRes.indexing;
-	const error = filesRes.error || contentRes.error || symbolsRes.error;
-	const regexError = contentRes.regexError;
+	const textItems = [];
+	for (const hit of contentRes.items) {
+		if (symbolLocations.has(`${hit.path}:${hit.line}`)) continue;
+		textItems.push({
+			kind: "text",
+			hit
+		});
+	}
+	const items = [];
+	const groups = [
+		fileItems,
+		symbolItems,
+		textItems
+	];
+	for (let row = 0; items.length < boundedLimit; row++) {
+		let appended = false;
+		for (const group of groups) {
+			const item = group[row];
+			if (!item) continue;
+			items.push(item);
+			appended = true;
+			if (items.length === boundedLimit) break;
+		}
+		if (!appended) break;
+	}
 	return {
 		scope: "all",
-		items: items.slice(0, limit),
-		total,
-		indexing,
-		error,
-		regexError
+		items,
+		total: (filesRes.total || 0) + (contentRes.total || 0),
+		indexing: filesRes.indexing || contentRes.indexing || symbolsRes.indexing,
+		error: filesRes.error || contentRes.error || symbolsRes.error,
+		regexError: contentRes.regexError
 	};
 }
 async function getSearchStatus() {
@@ -422,57 +495,4 @@ async function trackSelection(query, path) {
 	} catch {}
 }
 //#endregion
-//#region src/lib/settings.ts
-const CONFIG_DIR = join(homedir(), ".config", "diffing");
-const SETTINGS_FILE = join(CONFIG_DIR, "settings.json");
-const DEFAULTS = {
-	staged: true,
-	untracked: true,
-	diffStyle: "split",
-	defaultTabSize: 4,
-	theme: "rose-pine",
-	editorIDE: "default",
-	lineDiffType: "word",
-	lineWrap: false,
-	diffIndicators: "classic",
-	showLineNumbers: true,
-	hunkSeparators: "line-info",
-	lineHoverHighlight: "both",
-	fontSize: 13,
-	expandContextByDefault: false,
-	collapsedContextThreshold: 10,
-	expansionLineCount: 20,
-	haptics: true,
-	sounds: true,
-	uiFont: null,
-	monoFont: null,
-	density: "comfortable",
-	autoCollapseLineThreshold: 400,
-	requireViewAllBeforeSend: false,
-	showStatusBar: true,
-	savedReplies: [],
-	ignoreSpaceChange: false,
-	ignoreAllSpace: false
-};
-function loadSettings() {
-	try {
-		const data = readFileSync(SETTINGS_FILE, "utf-8");
-		return {
-			...DEFAULTS,
-			...JSON.parse(data)
-		};
-	} catch {
-		return { ...DEFAULTS };
-	}
-}
-function saveSettings(settings) {
-	const merged = {
-		...loadSettings(),
-		...settings
-	};
-	mkdirSync(CONFIG_DIR, { recursive: true });
-	writeFileSync(SETTINGS_FILE, JSON.stringify(merged, null, 2));
-	return merged;
-}
-//#endregion
-export { searchContent as a, trackSelection as c, searchAll as i, saveSettings as n, searchFiles as o, getSearchStatus as r, searchSymbols as s, loadSettings as t };
+export { searchFiles as a, searchContent as i, mergeSearchResponses as n, searchSymbols as o, searchAll as r, trackSelection as s, getSearchStatus as t };

package/dist/search-BO9Im7eu.mjs

@@ -0,0 +1,2 @@
+import { a as searchFiles, i as searchContent, o as searchSymbols, r as searchAll, s as trackSelection } from "./search-BMPY_ZW8.mjs";
+export { searchAll, searchContent, searchFiles, searchSymbols, trackSelection };