jj-plus 0.10.10

package/dist/extension/revision-diff-nav.cjs

@@ -0,0 +1,169 @@
+const require_runtime = require("../_virtual/_rolldown/runtime.cjs");
+const require_resolve_file_path = require("./resolve-file-path.cjs");
+const require_revision_diff_availability = require("../shared/revision-diff-availability.cjs");
+const require_revision_diff_pair = require("../shared/revision-diff-pair.cjs");
+const require_list_file_revisions = require("../shared/list-file-revisions.cjs");
+let node_path = require("node:path");
+node_path = require_runtime.__toESM(node_path, 1);
+let vscode = require("vscode");
+vscode = require_runtime.__toESM(vscode, 1);
+//#region src/extension/revision-diff-nav.ts
+const CONTEXT_ACTIVE = "jjplus.revisionDiffActive";
+const CONTEXT_HAS_PREVIOUS = "jjplus.revisionDiffHasPrevious";
+const CONTEXT_HAS_NEXT = "jjplus.revisionDiffHasNext";
+function createRevisionDiffNavigator(args) {
+	let session;
+	let activeRevisionDiffUris = /* @__PURE__ */ new Set();
+	const syncContext = async () => {
+		const activeSession = activeRevisionDiffUris.has(vscode.window.activeTextEditor?.document.uri.toString() || "") ? session : void 0;
+		const availability = require_revision_diff_availability.getRevisionDiffNavAvailability(activeSession);
+		await Promise.all([
+			vscode.commands.executeCommand("setContext", CONTEXT_ACTIVE, availability.active),
+			vscode.commands.executeCommand("setContext", CONTEXT_HAS_PREVIOUS, availability.hasPrevious),
+			vscode.commands.executeCommand("setContext", CONTEXT_HAS_NEXT, availability.hasNext)
+		]);
+	};
+	const openPair = async (next, direction = "backward") => {
+		const resolvePair = direction === "forward" ? require_revision_diff_pair.resolveNextNonEmptyRevisionPair : require_revision_diff_pair.resolveNonEmptyRevisionPair;
+		const showFile = (revset) => args.showFile({
+			workspacePath: next.workspacePath,
+			revset,
+			filePath: next.relativePath
+		});
+		const pair = await resolvePair({
+			revisions: next.revisions,
+			tipIndex: next.tipIndex,
+			showFile
+		});
+		if (!pair) throw new Error("No non-empty revision pair available for this file");
+		const originalUri = args.createUri({
+			workspacePath: next.workspacePath,
+			revset: pair.base,
+			relativePath: next.relativePath,
+			content: pair.originalContent
+		});
+		const modifiedUri = args.createUri({
+			workspacePath: next.workspacePath,
+			revset: pair.tip,
+			relativePath: next.relativePath,
+			content: pair.modifiedContent
+		});
+		const nextRevisionDiffUris = /* @__PURE__ */ new Set([originalUri.toString(), modifiedUri.toString()]);
+		const [previousPair, nextPair] = await Promise.all([require_revision_diff_pair.resolveNonEmptyRevisionPair({
+			revisions: next.revisions,
+			tipIndex: pair.tipIndex - 1,
+			showFile
+		}), require_revision_diff_pair.resolveNextNonEmptyRevisionPair({
+			revisions: next.revisions,
+			tipIndex: pair.tipIndex + 1,
+			showFile
+		})]);
+		session = {
+			...next,
+			tipIndex: pair.tipIndex,
+			previousTipIndex: previousPair?.tipIndex ?? null,
+			nextTipIndex: nextPair?.tipIndex ?? null
+		};
+		await syncContext();
+		await vscode.commands.executeCommand("vscode.diff", originalUri, modifiedUri, `${next.fileName}: ${short(pair.base)} → ${short(pair.tip)}`, { preview: true });
+		activeRevisionDiffUris = nextRevisionDiffUris;
+		await syncContext();
+	};
+	const openWithPrevious = async (arg) => {
+		const absolutePath = require_resolve_file_path.resolveCommandFilePath(arg);
+		if (!absolutePath) {
+			vscode.window.showErrorMessage("Open a workspace file to diff against the previous revision");
+			return;
+		}
+		try {
+			const preferredWorkspacePath = node_path.dirname(absolutePath);
+			const historyWorkspacePath = await args.resolveHistoryWorkspacePath({ workspacePath: preferredWorkspacePath });
+			const relativePath = args.toRelativePath({
+				historyWorkspacePath,
+				absolutePath
+			});
+			if (!relativePath) throw new Error("The selected file is outside the resolved repository root");
+			const { backend } = await args.resolveBackend({ workspacePath: historyWorkspacePath });
+			const revisions = await args.listRevisions({
+				workspacePath: historyWorkspacePath,
+				relativePath,
+				backend
+			});
+			if (revisions.length < 2) throw new Error("Need at least two revisions touching this file");
+			await openPair({
+				workspacePath: historyWorkspacePath,
+				relativePath,
+				fileName: node_path.basename(absolutePath),
+				backend,
+				revisions,
+				tipIndex: revisions.length - 1
+			}, "backward");
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			vscode.window.showErrorMessage(`Failed to open changes with previous revision: ${message}`);
+		}
+	};
+	const openPrevious = async () => {
+		const availability = require_revision_diff_availability.getRevisionDiffNavAvailability(session);
+		if (!session || !availability.hasPrevious) return;
+		try {
+			const previousTipIndex = session.previousTipIndex === void 0 ? session.tipIndex - 1 : session.previousTipIndex;
+			if (previousTipIndex === null) return;
+			await openPair({
+				...session,
+				tipIndex: previousTipIndex
+			}, "backward");
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			vscode.window.showErrorMessage(`Failed to open previous revision: ${message}`);
+		}
+	};
+	const openNext = async () => {
+		const availability = require_revision_diff_availability.getRevisionDiffNavAvailability(session);
+		if (!session || !availability.hasNext) return;
+		try {
+			const nextTipIndex = session.nextTipIndex === void 0 ? session.tipIndex + 1 : session.nextTipIndex;
+			if (nextTipIndex === null) return;
+			await openPair({
+				...session,
+				tipIndex: nextTipIndex
+			}, "forward");
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			vscode.window.showErrorMessage(`Failed to open next revision: ${message}`);
+		}
+	};
+	const openTimelineHere = async () => {
+		if (!session) {
+			vscode.window.showErrorMessage("Open a revision diff first");
+			return;
+		}
+		const absolutePath = node_path.join(session.workspacePath, session.relativePath);
+		await vscode.commands.executeCommand("jj-plus.openFileRevisionTimeline", absolutePath);
+	};
+	const disposable = vscode.window.onDidChangeActiveTextEditor(() => {
+		syncContext();
+	});
+	syncContext();
+	return {
+		openWithPrevious,
+		openPrevious,
+		openNext,
+		openTimelineHere,
+		getSession: () => session,
+		dispose: () => {
+			disposable.dispose();
+			session = void 0;
+			activeRevisionDiffUris.clear();
+			syncContext();
+		}
+	};
+}
+function short(revision) {
+	return revision.length > 12 ? revision.slice(0, 12) : revision;
+}
+//#endregion
+exports.createRevisionDiffNavigator = createRevisionDiffNavigator;
+exports.listFileRevisionIds = require_list_file_revisions.listFileRevisionIds;
+
+//# sourceMappingURL=revision-diff-nav.cjs.map

package/dist/extension/revision-diff-nav.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"revision-diff-nav.cjs","names":["getRevisionDiffNavAvailability","resolveNextNonEmptyRevisionPair","resolveNonEmptyRevisionPair","resolveCommandFilePath","path"],"sources":["../../src/extension/revision-diff-nav.ts"],"sourcesContent":["import * as path from 'node:path';\nimport * as vscode from 'vscode';\nimport { getRevisionDiffNavAvailability } from '../shared/revision-diff-availability.ts';\nimport { resolveNextNonEmptyRevisionPair, resolveNonEmptyRevisionPair } from '../shared/revision-diff-pair.ts';\nimport { resolveCommandFilePath } from './resolve-file-path.ts';\n\nexport type RevisionDiffSession = {\n\tworkspacePath: string;\n\trelativePath: string;\n\tfileName: string;\n\tbackend: 'git' | 'jj';\n\t/** Oldest → newest revision ids for this file (tip last). */\n\trevisions: string[];\n\t/** Index of the \"after\" / tip side currently shown. */\n\ttipIndex: number;\n\t/** Nearest non-empty pair before the current one; null means the edge is known. */\n\tpreviousTipIndex?: number | null;\n\t/** Nearest non-empty pair after the current one; null means the edge is known. */\n\tnextTipIndex?: number | null;\n};\n\nexport { getRevisionDiffNavAvailability } from '../shared/revision-diff-availability.ts';\n\ntype ShowFile = (args: { workspacePath: string; revset: string; filePath: string }) => Promise<string>;\n\ntype CreateUri = (args: { workspacePath: string; revset: string; relativePath: string; content: string }) => vscode.Uri;\n\ntype ListRevisions = (args: {\n\tworkspacePath: string;\n\trelativePath: string;\n\tbackend: 'git' | 'jj';\n}) => Promise<string[]>;\n\ntype ResolveBackend = (args: { workspacePath: string }) => Promise<{ backend: 'git' | 'jj' }>;\n\nconst CONTEXT_ACTIVE = 'jjplus.revisionDiffActive';\nconst CONTEXT_HAS_PREVIOUS = 'jjplus.revisionDiffHasPrevious';\nconst CONTEXT_HAS_NEXT = 'jjplus.revisionDiffHasNext';\n\nexport function createRevisionDiffNavigator(args: {\n\tshowFile: ShowFile;\n\tcreateUri: CreateUri;\n\tlistRevisions: ListRevisions;\n\tresolveBackend: ResolveBackend;\n\tresolveHistoryWorkspacePath: (args: { workspacePath: string }) => Promise<string>;\n\ttoRelativePath: (args: { historyWorkspacePath: string; absolutePath: string }) => string | undefined;\n}): {\n\topenWithPrevious: (arg?: unknown) => Promise<void>;\n\topenPrevious: () => Promise<void>;\n\topenNext: () => Promise<void>;\n\topenTimelineHere: () => Promise<void>;\n\tgetSession: () => RevisionDiffSession | undefined;\n\tdispose: () => void;\n} {\n\tlet session: RevisionDiffSession | undefined;\n\tlet activeRevisionDiffUris = new Set<string>();\n\n\tconst syncContext = async () => {\n\t\tconst activeSession = activeRevisionDiffUris.has(vscode.window.activeTextEditor?.document.uri.toString() || '')\n\t\t\t? session\n\t\t\t: undefined;\n\t\tconst availability = getRevisionDiffNavAvailability(activeSession);\n\t\tawait Promise.all([\n\t\t\tvscode.commands.executeCommand('setContext', CONTEXT_ACTIVE, availability.active),\n\t\t\tvscode.commands.executeCommand('setContext', CONTEXT_HAS_PREVIOUS, availability.hasPrevious),\n\t\t\tvscode.commands.executeCommand('setContext', CONTEXT_HAS_NEXT, availability.hasNext),\n\t\t]);\n\t};\n\n\tconst openPair = async (next: RevisionDiffSession, direction: 'backward' | 'forward' = 'backward') => {\n\t\tconst resolvePair = direction === 'forward' ? resolveNextNonEmptyRevisionPair : resolveNonEmptyRevisionPair;\n\t\tconst showFile = (revset: string) =>\n\t\t\targs.showFile({\n\t\t\t\tworkspacePath: next.workspacePath,\n\t\t\t\trevset,\n\t\t\t\tfilePath: next.relativePath,\n\t\t\t});\n\t\tconst pair = await resolvePair({\n\t\t\trevisions: next.revisions,\n\t\t\ttipIndex: next.tipIndex,\n\t\t\tshowFile,\n\t\t});\n\t\tif (!pair) {\n\t\t\tthrow new Error('No non-empty revision pair available for this file');\n\t\t}\n\t\tconst originalUri = args.createUri({\n\t\t\tworkspacePath: next.workspacePath,\n\t\t\trevset: pair.base,\n\t\t\trelativePath: next.relativePath,\n\t\t\tcontent: pair.originalContent,\n\t\t});\n\t\tconst modifiedUri = args.createUri({\n\t\t\tworkspacePath: next.workspacePath,\n\t\t\trevset: pair.tip,\n\t\t\trelativePath: next.relativePath,\n\t\t\tcontent: pair.modifiedContent,\n\t\t});\n\t\tconst nextRevisionDiffUris = new Set([originalUri.toString(), modifiedUri.toString()]);\n\t\tconst [previousPair, nextPair] = await Promise.all([\n\t\t\tresolveNonEmptyRevisionPair({\n\t\t\t\trevisions: next.revisions,\n\t\t\t\ttipIndex: pair.tipIndex - 1,\n\t\t\t\tshowFile,\n\t\t\t}),\n\t\t\tresolveNextNonEmptyRevisionPair({\n\t\t\t\trevisions: next.revisions,\n\t\t\t\ttipIndex: pair.tipIndex + 1,\n\t\t\t\tshowFile,\n\t\t\t}),\n\t\t]);\n\t\tsession = {\n\t\t\t...next,\n\t\t\ttipIndex: pair.tipIndex,\n\t\t\tpreviousTipIndex: previousPair?.tipIndex ?? null,\n\t\t\tnextTipIndex: nextPair?.tipIndex ?? null,\n\t\t};\n\t\tawait syncContext();\n\t\tawait vscode.commands.executeCommand(\n\t\t\t'vscode.diff',\n\t\t\toriginalUri,\n\t\t\tmodifiedUri,\n\t\t\t`${next.fileName}: ${short(pair.base)} → ${short(pair.tip)}`,\n\t\t\t{ preview: true },\n\t\t);\n\t\tactiveRevisionDiffUris = nextRevisionDiffUris;\n\t\tawait syncContext();\n\t};\n\n\tconst openWithPrevious = async (arg?: unknown) => {\n\t\tconst absolutePath = resolveCommandFilePath(arg);\n\t\tif (!absolutePath) {\n\t\t\tvoid vscode.window.showErrorMessage('Open a workspace file to diff against the previous revision');\n\t\t\treturn;\n\t\t}\n\t\ttry {\n\t\t\tconst preferredWorkspacePath = path.dirname(absolutePath);\n\t\t\tconst historyWorkspacePath = await args.resolveHistoryWorkspacePath({\n\t\t\t\tworkspacePath: preferredWorkspacePath,\n\t\t\t});\n\t\t\tconst relativePath = args.toRelativePath({ historyWorkspacePath, absolutePath });\n\t\t\tif (!relativePath) {\n\t\t\t\tthrow new Error('The selected file is outside the resolved repository root');\n\t\t\t}\n\t\t\tconst { backend } = await args.resolveBackend({ workspacePath: historyWorkspacePath });\n\t\t\tconst revisions = await args.listRevisions({\n\t\t\t\tworkspacePath: historyWorkspacePath,\n\t\t\t\trelativePath,\n\t\t\t\tbackend,\n\t\t\t});\n\t\t\tif (revisions.length < 2) {\n\t\t\t\tthrow new Error('Need at least two revisions touching this file');\n\t\t\t}\n\t\t\tawait openPair(\n\t\t\t\t{\n\t\t\t\t\tworkspacePath: historyWorkspacePath,\n\t\t\t\t\trelativePath,\n\t\t\t\t\tfileName: path.basename(absolutePath),\n\t\t\t\t\tbackend,\n\t\t\t\t\trevisions,\n\t\t\t\t\ttipIndex: revisions.length - 1,\n\t\t\t\t},\n\t\t\t\t'backward',\n\t\t\t);\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\t\tvoid vscode.window.showErrorMessage(`Failed to open changes with previous revision: ${message}`);\n\t\t}\n\t};\n\n\tconst openPrevious = async () => {\n\t\tconst availability = getRevisionDiffNavAvailability(session);\n\t\tif (!session || !availability.hasPrevious) {\n\t\t\treturn;\n\t\t}\n\t\ttry {\n\t\t\tconst previousTipIndex = session.previousTipIndex === undefined ? session.tipIndex - 1 : session.previousTipIndex;\n\t\t\tif (previousTipIndex === null) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tawait openPair({ ...session, tipIndex: previousTipIndex }, 'backward');\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\t\tvoid vscode.window.showErrorMessage(`Failed to open previous revision: ${message}`);\n\t\t}\n\t};\n\n\tconst openNext = async () => {\n\t\tconst availability = getRevisionDiffNavAvailability(session);\n\t\tif (!session || !availability.hasNext) {\n\t\t\treturn;\n\t\t}\n\t\ttry {\n\t\t\tconst nextTipIndex = session.nextTipIndex === undefined ? session.tipIndex + 1 : session.nextTipIndex;\n\t\t\tif (nextTipIndex === null) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tawait openPair({ ...session, tipIndex: nextTipIndex }, 'forward');\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\t\tvoid vscode.window.showErrorMessage(`Failed to open next revision: ${message}`);\n\t\t}\n\t};\n\n\tconst openTimelineHere = async () => {\n\t\tif (!session) {\n\t\t\tvoid vscode.window.showErrorMessage('Open a revision diff first');\n\t\t\treturn;\n\t\t}\n\t\tconst absolutePath = path.join(session.workspacePath, session.relativePath);\n\t\tawait vscode.commands.executeCommand('jj-plus.openFileRevisionTimeline', absolutePath);\n\t};\n\n\tconst disposable = vscode.window.onDidChangeActiveTextEditor(() => {\n\t\tvoid syncContext();\n\t});\n\n\tvoid syncContext();\n\n\treturn {\n\t\topenWithPrevious,\n\t\topenPrevious,\n\t\topenNext,\n\t\topenTimelineHere,\n\t\tgetSession: () => session,\n\t\tdispose: () => {\n\t\t\tdisposable.dispose();\n\t\t\tsession = undefined;\n\t\t\tactiveRevisionDiffUris.clear();\n\t\t\tvoid syncContext();\n\t\t},\n\t};\n}\n\nfunction short(revision: string): string {\n\treturn revision.length > 12 ? revision.slice(0, 12) : revision;\n}\n\nexport { listFileRevisionIds } from '../shared/list-file-revisions.ts';\n"],"mappings":"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"}

package/dist/extension/settings.cjs

@@ -0,0 +1,41 @@
+const require_runtime = require("../_virtual/_rolldown/runtime.cjs");
+let vscode = require("vscode");
+vscode = require_runtime.__toESM(vscode, 1);
+//#region src/extension/settings.ts
+const SETTINGS_SECTION = "jjplus";
+function readJjplusSettings() {
+	const config = vscode.workspace.getConfiguration(SETTINGS_SECTION);
+	const inspectedMode = config.inspect("blameHoverMode");
+	const hasExplicitMode = [
+		inspectedMode?.workspaceFolderLanguageValue,
+		inspectedMode?.workspaceFolderValue,
+		inspectedMode?.workspaceLanguageValue,
+		inspectedMode?.workspaceValue,
+		inspectedMode?.globalLanguageValue,
+		inspectedMode?.globalValue
+	].some((value) => value !== void 0);
+	const configuredMode = config.get("blameHoverMode", "blame");
+	const legacyHoverEnabled = config.get("hoverTimelineLink", true);
+	return {
+		currentLineBlame: config.get("currentLineBlame", true),
+		inlineBlameGutter: config.get("inlineBlameGutter", false),
+		inlineBlameSparse: config.get("inlineBlameSparse", true),
+		blameHoverMode: hasExplicitMode ? configuredMode : legacyHoverEnabled ? "blame" : "never",
+		statusBarChangeChip: config.get("statusBarChangeChip", true),
+		scmChangedLines: config.get("scmChangedLines", false),
+		opLogWatch: config.get("opLogWatch", false),
+		conflictHelper: config.get("conflictHelper", true),
+		codeActions: config.get("codeActions", false)
+	};
+}
+function onJjplusSettingsChange(listener) {
+	return vscode.workspace.onDidChangeConfiguration((event) => {
+		if (event.affectsConfiguration("jjplus")) listener();
+	});
+}
+//#endregion
+exports.SETTINGS_SECTION = SETTINGS_SECTION;
+exports.onJjplusSettingsChange = onJjplusSettingsChange;
+exports.readJjplusSettings = readJjplusSettings;
+
+//# sourceMappingURL=settings.cjs.map

package/dist/extension/settings.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"settings.cjs","names":[],"sources":["../../src/extension/settings.ts"],"sourcesContent":["import * as vscode from 'vscode';\n\nexport const SETTINGS_SECTION = 'jjplus';\n\nexport type BlameHoverMode = 'blame' | 'any' | 'never';\n\nexport type JjplusSettings = {\n\tcurrentLineBlame: boolean;\n\tinlineBlameGutter: boolean;\n\tinlineBlameSparse: boolean;\n\tblameHoverMode: BlameHoverMode;\n\tstatusBarChangeChip: boolean;\n\tscmChangedLines: boolean;\n\topLogWatch: boolean;\n\tconflictHelper: boolean;\n\tcodeActions: boolean;\n};\n\nexport function readJjplusSettings(): JjplusSettings {\n\tconst config = vscode.workspace.getConfiguration(SETTINGS_SECTION);\n\tconst inspectedMode = config.inspect<BlameHoverMode>('blameHoverMode');\n\tconst hasExplicitMode = [\n\t\tinspectedMode?.workspaceFolderLanguageValue,\n\t\tinspectedMode?.workspaceFolderValue,\n\t\tinspectedMode?.workspaceLanguageValue,\n\t\tinspectedMode?.workspaceValue,\n\t\tinspectedMode?.globalLanguageValue,\n\t\tinspectedMode?.globalValue,\n\t].some((value) => value !== undefined);\n\tconst configuredMode = config.get<BlameHoverMode>('blameHoverMode', 'blame');\n\tconst legacyHoverEnabled = config.get<boolean>('hoverTimelineLink', true);\n\treturn {\n\t\tcurrentLineBlame: config.get<boolean>('currentLineBlame', true),\n\t\tinlineBlameGutter: config.get<boolean>('inlineBlameGutter', false),\n\t\tinlineBlameSparse: config.get<boolean>('inlineBlameSparse', true),\n\t\tblameHoverMode: hasExplicitMode ? configuredMode : legacyHoverEnabled ? 'blame' : 'never',\n\t\tstatusBarChangeChip: config.get<boolean>('statusBarChangeChip', true),\n\t\tscmChangedLines: config.get<boolean>('scmChangedLines', false),\n\t\topLogWatch: config.get<boolean>('opLogWatch', false),\n\t\tconflictHelper: config.get<boolean>('conflictHelper', true),\n\t\tcodeActions: config.get<boolean>('codeActions', false),\n\t};\n}\n\nexport function onJjplusSettingsChange(listener: () => void): vscode.Disposable {\n\treturn vscode.workspace.onDidChangeConfiguration((event) => {\n\t\tif (event.affectsConfiguration(SETTINGS_SECTION)) {\n\t\t\tlistener();\n\t\t}\n\t});\n}\n"],"mappings":";;;;AAEA,MAAa,mBAAmB;AAgBhC,SAAgB,qBAAqC;CACpD,MAAM,SAAS,OAAO,UAAU,iBAAiB,gBAAgB;CACjE,MAAM,gBAAgB,OAAO,QAAwB,gBAAgB;CACrE,MAAM,kBAAkB;EACvB,eAAe;EACf,eAAe;EACf,eAAe;EACf,eAAe;EACf,eAAe;EACf,eAAe;CAChB,CAAC,CAAC,MAAM,UAAU,UAAU,KAAA,CAAS;CACrC,MAAM,iBAAiB,OAAO,IAAoB,kBAAkB,OAAO;CAC3E,MAAM,qBAAqB,OAAO,IAAa,qBAAqB,IAAI;CACxE,OAAO;EACN,kBAAkB,OAAO,IAAa,oBAAoB,IAAI;EAC9D,mBAAmB,OAAO,IAAa,qBAAqB,KAAK;EACjE,mBAAmB,OAAO,IAAa,qBAAqB,IAAI;EAChE,gBAAgB,kBAAkB,iBAAiB,qBAAqB,UAAU;EAClF,qBAAqB,OAAO,IAAa,uBAAuB,IAAI;EACpE,iBAAiB,OAAO,IAAa,mBAAmB,KAAK;EAC7D,YAAY,OAAO,IAAa,cAAc,KAAK;EACnD,gBAAgB,OAAO,IAAa,kBAAkB,IAAI;EAC1D,aAAa,OAAO,IAAa,eAAe,KAAK;CACtD;AACD;AAEA,SAAgB,uBAAuB,UAAyC;CAC/E,OAAO,OAAO,UAAU,0BAA0B,UAAU;EAC3D,IAAI,MAAM,qBAAA,QAAqC,GAC9C,SAAS;CAEX,CAAC;AACF"}

package/dist/extension/timeline-at-line.cjs

@@ -0,0 +1,72 @@
+const require_constants = require("./constants.cjs");
+const require_blame = require("../shared/blame.cjs");
+//#region src/extension/timeline-at-line.ts
+function formatTimelineAtLineHoverTitle(args) {
+	const bits = [
+		args.author?.trim().split(/\s+/u)[0],
+		args.when?.trim(),
+		args.summary ? truncateBlameSummary(args.summary, 40) : void 0
+	].filter(Boolean);
+	const detail = bits.length ? ` — ${bits.join(" · ")}` : "";
+	return `JJ Plus: Open revision timeline · line ${args.line}${detail}`;
+}
+/** End-of-line decoration text — GitLens-style, no layout shift. */
+function formatCurrentLineBlameDecoration(entry) {
+	return `  ${require_blame.formatBlameGutterLabel(entry)}`;
+}
+function truncateBlameSummary(value, maxLength) {
+	return require_blame.truncateBlameSummaryForDecoration(value, maxLength);
+}
+function shouldShowBlameHoverAtPosition(args) {
+	if (args.mode === "never") return false;
+	if (args.mode === "any") return true;
+	return args.positionCharacter >= args.lineLength && args.annotatedLines.has(args.line);
+}
+function buildCurrentLineBlameHoverMarkdown(args) {
+	const openArgs = encodeURIComponent(JSON.stringify({
+		absolutePath: args.absolutePath,
+		line: args.line
+	}));
+	const openLink = `command:${require_constants.OPEN_TIMELINE_AT_LINE_COMMAND}?${openArgs}`;
+	const actionArgs = encodeURIComponent(JSON.stringify({
+		absolutePath: args.absolutePath,
+		line: args.line,
+		revision: args.entry.revision
+	}));
+	const copyRevisionLink = `command:jj-plus.copyBlameRevision?${encodeURIComponent(JSON.stringify({ revision: args.entry.revision }))}`;
+	const snapshotLink = `command:jj-plus.openBlameSnapshot?${actionArgs}`;
+	const remoteLink = `command:jj-plus.openBlameRemote?${actionArgs}`;
+	const revisionDiffLink = `command:jj-plus.openBlameRevisionDiff?${actionArgs}`;
+	const author = args.entry.author?.trim() || "Unknown author";
+	const when = args.entry.authorDate || "";
+	const shortDesc = args.entry.summary?.trim() || "";
+	const longDesc = args.fullDescription?.trim() || "";
+	const body = longDesc && longDesc !== shortDesc ? `${shortDesc}\n\n${longDesc}` : shortDesc;
+	const rev = require_blame.shortBlameRevision(args.entry.revision, 12);
+	return [
+		`**${escapeMarkdown(author)}**${when ? ` · ${escapeMarkdown(when)}` : ""}`,
+		`Line ${args.line} · Revision \`${escapeMarkdownCode(rev)}\``,
+		"",
+		body ? escapeMarkdownBlock(body) : "_No commit description_",
+		"",
+		`[Open revision timeline at line ${args.line}](${openLink})`,
+		`[Open revision diff](${revisionDiffLink}) · [Open file snapshot](${snapshotLink}) · [Copy revision](${copyRevisionLink}) · [Open remote](${remoteLink})`
+	].join("\n");
+}
+function escapeMarkdown(value) {
+	return value.replaceAll("\\", "\\\\").replaceAll("`", "\\`").replaceAll("*", "\\*").replaceAll("_", "\\_").replaceAll("[", "\\[").replaceAll("]", "\\]").replaceAll(">", "\\>");
+}
+function escapeMarkdownCode(value) {
+	return value.replace(/[\\`]/gu, "\\$&");
+}
+function escapeMarkdownBlock(value) {
+	return value.split(/\r?\n/u).map((line) => escapeMarkdown(line)).join("\n");
+}
+//#endregion
+exports.buildCurrentLineBlameHoverMarkdown = buildCurrentLineBlameHoverMarkdown;
+exports.formatCurrentLineBlameDecoration = formatCurrentLineBlameDecoration;
+exports.formatTimelineAtLineHoverTitle = formatTimelineAtLineHoverTitle;
+exports.shouldShowBlameHoverAtPosition = shouldShowBlameHoverAtPosition;
+exports.truncateBlameSummary = truncateBlameSummary;
+
+//# sourceMappingURL=timeline-at-line.cjs.map

package/dist/extension/timeline-at-line.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"timeline-at-line.cjs","names":["formatBlameGutterLabel","truncateBlameSummaryForDecoration","OPEN_TIMELINE_AT_LINE_COMMAND","shortBlameRevision"],"sources":["../../src/extension/timeline-at-line.ts"],"sourcesContent":["import { OPEN_TIMELINE_AT_LINE_COMMAND } from './constants.ts';\nimport type { BlameLine } from '../shared/blame.ts';\nimport { formatBlameGutterLabel, shortBlameRevision, truncateBlameSummaryForDecoration } from '../shared/blame.ts';\n\nexport function formatTimelineAtLineCodeLensTitle(line: number): string {\n\treturn `JJ Plus: Open revision timeline · line ${line}`;\n}\n\nexport function formatTimelineAtLineHoverTitle(args: {\n\tline: number;\n\tauthor?: string;\n\twhen?: string;\n\tsummary?: string;\n}): string {\n\tconst bits = [\n\t\targs.author?.trim().split(/\\s+/u)[0],\n\t\targs.when?.trim(),\n\t\targs.summary ? truncateBlameSummary(args.summary, 40) : undefined,\n\t].filter(Boolean);\n\tconst detail = bits.length ? ` — ${bits.join(' · ')}` : '';\n\treturn `JJ Plus: Open revision timeline · line ${args.line}${detail}`;\n}\n\nexport function buildTimelineAtLineCodeLens(args: { absolutePath: string; line: number }): {\n\ttitle: string;\n\tcommand: string;\n\targuments: Array<{ absolutePath: string; line: number }>;\n} {\n\treturn {\n\t\ttitle: formatTimelineAtLineCodeLensTitle(args.line),\n\t\tcommand: OPEN_TIMELINE_AT_LINE_COMMAND,\n\t\targuments: [{ absolutePath: args.absolutePath, line: args.line }],\n\t};\n}\n\n/** End-of-line decoration text — GitLens-style, no layout shift. */\nexport function formatCurrentLineBlameDecoration(entry: BlameLine): string {\n\treturn `  ${formatBlameGutterLabel(entry)}`;\n}\n\nexport function truncateBlameSummary(value: string, maxLength: number): string {\n\treturn truncateBlameSummaryForDecoration(value, maxLength);\n}\n\nexport function shouldShowBlameHoverAtPosition(args: {\n\tmode: 'blame' | 'any' | 'never';\n\tpositionCharacter: number;\n\tlineLength: number;\n\tline: number;\n\tannotatedLines: ReadonlySet<number>;\n}): boolean {\n\tif (args.mode === 'never') {\n\t\treturn false;\n\t}\n\tif (args.mode === 'any') {\n\t\treturn true;\n\t}\n\treturn args.positionCharacter >= args.lineLength && args.annotatedLines.has(args.line);\n}\n\nexport function buildCurrentLineBlameHoverMarkdown(args: {\n\tentry: BlameLine;\n\tabsolutePath: string;\n\tline: number;\n\tfullDescription?: string;\n}): string {\n\tconst openArgs = encodeURIComponent(JSON.stringify({ absolutePath: args.absolutePath, line: args.line }));\n\tconst openLink = `command:${OPEN_TIMELINE_AT_LINE_COMMAND}?${openArgs}`;\n\tconst actionArgs = encodeURIComponent(\n\t\tJSON.stringify({ absolutePath: args.absolutePath, line: args.line, revision: args.entry.revision }),\n\t);\n\tconst copyRevisionLink = `command:jj-plus.copyBlameRevision?${encodeURIComponent(JSON.stringify({ revision: args.entry.revision }))}`;\n\tconst snapshotLink = `command:jj-plus.openBlameSnapshot?${actionArgs}`;\n\tconst remoteLink = `command:jj-plus.openBlameRemote?${actionArgs}`;\n\tconst revisionDiffLink = `command:jj-plus.openBlameRevisionDiff?${actionArgs}`;\n\tconst author = args.entry.author?.trim() || 'Unknown author';\n\tconst when = args.entry.authorDate || '';\n\tconst shortDesc = args.entry.summary?.trim() || '';\n\tconst longDesc = args.fullDescription?.trim() || '';\n\tconst body = longDesc && longDesc !== shortDesc ? `${shortDesc}\\n\\n${longDesc}` : shortDesc;\n\tconst rev = shortBlameRevision(args.entry.revision, 12);\n\treturn [\n\t\t`**${escapeMarkdown(author)}**${when ? ` · ${escapeMarkdown(when)}` : ''}`,\n\t\t`Line ${args.line} · Revision \\`${escapeMarkdownCode(rev)}\\``,\n\t\t'',\n\t\tbody ? escapeMarkdownBlock(body) : '_No commit description_',\n\t\t'',\n\t\t`[Open revision timeline at line ${args.line}](${openLink})`,\n\t\t`[Open revision diff](${revisionDiffLink}) · [Open file snapshot](${snapshotLink}) · [Copy revision](${copyRevisionLink}) · [Open remote](${remoteLink})`,\n\t].join('\\n');\n}\n\nfunction escapeMarkdown(value: string): string {\n\treturn value\n\t\t.replaceAll('\\\\', '\\\\\\\\')\n\t\t.replaceAll('`', '\\\\`')\n\t\t.replaceAll('*', '\\\\*')\n\t\t.replaceAll('_', '\\\\_')\n\t\t.replaceAll('[', '\\\\[')\n\t\t.replaceAll(']', '\\\\]')\n\t\t.replaceAll('>', '\\\\>');\n}\n\nfunction escapeMarkdownCode(value: string): string {\n\treturn value.replace(/[\\\\`]/gu, '\\\\$&');\n}\n\nfunction escapeMarkdownBlock(value: string): string {\n\treturn value\n\t\t.split(/\\r?\\n/u)\n\t\t.map((line) => escapeMarkdown(line))\n\t\t.join('\\n');\n}\n"],"mappings":";;;AAQA,SAAgB,+BAA+B,MAKpC;CACV,MAAM,OAAO;EACZ,KAAK,QAAQ,KAAK,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC;EAClC,KAAK,MAAM,KAAK;EAChB,KAAK,UAAU,qBAAqB,KAAK,SAAS,EAAE,IAAI,KAAA;CACzD,CAAC,CAAC,OAAO,OAAO;CAChB,MAAM,SAAS,KAAK,SAAS,MAAM,KAAK,KAAK,KAAK,MAAM;CACxD,OAAO,0CAA0C,KAAK,OAAO;AAC9D;;AAeA,SAAgB,iCAAiC,OAA0B;CAC1E,OAAO,KAAKA,cAAAA,uBAAuB,KAAK;AACzC;AAEA,SAAgB,qBAAqB,OAAe,WAA2B;CAC9E,OAAOC,cAAAA,kCAAkC,OAAO,SAAS;AAC1D;AAEA,SAAgB,+BAA+B,MAMnC;CACX,IAAI,KAAK,SAAS,SACjB,OAAO;CAER,IAAI,KAAK,SAAS,OACjB,OAAO;CAER,OAAO,KAAK,qBAAqB,KAAK,cAAc,KAAK,eAAe,IAAI,KAAK,IAAI;AACtF;AAEA,SAAgB,mCAAmC,MAKxC;CACV,MAAM,WAAW,mBAAmB,KAAK,UAAU;EAAE,cAAc,KAAK;EAAc,MAAM,KAAK;CAAK,CAAC,CAAC;CACxG,MAAM,WAAW,WAAWC,kBAAAA,8BAA8B,GAAG;CAC7D,MAAM,aAAa,mBAClB,KAAK,UAAU;EAAE,cAAc,KAAK;EAAc,MAAM,KAAK;EAAM,UAAU,KAAK,MAAM;CAAS,CAAC,CACnG;CACA,MAAM,mBAAmB,qCAAqC,mBAAmB,KAAK,UAAU,EAAE,UAAU,KAAK,MAAM,SAAS,CAAC,CAAC;CAClI,MAAM,eAAe,qCAAqC;CAC1D,MAAM,aAAa,mCAAmC;CACtD,MAAM,mBAAmB,yCAAyC;CAClE,MAAM,SAAS,KAAK,MAAM,QAAQ,KAAK,KAAK;CAC5C,MAAM,OAAO,KAAK,MAAM,cAAc;CACtC,MAAM,YAAY,KAAK,MAAM,SAAS,KAAK,KAAK;CAChD,MAAM,WAAW,KAAK,iBAAiB,KAAK,KAAK;CACjD,MAAM,OAAO,YAAY,aAAa,YAAY,GAAG,UAAU,MAAM,aAAa;CAClF,MAAM,MAAMC,cAAAA,mBAAmB,KAAK,MAAM,UAAU,EAAE;CACtD,OAAO;EACN,KAAK,eAAe,MAAM,EAAE,IAAI,OAAO,MAAM,eAAe,IAAI,MAAM;EACtE,QAAQ,KAAK,KAAK,gBAAgB,mBAAmB,GAAG,EAAE;EAC1D;EACA,OAAO,oBAAoB,IAAI,IAAI;EACnC;EACA,mCAAmC,KAAK,KAAK,IAAI,SAAS;EAC1D,wBAAwB,iBAAiB,2BAA2B,aAAa,sBAAsB,iBAAiB,oBAAoB,WAAW;CACxJ,CAAC,CAAC,KAAK,IAAI;AACZ;AAEA,SAAS,eAAe,OAAuB;CAC9C,OAAO,MACL,WAAW,MAAM,MAAM,CAAC,CACxB,WAAW,KAAK,KAAK,CAAC,CACtB,WAAW,KAAK,KAAK,CAAC,CACtB,WAAW,KAAK,KAAK,CAAC,CACtB,WAAW,KAAK,KAAK,CAAC,CACtB,WAAW,KAAK,KAAK,CAAC,CACtB,WAAW,KAAK,KAAK;AACxB;AAEA,SAAS,mBAAmB,OAAuB;CAClD,OAAO,MAAM,QAAQ,WAAW,MAAM;AACvC;AAEA,SAAS,oBAAoB,OAAuB;CACnD,OAAO,MACL,MAAM,QAAQ,CAAC,CACf,KAAK,SAAS,eAAe,IAAI,CAAC,CAAC,CACnC,KAAK,IAAI;AACZ"}