react-doctor 0.7.6-dev.3f22fe3 → 0.7.6-dev.4fb3694

package/dist/lsp.js

@@ -33194,15 +33194,13 @@ const listSourceFilesViaFilesystem = (rootDirectory) => {
 const listSourceFilesWithSize = (rootDirectory) => collectSizedSourceFiles(rootDirectory, (listSourceFilesViaGit(rootDirectory) ?? listSourceFilesViaFilesystem(rootDirectory)).sort());
 const listSourceFiles = (rootDirectory) => listSourceFilesWithSize(rootDirectory).map((entry) => entry.path);
 const countSourceFiles = (rootDirectory) => listSourceFilesWithSize(rootDirectory).length;
-const UTF8_BOM_CHARACTER = "";
-const stripUtf8Bom = (content) => content.startsWith(UTF8_BOM_CHARACTER) ? content.slice(1) : content;
 const cachedPackageJsons = /* @__PURE__ */ new Map();
 const clearPackageJsonCache = () => {
 	cachedPackageJsons.clear();
 };
 const readPackageJsonUncached = (packageJsonPath) => {
 	try {
-		return JSON.parse(stripUtf8Bom(NFS.readFileSync(packageJsonPath, "utf-8")));
+		return JSON.parse(NFS.readFileSync(packageJsonPath, "utf-8"));
 	} catch (error) {
 		if (error instanceof SyntaxError) return {};
 		if (isErrnoException(error)) {
@@ -36344,49 +36342,6 @@ const assignFixGroups = (diagnostics) => {
 		};
 	});
 };
-const DERIVED_STATE_RULE_PRIORITY = new Map([
-	["no-initialize-state", 0],
-	["no-adjust-state-on-prop-change", 1],
-	["no-derived-state", 2],
-	["no-derived-state-effect", 3]
-]);
-const buildDiagnosticSiteKey = (diagnostic) => `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}`;
-const isReactDoctorRulesOfHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-doctor" && diagnostic.rule === "rules-of-hooks";
-const isReactCompilerHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-hooks-js" && diagnostic.rule === "hooks";
-const doDiagnosticSpansOverlap = (first, second) => {
-	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
-	if (first.offset !== void 0 && second.offset !== void 0) {
-		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
-		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
-		return first.offset < secondEnd && second.offset < firstEnd;
-	}
-	const firstEndLine = first.endLine ?? first.line;
-	const secondEndLine = second.endLine ?? second.line;
-	return first.line <= secondEndLine && second.line <= firstEndLine;
-};
-const keepHighestSeverity = (survivingDiagnostic, collapsedDiagnostic) => collapsedDiagnostic.severity === "error" && survivingDiagnostic.severity !== "error" ? {
-	...survivingDiagnostic,
-	severity: "error"
-} : survivingDiagnostic;
-const dedupeRelatedDiagnostics = (diagnostics) => {
-	const reactDoctorHookSites = new Set(diagnostics.filter(isReactDoctorRulesOfHooksDiagnostic).map(buildDiagnosticSiteKey));
-	const uniqueDiagnostics = [];
-	for (const diagnostic of diagnostics) {
-		if (isReactCompilerHooksDiagnostic(diagnostic) && reactDoctorHookSites.has(buildDiagnosticSiteKey(diagnostic))) continue;
-		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
-		if (priority !== void 0) {
-			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
-			if (overlappingDiagnosticIndex >= 0) {
-				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
-				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
-				if (existingDiagnostic && existingPriority !== void 0) uniqueDiagnostics[overlappingDiagnosticIndex] = priority < existingPriority ? keepHighestSeverity(diagnostic, existingDiagnostic) : keepHighestSeverity(existingDiagnostic, diagnostic);
-				continue;
-			}
-		}
-		uniqueDiagnostics.push(diagnostic);
-	}
-	return uniqueDiagnostics;
-};
 const compareStrings = (left, right) => left < right ? -1 : left > right ? 1 : 0;
 const sortDiagnosticsStable = (diagnostics) => [...diagnostics].sort((left, right) => compareStrings(left.filePath, right.filePath) || left.line - right.line || left.column - right.column || compareStrings(left.plugin, right.plugin) || compareStrings(left.rule, right.rule) || compareStrings(left.severity, right.severity) || compareStrings(left.message, right.message));
 const getDirectDependencyNames = (packageJson) => new Set([...Object.keys(packageJson.dependencies ?? {}), ...Object.keys(packageJson.devDependencies ?? {})]);
@@ -36812,6 +36767,7 @@ const PNPM_WORKSPACE_FILE = "pnpm-workspace.yaml";
 const PNPM_LOCKFILE = "pnpm-lock.yaml";
 const PACKAGE_JSON_FILE = "package.json";
 const PNPM_HARDENING_RULE_KEY = "require-pnpm-hardening";
+const UTF8_BOM_CHAR = "";
 const HARDENING_SETTING_KEYS = new Set([
 	"minimumReleaseAge",
 	"blockExoticSubdeps",
@@ -36836,11 +36792,12 @@ const stripInlineComment = (rawValue) => {
 	return rawValue;
 };
 const unquote = (rawValue) => rawValue.replace(/^["']|["']$/g, "");
+const stripBom = (rawContent) => rawContent.startsWith(UTF8_BOM_CHAR) ? rawContent.slice(1) : rawContent;
 const parseHardeningSettings = (content) => {
 	let minimumReleaseAge = null;
 	let blockExoticSubdeps = null;
 	let trustPolicy = null;
-	const lines = stripUtf8Bom(content).split(/\r?\n/);
+	const lines = stripBom(content).split(/\r?\n/);
 	for (let lineIndex = 0; lineIndex < lines.length; lineIndex += 1) {
 		const lineText = lines[lineIndex];
 		if (lineText === void 0) continue;
@@ -36874,7 +36831,7 @@ const isPnpmManagedProject = (rootDirectory) => {
 	const packageJsonPath = Path.join(rootDirectory, PACKAGE_JSON_FILE);
 	if (!isFile(packageJsonPath)) return false;
 	try {
-		const packageJsonRaw = stripUtf8Bom(NFS.readFileSync(packageJsonPath, "utf-8"));
+		const packageJsonRaw = NFS.readFileSync(packageJsonPath, "utf-8");
 		const packageJson = JSON.parse(packageJsonRaw);
 		if (packageJson !== null && typeof packageJson === "object" && "packageManager" in packageJson && typeof packageJson.packageManager === "string" && packageJson.packageManager.startsWith("pnpm@")) return true;
 	} catch {
@@ -38600,7 +38557,6 @@ const parseGithubViewerPermission = (stdout) => {
 	return /^[A-Z_]+$/.test(value) ? value.toLowerCase() : null;
 };
 const splitNullSeparated = (value) => value.split("\0").filter((entry) => entry.length > 0);
-const UNTRACKED_FILE_LAST_LINE = Number.MAX_SAFE_INTEGER;
 /**
 * `Git` wraps every `git`-via-subprocess call react-doctor makes
 * behind a `Context.Service`. The production layer (`layerNode`)
@@ -38671,14 +38627,6 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			args,
 			directory
 		});
-		const listUntrackedFilePaths = (directory, includePaths = []) => runGit(directory, [
-			"ls-files",
-			"-z",
-			"--others",
-			"--exclude-standard",
-			...includePaths.length > 0 ? ["--", ...includePaths] : []
-		]).pipe(map$3((result) => result.status === 0 ? splitNullSeparated(result.stdout) : null));
-		const mergeUntracked = (directory, trackedFilePaths, includeUntracked) => includeUntracked ? listUntrackedFilePaths(directory).pipe(map$3((untracked) => untracked === null ? trackedFilePaths : [...new Set([...trackedFilePaths, ...untracked])])) : succeed$2(trackedFilePaths);
 		const currentBranch = (directory) => runGit(directory, [
 			"rev-parse",
 			"--abbrev-ref",
@@ -38801,7 +38749,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			githubViewerPermission,
 			branchExists,
 			mergeBase,
-			diffSelection: ({ directory, explicitBaseBranch, includeUntracked = false }) => gen(function* () {
+			diffSelection: ({ directory, explicitBaseBranch }) => gen(function* () {
 				if (explicitBaseBranch !== void 0 && explicitBaseBranch.trim().length === 0) return yield* fail$4(new ReactDoctorError({ reason: new GitBaseBranchInvalid({ detail: "Diff base branch cannot be empty." }) }));
 				if (explicitBaseBranch !== void 0) {
 					const range = parseGitDiffRange(explicitBaseBranch);
@@ -38830,7 +38778,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 						"HEAD"
 					]);
 					if (uncommitted.status !== 0) return null;
-					const files = yield* mergeUntracked(directory, splitNullSeparated(uncommitted.stdout), includeUntracked);
+					const files = splitNullSeparated(uncommitted.stdout);
 					if (files.length === 0) return null;
 					return {
 						currentBranch: resolvedCurrentBranch,
@@ -38860,7 +38808,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					currentBranch: resolvedCurrentBranch,
 					baseBranch,
 					diffBaseRef: mergeBaseRef,
-					changedFiles: yield* mergeUntracked(directory, splitNullSeparated(diff.stdout), includeUntracked),
+					changedFiles: splitNullSeparated(diff.stdout),
 					isCurrentChanges: false
 				};
 			}).pipe(withSpan("Git.diffSelection")),
@@ -38906,7 +38854,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					stdout: result.stdout
 				};
 			}).pipe(withSpan("Git.grep")),
-			changedLineRanges: ({ directory, baseRef, cached, files, includeUntracked = false }) => gen(function* () {
+			changedLineRanges: ({ directory, baseRef, cached, files }) => gen(function* () {
 				if (files.length === 0) return [];
 				if (baseRef !== void 0 && !isSafeGitRevision(baseRef)) return null;
 				const result = yield* runGit(directory, [
@@ -38920,14 +38868,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					...files
 				]);
 				if (result.status !== 0) return null;
-				const changedLineRanges = parseChangedLineRanges(result.stdout);
-				if (cached || !includeUntracked) return changedLineRanges;
-				const untrackedFilePaths = yield* listUntrackedFilePaths(directory, files);
-				if (untrackedFilePaths === null) return changedLineRanges;
-				return [...changedLineRanges, ...untrackedFilePaths.map((file) => ({
-					file,
-					ranges: [[1, UNTRACKED_FILE_LAST_LINE]]
-				}))];
+				return parseChangedLineRanges(result.stdout);
 			}).pipe(catch_$1((error) => error.reason._tag === "GitInvocationFailed" ? succeed$2(null) : fail$4(error)), withSpan("Git.changedLineRanges"))
 		});
 	})).pipe(provide$2(layer$2.pipe(provide$2(mergeAll$1(layer$1, layer)))));
@@ -39512,13 +39453,13 @@ const encodeSidecarFileEntry = (entry) => ({
 	diagnostics: entry.diagnostics
 });
 const emptyCache = () => ({
-	version: 2,
+	version: 1,
 	rulesets: {}
 });
 const loadRulesetEntries = (cacheFilePath, rulesetHash) => {
 	const entries = /* @__PURE__ */ new Map();
 	const persisted = failOpenReadJson(cacheFilePath, emptyCache());
-	if (persisted.version !== 2 || !isRecord(persisted.rulesets)) return entries;
+	if (persisted.version !== 1 || !isRecord(persisted.rulesets)) return entries;
 	const bucket = persisted.rulesets[rulesetHash];
 	if (!isRecord(bucket) || !isRecord(bucket.files)) return entries;
 	for (const [fileKey, rawEntry] of Object.entries(bucket.files)) {
@@ -39538,7 +39479,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 		},
 		persist: () => {
 			const onDisk = failOpenReadJson(cacheFilePath, emptyCache());
-			const rulesets = onDisk.version === 2 && isRecord(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
+			const rulesets = onDisk.version === 1 && isRecord(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
 			const existingBucket = rulesets[rulesetHash];
 			const existingFiles = isRecord(existingBucket) && isRecord(existingBucket.files) ? existingBucket.files : {};
 			const ourFiles = {};
@@ -39552,7 +39493,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 				files: Object.fromEntries(cappedEntries)
 			};
 			atomicWriteJson(cacheFilePath, {
-				version: 2,
+				version: 1,
 				rulesets: Object.fromEntries(Object.entries(rulesets).filter(([, bucket]) => isRecord(bucket) && typeof bucket.updatedAtMs === "number").sort(([, first], [, second]) => second.updatedAtMs - first.updatedAtMs).slice(0, 8))
 			});
 		}
@@ -39603,6 +39544,23 @@ const resolveTsConfigRelativePath = (rootDirectory) => {
 	for (const filename of TSCONFIG_FILENAMES) if (NFS.existsSync(Path.join(rootDirectory, filename))) return `./${filename}`;
 	return null;
 };
+const DERIVED_STATE_RULE_PRIORITY = new Map([
+	["no-initialize-state", 0],
+	["no-adjust-state-on-prop-change", 1],
+	["no-derived-state", 2],
+	["no-derived-state-effect", 3]
+]);
+const doDiagnosticSpansOverlap = (first, second) => {
+	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
+	if (first.offset !== void 0 && second.offset !== void 0) {
+		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
+		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
+		return first.offset < secondEnd && second.offset < firstEnd;
+	}
+	const firstEndLine = first.endLine ?? first.line;
+	const secondEndLine = second.endLine ?? second.line;
+	return first.line <= secondEndLine && second.line <= firstEndLine;
+};
 const dedupeDiagnostics = (diagnostics) => {
 	const seenKeys = /* @__PURE__ */ new Set();
 	const uniqueDiagnostics = [];
@@ -39610,6 +39568,16 @@ const dedupeDiagnostics = (diagnostics) => {
 		const key = `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}\u0000${diagnostic.plugin}\u0000${diagnostic.rule}\u0000${diagnostic.severity}\u0000${diagnostic.message}`;
 		if (seenKeys.has(key)) continue;
 		seenKeys.add(key);
+		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
+		if (priority !== void 0) {
+			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && candidate.severity === diagnostic.severity && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
+			if (overlappingDiagnosticIndex >= 0) {
+				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
+				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
+				if (existingPriority !== void 0 && priority < existingPriority) uniqueDiagnostics[overlappingDiagnosticIndex] = diagnostic;
+				continue;
+			}
+		}
 		uniqueDiagnostics.push(diagnostic);
 	}
 	return uniqueDiagnostics;
@@ -39652,12 +39620,6 @@ const mapWithConcurrency = async (items, concurrency, task) => {
 	if (errors.length > 0) throw errors[0];
 	return results;
 };
-const lineOfUtf8Offset = (sourceBuffer, utf8Offset) => {
-	let lineNumber = 1;
-	const scanEnd = Math.min(utf8Offset, sourceBuffer.length);
-	for (let byteIndex = 0; byteIndex < scanEnd; byteIndex++) if (sourceBuffer[byteIndex] === 10) lineNumber++;
-	return lineNumber;
-};
 const REANIMATED_SHARED_VALUE_HINT = "If this is a Reanimated shared value, prefer its React Compiler-compatible `.get()` / `.set()` accessors over `.value` — https://docs.swmansion.com/react-native-reanimated/docs/core/useSharedValue/#react-compiler-support";
 const ACCESSORS_MIN_VERSION = "3.15.0";
 const supportsAccessors = (reanimatedVersion) => {
@@ -40229,6 +40191,13 @@ const findOutermostEnclosingFunctionRange = (sourceFile, targetLine) => {
 	visit(sourceFile);
 	return foundRange;
 };
+const NEWLINE_BYTE = 10;
+const lineOfUtf8Offset = (sourceBuffer, utf8Offset) => {
+	let lineNumber = 1;
+	const scanEnd = Math.min(utf8Offset, sourceBuffer.length);
+	for (let byteIndex = 0; byteIndex < scanEnd; byteIndex++) if (sourceBuffer[byteIndex] === NEWLINE_BYTE) lineNumber++;
+	return lineNumber;
+};
 /**
 * Drops `react-doctor/react-compiler-no-manual-memoization` diagnostics
 * whose enclosing function also carries a `react-hooks-js` (React
@@ -40409,11 +40378,11 @@ const buildRelatedLocations = (labels, filePath) => {
 	}
 	return related;
 };
-const isOxlintSpan = (value) => isRecord(value) && typeof value.offset === "number" && typeof value.length === "number" && typeof value.line === "number" && typeof value.column === "number";
-const isOxlintLabel = (value) => isRecord(value) && isOxlintSpan(value.span);
-const isMappableOxlintDiagnostic = (value) => isRecord(value) && typeof value.code === "string" && value.code.length > 0 && typeof value.filename === "string" && value.filename.length > 0 && (value.severity === "warning" || value.severity === "error") && Array.isArray(value.labels) && value.labels.every(isOxlintLabel);
-const isEngineFailureDiagnostic = (value) => !isRecord(value) || typeof value.filename !== "string" || value.filename.length === 0;
-const isOxlintOutput = (value) => isRecord(value) && Array.isArray(value.diagnostics);
+const isOxlintOutput = (value) => {
+	if (typeof value !== "object" || value === null) return false;
+	const candidate = value;
+	return Array.isArray(candidate.diagnostics);
+};
 /**
 * Parses one oxlint subprocess's stdout into a flat `Diagnostic[]`.
 * Tolerates the leading-notice-line shape oxlint sometimes prints
@@ -40432,59 +40401,23 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
 	}
 	if (!isOxlintOutput(parsed)) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
-	const engineFailureDiagnostic = parsed.diagnostics.find(isEngineFailureDiagnostic);
-	if (engineFailureDiagnostic !== void 0) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: JSON.stringify(engineFailureDiagnostic).slice(0, 600) }) });
 	const minifiedFileCache = /* @__PURE__ */ new Map();
-	const sourceBufferCache = /* @__PURE__ */ new Map();
-	const sourceLinesCache = /* @__PURE__ */ new Map();
-	const resolveAbsolutePath = (filename) => Path.isAbsolute(filename) ? filename : Path.resolve(rootDirectory || ".", filename);
-	const readSourceBuffer = (filename) => {
-		const absolutePath = resolveAbsolutePath(filename);
-		const cached = sourceBufferCache.get(absolutePath);
-		if (cached !== void 0) return cached;
-		let sourceBuffer;
-		try {
-			sourceBuffer = NFS.readFileSync(absolutePath);
-		} catch {
-			sourceBuffer = null;
-		}
-		sourceBufferCache.set(absolutePath, sourceBuffer);
-		return sourceBuffer;
-	};
-	const readSourceLines = (filename) => {
-		const absolutePath = resolveAbsolutePath(filename);
-		const cached = sourceLinesCache.get(absolutePath);
-		if (cached !== void 0) return cached;
-		const sourceBuffer = readSourceBuffer(filename);
-		const sourceLines = sourceBuffer ? sourceBuffer.toString("utf8").split("\n") : null;
-		sourceLinesCache.set(absolutePath, sourceLines);
-		return sourceLines;
-	};
 	const isMinifiedDiagnosticFile = (filename) => {
-		const absolutePath = resolveAbsolutePath(filename);
+		const absolutePath = Path.isAbsolute(filename) ? filename : Path.resolve(rootDirectory || ".", filename);
 		const cached = minifiedFileCache.get(absolutePath);
 		if (cached !== void 0) return cached;
 		const minified = isMinifiedSource(absolutePath);
 		minifiedFileCache.set(absolutePath, minified);
 		return minified;
 	};
-	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => isMappableOxlintDiagnostic(diagnostic) && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
+	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => diagnostic.code && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
 		const { plugin, rule } = parseRuleCode(diagnostic.code);
 		const primaryLabel = diagnostic.labels[0];
 		const cleaned = cleanDiagnosticMessage(diagnostic.message, diagnostic.help, plugin, rule, project);
 		const normalizedFilePath = diagnostic.filename.replaceAll("\\", "/");
 		const primarySpan = primaryLabel?.span;
-		const sourceBuffer = primarySpan ? readSourceBuffer(diagnostic.filename) : null;
 		const relatedLocations = buildRelatedLocations(diagnostic.labels, normalizedFilePath);
 		const category = resolveDiagnosticCategory(plugin, rule);
-		const matchByOccurrence = resolveMatchByOccurrence(rule, category);
-		const sourceLines = primarySpan ? readSourceLines(diagnostic.filename) : null;
-		const primaryLineIndex = primarySpan ? primarySpan.line - 1 : -1;
-		const primaryLine = sourceLines?.[primaryLineIndex];
-		const primaryColumnIndex = primarySpan ? primarySpan.column - 1 : -1;
-		const isJsxTagLabel = primaryLine !== void 0 && primaryColumnIndex >= 0 && (primaryLine[primaryColumnIndex] === "<" || primaryLine[primaryColumnIndex - 1] === "<");
-		const jsxOpenerEndLineIndex = sourceLines && isJsxTagLabel ? findJsxOpenerSpan(sourceLines, primaryLineIndex) : null;
-		const primarySpanEndLine = jsxOpenerEndLineIndex !== null ? jsxOpenerEndLineIndex + 1 : primarySpan && sourceBuffer ? lineOfUtf8Offset(sourceBuffer, primarySpan.offset + Math.max(primarySpan.length - 1, 0)) : void 0;
 		return {
 			filePath: normalizedFilePath,
 			plugin,
@@ -40498,11 +40431,10 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 			column: primarySpan?.column ?? 0,
 			...primarySpan ? {
 				offset: primarySpan.offset,
-				length: primarySpan.length,
-				...primarySpanEndLine !== void 0 ? { endLine: primarySpanEndLine } : {}
+				length: primarySpan.length
 			} : {},
 			category,
-			...matchByOccurrence ? { matchByOccurrence: true } : {},
+			...resolveMatchByOccurrence(rule, category) ? { matchByOccurrence: true } : {},
 			...relatedLocations.length > 0 ? { relatedLocations } : {}
 		};
 	}), rootDirectory);
@@ -42303,8 +42235,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		respectInlineDisables: input.respectInlineDisables,
 		showWarnings
 	});
-	const filterPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)));
-	const applyPerElementPipeline = (rawStream) => filterPerElementPipeline(rawStream).pipe(tap((diagnostic) => reporterService.emit(diagnostic)));
+	const applyPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)), tap((diagnostic) => reporterService.emit(diagnostic)));
 	const envCollected = yield* runCollect(applyPerElementPipeline(fromIterable$1(isDiffMode ? [] : [
 		...checkReducedMotion(scanDirectory),
 		...checkPnpmHardening(scanDirectory),
@@ -42433,7 +42364,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		});
 		return empty$4;
 	}))));
-	const lintCollected = dedupeRelatedDiagnostics(yield* runCollect(filterPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
+	const lintCollected = yield* runCollect(applyPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
 		onNone: () => set(lintFailure, {
 			didFail: true,
 			reason: `Lint analysis exceeded ${lintPhaseTimeoutMs / MILLISECONDS_PER_SECOND}s and was skipped.`,
@@ -42441,8 +42372,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 			reasonKind: null
 		}).pipe(as([])),
 		onSome: succeed$2
-	}))));
-	yield* forEach$1(lintCollected, reporterService.emit, { discard: true });
+	})));
 	const lintFailureState = yield* get$2(lintFailure);
 	yield* afterLint(lintFailureState.didFail);
 	if (lintFailureState.didFail) yield* scanProgress.fail(formatLintFailText(lintFailureState.reasonTag, process.version));
@@ -44560,7 +44490,6 @@ const METRIC = {
 	cliInvoked: "cli.invoked",
 	cliError: "cli.error",
 	cliEnvironmentError: "cli.env_error",
-	stagedSnapshotDivergence: "staged.snapshot_divergence",
 	projectDetected: "project.detected",
 	projectPathSelected: "project.path_selected",
 	projectConfigSelected: "project.config_selected",
@@ -44915,5 +44844,5 @@ const startLanguageServer = () => {
 };
 //#endregion
 export { startLanguageServer };
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="b75c36e9-f19d-5127-be1a-89ac93910ff0")}catch(e){}}();
-//# debugId=b75c36e9-f19d-5127-be1a-89ac93910ff0
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="a3135dfe-cc85-5d34-adea-93f5c29d9bcb")}catch(e){}}();
+//# debugId=a3135dfe-cc85-5d34-adea-93f5c29d9bcb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-doctor",
-  "version": "0.7.6-dev.3f22fe3",
+  "version": "0.7.6-dev.4fb3694",
   "description": "Your agent writes bad React. This catches it",
   "keywords": [
     "accessibility",
@@ -65,8 +65,8 @@
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
     "yaml": "^2.9.0",
-    "deslop-js": "0.7.6",
-    "oxlint-plugin-react-doctor": "0.7.6-dev.3f22fe3"
+    "oxlint-plugin-react-doctor": "0.7.6-dev.4fb3694",
+    "deslop-js": "0.7.6"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.27.0",
@@ -75,8 +75,8 @@
     "commander": "^14.0.3",
     "ora": "^9.4.0",
     "@react-doctor/core": "0.7.6",
-    "@react-doctor/api": "0.7.6",
-    "@react-doctor/language-server": "0.7.6"
+    "@react-doctor/language-server": "0.7.6",
+    "@react-doctor/api": "0.7.6"
   },
   "engines": {
     "node": "^20.19.0 || >=22.13.0"