@pierre/diffs 1.4.3 → 1.5.1

package/dist/components/FileDiff.js

@@ -502,13 +502,14 @@ var FileDiff = class {
 		this.expandHunk(hunkIndex, direction, expansionLineCountOverride);
 	};
 	expandHunk = (hunkIndex, direction, expansionLineCountOverride) => {
-		this.hunksRenderer.expandHunk(hunkIndex, direction, expansionLineCountOverride);
 		this.loadFilesIfNecessary();
+		this.hunksRenderer.expandHunk(hunkIndex, direction, expansionLineCountOverride);
 		this.rerender();
 	};
 	loadFilesIfNecessary() {
 		const { fileDiff, options: { loadDiffFiles } } = this;
-		if (fileDiff == null || loadDiffFiles == null || !canHydrateDiff(fileDiff) || this.pendingFiles?.fileDiff === fileDiff) return;
+		if (fileDiff == null || !canHydrateDiff(fileDiff) || this.pendingFiles?.fileDiff === fileDiff) return;
+		if (loadDiffFiles == null) throw new Error("FileDiff: loadDiffFiles is required to load full files for a partial diff");
 		const promise = this.loadFilesForDiff(fileDiff, loadDiffFiles);
 		const pendingFiles = this.pendingFiles = {
 			fileDiff,
@@ -519,10 +520,41 @@ var FileDiff = class {
 		};
 		pendingFiles.promise = promise.finally(clearPendingFiles);
 	}
+	/**
+	* In order to start an edit session, you must be using a `fileDiff` that
+	* includes the full contents for both files. In other words, `isPartial`
+	* must be false You can use `prepareForEditing` to hydrate if
+	* `loadDiffFiles` was passed in to `options`
+	*/
+	__canAttachEditor() {
+		return this.fileDiff != null && !this.fileDiff.isPartial;
+	}
+	/**
+	* Load a partial diff before starting a new edit session. Call this before
+	* Editor.edit when the diff may still be partial; it resolves only when this
+	* instance has a complete diff to edit.
+	*/
+	async prepareForEditing() {
+		if (this.__canAttachEditor()) return;
+		const pending = this.__prepareForEditing();
+		if (pending == null) {
+			if (this.fileDiff?.isPartial === true && !canHydrateDiff(this.fileDiff)) throw new Error("FileDiff.prepareForEditing: this partial diff cannot be hydrated; provide a complete diff");
+			throw new Error("FileDiff.prepareForEditing: a partial diff requires loadDiffFiles");
+		}
+		await pending;
+		if (!this.__canAttachEditor()) throw new Error("FileDiff.prepareForEditing: the diff did not finish loading");
+	}
+	/** Hydrate a diff if necessary  */
+	__prepareForEditing() {
+		if (this.__canAttachEditor()) return;
+		if (this.fileDiff?.isPartial === true && !canHydrateDiff(this.fileDiff)) throw new Error("FileDiff: this partial diff cannot be hydrated; provide a complete diff to edit");
+		this.loadFilesIfNecessary();
+		return this.pendingFiles?.promise;
+	}
 	async loadFilesForDiff(fileDiff, loadDiffFiles) {
 		try {
 			const files = await loadDiffFiles(fileDiff);
-			if (!this.enabled || this.fileDiff !== fileDiff) return;
+			if (this.fileDiff !== fileDiff) return;
 			await this.handleFilesLoaded(fileDiff, files);
 		} catch (error) {
 			if (this.options.disableErrorHandling === true) throw error;
@@ -533,7 +565,7 @@ var FileDiff = class {
 		if (this.fileDiff !== expectedDiff || !expectedDiff.isPartial) return;
 		hydratePartialDiff("merge", expectedDiff, files);
 		this.setHydratedState(files);
-		if (this.startHydratedEditSession(expectedDiff)) {
+		if (this.installHydratedSessionDiff(expectedDiff)) {
 			this.rerender();
 			return;
 		}
@@ -541,17 +573,14 @@ var FileDiff = class {
 		if (!this.enabled || this.fileDiff !== expectedDiff) return;
 		this.rerender();
 	}
-	startHydratedEditSession(expectedDiff) {
-		if (expectedDiff.isPartial) throw new Error("FileDiff.startHydratedEditSession: diffs cannot be partial for editing");
+	installHydratedSessionDiff(expectedDiff) {
+		if (expectedDiff.isPartial) throw new Error("FileDiff.installHydratedSessionDiff: diffs cannot be partial for editing");
 		if (this.fileDiff !== expectedDiff) return false;
-		const { editor } = this;
 		if (this.editSession?.outgoingDiff != null) {
 			this.installEditSession(expectedDiff);
 			return true;
 		}
-		if (editor == null || this.editSession != null) return false;
-		this.installEditSession(expectedDiff, editor.__getDocumentContents(getAdditionFile(expectedDiff)), editor.__getDocumentSessionState());
-		return true;
+		return false;
 	}
 	updateExternalDiff(incomingExternalDiff, lineAnnotations) {
 		if (areDiffTargetsEqual(this.fileDiff, incomingExternalDiff)) return false;
@@ -561,9 +590,6 @@ var FileDiff = class {
 			if (incomingExternalDiff.isPartial) this.loadFilesIfNecessary();
 			else this.installEditSession(incomingExternalDiff);
 			if (this.editSession != null) this.editSession.outgoingDiff = outgoingDiff;
-		} else if (this.editor != null) {
-			if (incomingExternalDiff.isPartial) this.loadFilesIfNecessary();
-			else this.installEditSession(incomingExternalDiff, this.editor.__getDocumentContents(getAdditionFile(incomingExternalDiff)), this.editor.__getDocumentSessionState());
 		}
 		if (this.editSession?.annotations != null && lineAnnotations != null) {
 			this.lineAnnotations = lineAnnotations;
@@ -747,9 +773,9 @@ var FileDiff = class {
 		const sync = (highlighter) => {
 			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.getLatestDiff() !== fileDiff) return;
 			const replacement = this.editSession?.outgoingDiff;
-			const externalDiff = this.fileDiff;
+			const { fileDiff: externalDiff } = this;
 			const externalDocument = replacement != null && externalDiff != null && replacement !== fileDiff;
-			const resetHistory = externalDocument ? shouldResetUndoState(replacement, externalDiff) : false;
+			const resetHistory = externalDocument && replacement != null && externalDiff != null ? shouldResetUndoState(replacement, externalDiff) : false;
 			editor.__syncRenderView({
 				highlighter,
 				fileContainer,
@@ -846,6 +872,7 @@ var FileDiff = class {
 	__attachEditor(editor) {
 		if (this.type !== "file-diff") throw new Error(`FileDiff.__attachEditor: cannot attach an editor to a "${this.type}" diff`);
 		if (this.editor != null) throw new Error("FileDiff.__attachEditor: an editor is already attached");
+		if (!this.__canAttachEditor()) throw new Error("FileDiff.__attachEditor: a complete diff is required before editing");
 		const detach = () => {
 			this.editor = void 0;
 			this.finishEditSession();
@@ -989,6 +1016,11 @@ var FileDiff = class {
 		this.rerender();
 		this.interactionManager.setSelectionDirty();
 	}
+	/** Update the private diff without editor DOM, then rehighlight on return. */
+	applySuspendedDocumentChange(textDocument, newLineAnnotations) {
+		this.applyDocumentChange(textDocument, newLineAnnotations);
+		this.hunksRenderer.clearRenderCache();
+	}
 	updateRenderCache(dirtyLines, themeType, options = {}) {
 		const editSessionDiff = this.editSession?.diff;
 		if (editSessionDiff == null) throw new Error("FileDiff.updateRenderCache: requires an active edit session");