@pierre/diffs 1.4.2 → 1.5.0

package/dist/editor/editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.d.ts","names":[],"sources":["../../src/editor/editor.ts"],"mappings":";;;;;;;;;;;UAwOU;EACR,aAAa;EACb,eAAe;EACf,aAAa;;EAEb;;UAGQ,wBAAwB,qBAAqB;EACrD,MAAM;EACN,iBAAiB,eAAe;;EAEhC;;UAGQ,wBAAwB,qBAAqB;EACrD,UAAU;EACV,iBAAiB,mBAAmB;;EAEpC;;KAGG,oBACH,cAAc,YACd,eACE,uBACA,wBAAwB,eACxB,wBAAwB;KAEvB,gBACH,cAAc,YACd,aACA,SACE,uBACA,KAAK,aAAa,SAClB,SAAS,aAAa;UAkBT,cAAc,cAAc,YAAY,aAAa;;EAEpE;;;;;;EAMA;;;;;;EAMA,eAAe,mBAAmB,OAAO;;EAEzC,SAAS;;EAET;;EAEA;;;;;EAKA,eAAe;;EAEf,wBAAwB;;;;;EAKxB;;;;EAIA;;;;;;;IAOE;;;;IAIA,UAAU;;;;;;IAMV,6BAA6B;;;;;;IAM7B,6BAA6B;;;;;;;EAO/B;IACE,WAAW,kBAAkB;;;EAG/B,yBACE,SAAS,uBAAuB,OAAO,iBACpC;;;;EAIL,eAAe,OAAO,YAAY,WAAW;;EAE7C,YACE,QAAQ,OAAO,OAAO,aAAa,QACnC,cAAc,gBAAgB,OAAO,aAAa;;;;;;EAOpD,YAAY,OAAO,kBAAkB,OAAO,aAAa;;;;;;EAMzD,cACE,OAAO,wBAAwB,OAAO,aAAa;;EAGrD;;EAEA;EAEA;;UAGe,2BAA2B;;EAE1C;;EAEA;;EAEA;;cAiDW,OACX,cAAc,aAAa,YAC3B,yBACA;;WAqMkB,MAAM;;;;;;;EADxB,YACkB,MAAM,OACtB,UAAS,cAAc,OAAO,aAAa,QAC3C;EAkBF,WAAW,SAAS,cAAc,OAAO,aAAa;EAmBtD,mBACE,OAAO,wBAAwB,OAAO,aAAa;;EAMrD,sBAAsB;EAItB,UAAU,QAAQ,YAAY;EA4B9B,KAAK,UAAU,gBAAgB,OAAO,aAAa,QACjD,cAAc;aAAqB;cAAoC;;;;;;;;;;;EA8HzE,WAAW,OAAO,YAAY;;MAmE1B;;MAOA;;EAOJ;;EAKA;EAIA,WAAW;EAeX;;EAKA,gBAAgB;;;;;EA6BhB,gBAAgB,UAAU,OAAO;EAcjC,eAAe,YAAY,QAAQ;EA2BnC,cACE,aAAa;IAAU;;EAoCzB,WAAW,SAAS;EA8BpB,MAAM,UAAU;EAuChB;EAiBA,QAAQ;;EAwJR;;EAWA;;EAeA,sBAAsB,eAAe,eAAe;;EAoBpD,6BAA6B;;EAQ7B,iBAAiB,OAAO,oBAAoB,OAAO"}
+{"version":3,"file":"editor.d.ts","names":[],"sources":["../../src/editor/editor.ts"],"mappings":";;;;;;;;;;;UAwOU;EACR,aAAa;EACb,eAAe;EACf,aAAa;;EAEb;;UAGQ,wBAAwB,qBAAqB;EACrD,MAAM;EACN,iBAAiB,eAAe;;EAEhC;;UAGQ,wBAAwB,qBAAqB;EACrD,UAAU;EACV,iBAAiB,mBAAmB;;EAEpC;;KAGG,oBACH,cAAc,YACd,eACE,uBACA,wBAAwB,eACxB,wBAAwB;KAEvB,gBACH,cAAc,YACd,aACA,SACE,uBACA,KAAK,aAAa,SAClB,SAAS,aAAa;UAkBT,cAAc,cAAc,YAAY,aAAa;;EAEpE;;;;;;EAMA;;;;;;EAMA,eAAe,mBAAmB,OAAO;;EAEzC,SAAS;;EAET;;EAEA;;;;;EAKA,eAAe;;EAEf,wBAAwB;;;;;EAKxB;;;;EAIA;;;;;;;IAOE;;;;IAIA,UAAU;;;;;;IAMV,6BAA6B;;;;;;IAM7B,6BAA6B;;;;;;;EAO/B;IACE,WAAW,kBAAkB;;;EAG/B,yBACE,SAAS,uBAAuB,OAAO,iBACpC;;;;EAIL,eAAe,OAAO,YAAY,WAAW;;EAE7C,YACE,QAAQ,OAAO,OAAO,aAAa,QACnC,cAAc,gBAAgB,OAAO,aAAa;;;;;;EAOpD,YAAY,OAAO,kBAAkB,OAAO,aAAa;;;;;;EAMzD,cACE,OAAO,wBAAwB,OAAO,aAAa;;EAGrD;;EAEA;EAEA;;UAGe,2BAA2B;;EAE1C;;EAEA;;EAEA;;cAiDW,OACX,cAAc,aAAa,YAC3B,yBACA;;WAyMkB,MAAM;;;;;;;EADxB,YACkB,MAAM,OACtB,UAAS,cAAc,OAAO,aAAa,QAC3C;EAkBF,WAAW,SAAS,cAAc,OAAO,aAAa;EAmBtD,mBACE,OAAO,wBAAwB,OAAO,aAAa;;EAMrD,sBAAsB;EAItB,UAAU,QAAQ,YAAY;EA6B9B,KAAK,UAAU,gBAAgB,OAAO,aAAa,QACjD,cAAc;aAAqB;cAAoC;;;;;;;;;;;EA4IzE,WAAW,OAAO,YAAY;;MAmE1B;;MAOA;;EAOJ;;EAKA;EAIA,WAAW;EAeX;;EAKA,gBAAgB;;;;;EA6BhB,gBAAgB,UAAU,OAAO;EAcjC,eAAe,YAAY,QAAQ;EA2BnC,cACE,aAAa;IAAU;;EAoCzB,WAAW,SAAS;EA8BpB,MAAM,UAAU;EAuChB;EAiBA,QAAQ;;EA2JR;;EAWA;;EAeA,sBAAsB,eAAe,eAAe;;EAoBpD,6BAA6B;;EAQ7B,iBAAiB,OAAO,oBAAoB,OAAO"}

package/dist/editor/editor.js

@@ -7,11 +7,11 @@ import { EditStack } from "./editStack.js";
 import { getTextDocumentChangeTransaction } from "./textDocumentChangeTransaction.js";
 import { TextDocument } from "./textDocument.js";
 import { EditStateManager, cloneEditorViewState, toManagedEditState } from "./EditStateManager.js";
+import { cloneRetainedDiffSessionSnapshot } from "./cloneRetainedDiffSessionSnapshot.js";
 import { isMoveCursorShortcut, isPrimaryModifier } from "./platform.js";
 import { resolveEditorCommandFromKeyboardEvent, resolveFindAgainShortcut } from "./command.js";
-import { cloneRetainedDiffSessionSnapshot } from "./cloneRetainedDiffSessionSnapshot.js";
-import editor_default from "./editor2.js";
 import { buildEditPredictionRequest, matchesEditPredictionPattern, recordEditPrediction } from "./editPrediction.js";
+import editor_default from "./editor2.js";
 import { resolveBlockCommentEdits, resolveCommentConfig, resolveLineCommentEdits } from "./languages.js";
 import { addEventListener, clampDomOffset, extend, getLineNumberAttr, h, lookupScrollContainer, round } from "./utils.js";
 import { applyDocumentChangeToLineAnnotations, renderLineAnnotations } from "./lineAnnotations.js";
@@ -108,6 +108,7 @@ var Editor = class {
 	#resizeObserver;
 	#fileInstance;
 	#applyDocumentChange;
+	#applySuspendedDocumentChange;
 	#publishChange;
 	#isRendering = false;
 	#restoreEditorStateOnSync = false;
@@ -238,6 +239,7 @@ var Editor = class {
 		const previousSession = this.#editSession;
 		if (this.#isRendering) throw new Error("Editor.edit: the editor is already rendering its component");
 		if (this.#fileInstance != null && this.#fileInstance !== fileInstance) throw new Error("Editor.edit: a recycled edit session cannot attach to a different component");
+		if (fileInstance.type === "file-diff" && this.#editSession == null && !fileInstance.__canAttachEditor()) throw new Error("Editor.edit: a complete diff is required before editing");
 		const initialState = this.#initialState;
 		const initialEditorState = initialState?.editor;
 		const editStateKey = this.#editStateKey;
@@ -258,6 +260,7 @@ var Editor = class {
 			this.#initialize();
 			if (fileInstance.type === "file" && editor.type === "file") {
 				editor.#applyDocumentChange = fileInstance.applyDocumentChange.bind(fileInstance);
+				editor.#applySuspendedDocumentChange = fileInstance.applySuspendedDocumentChange.bind(fileInstance);
 				editor.#publishChange = (changes, file, lineAnnotations) => {
 					const event = {
 						changes,
@@ -273,6 +276,7 @@ var Editor = class {
 				else fileInstance.__resumeEditor(editor);
 			} else if (fileInstance.type === "file-diff" && editor.type === "file-diff") {
 				editor.#applyDocumentChange = fileInstance.applyDocumentChange.bind(fileInstance);
+				editor.#applySuspendedDocumentChange = fileInstance.applySuspendedDocumentChange.bind(fileInstance);
 				editor.#publishChange = (changes, file, lineAnnotations) => {
 					const event = {
 						changes,
@@ -298,6 +302,7 @@ var Editor = class {
 			if (this.#detach == null) {
 				this.#fileInstance = void 0;
 				this.#applyDocumentChange = void 0;
+				this.#applySuspendedDocumentChange = void 0;
 				this.#publishChange = void 0;
 			}
 			if (initialState != null && initialEditorState != null) initialState.editor = initialEditorState;
@@ -552,6 +557,7 @@ var Editor = class {
 			this.#editSession = void 0;
 			this.#fileInstance = void 0;
 			this.#applyDocumentChange = void 0;
+			this.#applySuspendedDocumentChange = void 0;
 			this.#publishChange = void 0;
 		}
 	}
@@ -566,8 +572,11 @@ var Editor = class {
 		editSession.editor = cloneEditorViewState(editorState);
 		if (editSession.type === "file") return false;
 		const capturedDiffSession = fileInstance.__captureDocumentSessionState();
-		editSession.diffSession = capturedDiffSession?.diffSession;
-		if (capturedDiffSession == null) return false;
+		if (capturedDiffSession == null) {
+			editSession.diffSession = void 0;
+			return false;
+		}
+		editSession.diffSession = capturedDiffSession.diffSession;
 		const document = editSession.document;
 		return capturedDiffSession.hasChanges || hasEditorState || document?.canUndo === true || document?.canRedo === true;
 	}
@@ -967,17 +976,15 @@ var Editor = class {
 				if (typeof selectionRaw.getComposedRanges === "function") composedRange = selectionRaw.getComposedRanges({ shadowRoots: [shadowRoot] })?.[0];
 				else composedRange = getShadowRootRange(shadowRoot);
 				if (composedRange === void 0 || !this.#rangeBelongsToEditor(composedRange)) return;
-				let selection = convertSelection(composedRange, 0);
+				const selection = convertSelection(composedRange, 0);
 				if (selection === void 0) return;
 				if (this.#isContentMouseDown && this.#shiftKeyPressed && this.#selections !== void 0 && this.#selections.length > 0) {
 					const primarySelection = this.#selections.at(-1);
 					this.#updateSelections([extendSelection(primarySelection, selection)]);
 					return;
 				}
-				if (this.#isContentMouseDown) {
-					if (this.#selectionStart !== void 0) selection = createSelectionFrom(this.#selectionStart, selection);
-					else this.#selectionStart = selection;
-				} else if (this.#selectionStart !== void 0) selection.direction = createSelectionFrom(this.#selectionStart, selection).direction;
+				if (this.#selectionStart !== void 0) selection.direction = createSelectionFrom(this.#selectionStart, selection).direction;
+				else if (this.#isContentMouseDown) this.#selectionStart = selection;
 				else if (this.#selections !== void 0 && this.#selections.length === 1) {
 					const previous = this.#selections[0];
 					if (comparePosition(previous.start, selection.start) === 0 && comparePosition(previous.end, selection.end) === 0) selection.direction = previous.direction;
@@ -3409,7 +3416,11 @@ var Editor = class {
 				} else shouldUpdateBuffer = true;
 			}
 		}
-		this.#rerender(change, newLineAnnotations, renderRange, shouldUpdateBuffer);
+		if (this.#isRendering && this.#tokenizer != null && this.#contentElement != null) this.#rerender(change, newLineAnnotations, renderRange, shouldUpdateBuffer);
+		else if (textDocument != null) {
+			this.#applySuspendedDocumentChange?.(textDocument, newLineAnnotations);
+			if (newLineAnnotations != null) this.#lineAnnotations = newLineAnnotations;
+		}
 		if (newSelections != null) this.#updateSelections(newSelections);
 		this.#fileInstance?.__acknowledgeDocumentUpdate();
 		this.#checkpointEditSessionState();