@pierre/diffs 1.3.2 → 1.3.4

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

@@ -1 +1 @@
-{"version":3,"file":"editor.d.ts","names":[],"sources":["../../src/editor/editor.ts"],"mappings":";;;;;;;;;UAwLiB,aAAA;;EAEf,iBAAA;EAF4B;EAI5B,MAAA,GAAS,YAAA;EAAA;;;;EAKT,YAAA;EAgCkC;;;;EA3BlC,mBAAA,GAAsB,mBAAA;EAgCiB;EA9BvC,gBAAA;EAkCQ;EAhCR,aAAA;EAkCM;;;;EA7BN,YAAA,GAAe,YAAA;EAgCW;EA9B1B,qBAAA,GAAwB,iBAAA;EAzBK;;;;EA8B7B,sBAAA;EAhBA;;;;;EAsBA,SAAA;IACE,QAAA,GAAW,IAAA,cAAkB,OAAA;EAAA;EAP/B;EAUA,qBAAA,IACE,OAAA,EAAS,sBAAA,CAAuB,WAAA,MAC7B,WAAA;EALH;EAOF,QAAA,IACE,MAAA,EAAQ,MAAA,CAAO,WAAA,GACf,YAAA,EAAc,sBAAA,CAAuB,WAAA;EATR;EAY/B,QAAA,IACE,IAAA,EAAM,YAAA,EACN,eAAA,EACI,cAAA,CAAe,WAAA,MACf,kBAAA,CAAmB,WAAA,iBAEvB,KAAA,EAAO,iBAAA,CAAkB,WAAA;EAdhB;EAiBX,OAAA;EAjBE;EAmBF,MAAA;EAEA,OAAA;AAAA;AAAA,UAGe,kBAAA,SAA2B,YAAY;EApBpD;EAsBF,UAAA;EArBuC;EAuBvC,SAAA;EApBA;EAsBA,MAAA;AAAA;AAAA,cAmBW,MAAA,yBAA+B,WAAA,CAAY,WAAA;EAAA;EAkJtD,WAAA,CAAY,OAAA,GAAS,aAAA,CAAc,WAAA;EAInC,UAAA,CAAW,OAAA,EAAS,aAAA,CAAc,WAAA;EAkClC,IAAA,WAAe,sBAAA,CAAuB,WAAA,GACpC,YAAA,EAAc,gBAAA,CAAiB,CAAA;EA5NxB;;;;;;;AAOF;AAGT;;EA4OE,UAAA,CAAW,KAAA,EAAO,QAAA,IAAY,aAAA;EA5OwB;EAAA,IA+SlD,OAAA;EA7SJ;EAAA,IAkTI,OAAA;EA9SJ;EAmTA,IAAA;EAnTM;EAwTN,IAAA;EAIA,OAAA,IAAW,YAAA;EAcX,OAAA;EAIA,QAAA,IAAY,WAAA;EAaZ,QAAA;IAAW,UAAA;IAAY;EAAA,GAAQ,WAAA;EAgB/B,aAAA,CACE,UAAA,GAAa,KAAA;IAAU,SAAA;EAAA;EAoCzB,UAAA,CAAW,OAAA,EAAS,MAAA;EA6BpB,KAAA,CAAM,OAAA,GAAU,kBAAA;EAmChB,IAAA;EAOA,OAAA,CAAQ,OAAA;EAjPU;EAoUlB,aAAA,CAAc,IAAA,EAAM,YAAA,GAAe,YAAA;EA5NvB;EAwPZ,+BAAA;EA3OuB;EAsPvB,+BAAA;EArOe;EAoPf,gBAAA,EAAkB,WAAA,CAAY,WAAA;AAAA"}
+{"version":3,"file":"editor.d.ts","names":[],"sources":["../../src/editor/editor.ts"],"mappings":";;;;;;;;;UA8LiB,aAAA;;EAEf,iBAAA;EAF4B;EAI5B,MAAA,GAAS,YAAA;EAAA;;;;EAKT,YAAA;EAgCkC;;;;EA3BlC,mBAAA,GAAsB,mBAAA;EAgCiB;EA9BvC,gBAAA;EAkCQ;EAhCR,aAAA;EAkCM;;;;EA7BN,YAAA,GAAe,YAAA;EAgCW;EA9B1B,qBAAA,GAAwB,iBAAA;EAzBK;;;;EA8B7B,sBAAA;EAhBA;;;;;EAsBA,SAAA;IACE,QAAA,GAAW,IAAA,cAAkB,OAAA;EAAA;EAP/B;EAUA,qBAAA,IACE,OAAA,EAAS,sBAAA,CAAuB,WAAA,MAC7B,WAAA;EALH;EAOF,QAAA,IACE,MAAA,EAAQ,MAAA,CAAO,WAAA,GACf,YAAA,EAAc,sBAAA,CAAuB,WAAA;EATR;EAY/B,QAAA,IACE,IAAA,EAAM,YAAA,EACN,eAAA,EACI,cAAA,CAAe,WAAA,MACf,kBAAA,CAAmB,WAAA,iBAEvB,KAAA,EAAO,iBAAA,CAAkB,WAAA;EAdhB;EAiBX,OAAA;EAjBE;EAmBF,MAAA;EAEA,OAAA;AAAA;AAAA,UAGe,kBAAA,SAA2B,YAAY;EApBpD;EAsBF,UAAA;EArBuC;EAuBvC,SAAA;EApBA;EAsBA,MAAA;AAAA;AAAA,cAmBW,MAAA,yBAA+B,WAAA,CAAY,WAAA;EAAA;EAkJtD,WAAA,CAAY,OAAA,GAAS,aAAA,CAAc,WAAA;EAInC,UAAA,CAAW,OAAA,EAAS,aAAA,CAAc,WAAA;EAkClC,IAAA,WAAe,sBAAA,CAAuB,WAAA,GACpC,YAAA,EAAc,gBAAA,CAAiB,CAAA;EA5NxB;;;;;;;AAOF;AAGT;;EA4OE,UAAA,CAAW,KAAA,EAAO,QAAA,IAAY,aAAA;EA5OwB;EAAA,IA+SlD,OAAA;EA7SJ;EAAA,IAkTI,OAAA;EA9SJ;EAmTA,IAAA;EAnTM;EAwTN,IAAA;EAIA,OAAA,IAAW,YAAA;EAcX,OAAA;EAIA,QAAA,IAAY,WAAA;EAcZ,QAAA;IAAW,UAAA;IAAY;EAAA,GAAQ,WAAA;EAqB/B,aAAA,CACE,UAAA,GAAa,KAAA;IAAU,SAAA;EAAA;EAoCzB,UAAA,CAAW,OAAA,EAAS,MAAA;EA6BpB,KAAA,CAAM,OAAA,GAAU,kBAAA;EAmChB,IAAA;EAOA,OAAA,CAAQ,OAAA;EAvPU;EA0UlB,aAAA,CAAc,IAAA,EAAM,YAAA,GAAe,YAAA;EAlOvB;EA8PZ,+BAAA;EAhPuB;EA2PvB,+BAAA;EArOe;EAoPf,gBAAA,EAAkB,WAAA,CAAY,WAAA;AAAA"}

package/dist/editor/editor.js

@@ -7,7 +7,7 @@ import { resolveEditorCommandFromKeyboardEvent, resolveFindAgainShortcut } from
 import editor_default from "./editor2.js";
 import { EditStack } from "./editStack.js";
 import { resolveBlockCommentEdits, resolveCommentConfig, resolveLineCommentEdits } from "./languages.js";
-import { addEventListener, clampDomOffset, extend, getLineNumberAttr, h, round } from "./utils.js";
+import { addEventListener, clampDomOffset, extend, getLineNumberAttr, h, lookupScrollContainer, round } from "./utils.js";
 import { applyDocumentChangeToLineAnnotations, renderLineAnnotations } from "./lineAnnotations.js";
 import { PopoverManager } from "./popover.js";
 import { applyDeleteCharacterToSelections, applyDeleteHardLineForwardToSelections, applyDeleteSoftLineBackwardToSelections, applyDeleteWordBackwardToSelections, applyTextChangeToSelections, applyTextReplaceToSelections, applyTransposeToSelections, comparePosition, convertSelection, createSelectionFrom, createSelectionFromAnchorAndFocusOffsets, expandCollapsedSelectionToWord, extendSelection, extendSelections, findNextMatch, getAutoSurroundReplacementTexts, getCaretPosition, getDocumentBoundarySelection, getDocumentFullSelection, getSelectedLineBlocks, getSelectionAnchor, getSelectionClipboardTexts, getSelectionText, isCollapsedSelection, isLineEditable, mapCursorMove, mapSelectionShift, mergeOverlappingSelections, remapSelectionsAfterEdits, resolveIndentEdits, resolveSelectionCut, selectionIntersects, shiftSelectionLines } from "./selection.js";
@@ -222,7 +222,10 @@ var Editor = class {
 		const fileInstance = this.#fileInstance;
 		return {
 			selections: this.#selections,
-			view: fileInstance != null ? { scrollLeft: fileInstance.getCodeScrollLeft() } : void 0
+			view: fileInstance != null ? {
+				scrollLeft: fileInstance.getCodeScrollLeft(),
+				scrollTop: this.#getViewportScrollTop()
+			} : void 0
 		};
 	}
 	setState({ selections, view }) {
@@ -231,6 +234,7 @@ var Editor = class {
 		this.#updateSelections(selections ?? []);
 		if (view != null) {
 			this.#fileInstance.setCodeScrollLeft(view.scrollLeft);
+			if (view.scrollTop !== void 0) this.#setViewportScrollTop(view.scrollTop);
 			return;
 		}
 		this.#scrollToPrimaryCaret();
@@ -311,7 +315,7 @@ var Editor = class {
 		this.#invalidateOnAttach();
 		if (!recycle) this.#attachState.delivered = false;
 		const hadFileInstance = this.#fileInstance != null;
-		const shouldRestoreState = this.#isStatePersistenceEnabled;
+		const shouldRestoreState = this.#options.persistState === true;
 		this.#stateRestoreGeneration++;
 		this.#persistCurrentState();
 		if (hadFileInstance) this.#restoreStateOnNextSync = shouldRestoreState;
@@ -432,7 +436,7 @@ var Editor = class {
 			if (this.#spriteElement !== void 0) shadowRoot.prepend(this.#spriteElement);
 		}
 		const shouldRebuildDocument = this.#textDocument === void 0 || this.#fileInfo === void 0 || this.#fileInfo.name !== fileOrDiff.name || this.#fileInfo.lang !== fileOrDiff.lang || this.#fileInfo.cacheKey !== fileOrDiff.cacheKey;
-		const persistedCacheKey = this.#isStatePersistenceEnabled ? requirePersistedCacheKey(fileOrDiff) : void 0;
+		const persistedCacheKey = this.#options.persistState === true ? requirePersistedCacheKey(fileOrDiff) : void 0;
 		let persistedStateTarget;
 		if (shouldRebuildDocument) {
 			this.#invalidateOnAttach();
@@ -442,7 +446,9 @@ var Editor = class {
 			const editStack = new EditStack({ maxEntries: this.#options.historyMaxEntries });
 			const { name, lang, cacheKey } = fileOrDiff;
 			const languageId = lang ?? getFiletypeFromFileName(fileOrDiff.name);
-			const textDocument = (persistedCacheKey !== void 0 ? this.#getCachedTextDocument(fileOrDiff, persistedCacheKey) : void 0) ?? new TextDocument(fileOrDiff.name, contents, languageId, 0, editStack);
+			const cachedTextDocument = persistedCacheKey !== void 0 ? this.#getCachedTextDocument(fileOrDiff, persistedCacheKey) : void 0;
+			const reusableTextDocument = fileInstance.type === "file" || cachedTextDocument?.getText() === contents ? cachedTextDocument : void 0;
+			const textDocument = reusableTextDocument ?? new TextDocument(fileOrDiff.name, contents, languageId, 0, editStack);
 			this.#fileInfo = {
 				name,
 				lang,
@@ -461,7 +467,7 @@ var Editor = class {
 			this.#resetState();
 			this.#wrapLineOffsetsCache.clear();
 			this.#selections = this.#initSelections;
-			if (this.#textDocument !== void 0 && this.#options.__debug === true) console.log("[diffs/editor] text document rebuilt from", fileOrDiff.name);
+			if (this.#options.__debug === true) console.log(reusableTextDocument !== void 0 ? "[diffs/editor] cached text document reused for" : "[diffs/editor] text document rebuilt from", fileOrDiff.name);
 		}
 		if (persistedStateTarget === void 0 && this.#restoreStateOnNextSync && persistedCacheKey !== void 0 && this.#textDocument !== void 0) persistedStateTarget = {
 			cacheKey: persistedCacheKey,
@@ -530,9 +536,6 @@ var Editor = class {
 		}
 		this.#scheduleOnAttach(fileInstance);
 	};
-	get #isStatePersistenceEnabled() {
-		return this.#options.persistState === true && this.#fileInstance?.type === "file";
-	}
 	#getCachedTextDocument(file, cacheKey) {
 		const textDocument = this.#textDocumentCache.get(cacheKey);
 		const languageId = file.lang ?? getFiletypeFromFileName(file.name);
@@ -549,7 +552,7 @@ var Editor = class {
 	#persistCurrentState() {
 		const fileInfo = this.#fileInfo;
 		const textDocument = this.#textDocument;
-		if (!this.#isStatePersistenceEnabled || fileInfo === void 0 || textDocument === void 0) return;
+		if (this.#options.persistState !== true || this.#fileInstance === void 0 || fileInfo === void 0 || textDocument === void 0) return;
 		const cacheKey = requirePersistedCacheKey(fileInfo);
 		this.#textDocumentCache.set(cacheKey, textDocument);
 		let storage;
@@ -562,7 +565,7 @@ var Editor = class {
 		const pendingRestore = this.#pendingStateRestore;
 		if (pendingRestore?.cacheKey === cacheKey && pendingRestore.textDocument === textDocument) {
 			this.#pendingStateRestore = void 0;
-			if (textDocument.version === pendingRestore.documentVersion && this.#selections === pendingRestore.selections && state.view?.scrollLeft === pendingRestore.view?.scrollLeft) return;
+			if (textDocument.version === pendingRestore.documentVersion && this.#selections === pendingRestore.selections && state.view?.scrollLeft === pendingRestore.view?.scrollLeft && state.view?.scrollTop === pendingRestore.view?.scrollTop) return;
 			this.#writeState(storage, cacheKey, state, pendingRestore.completion);
 			return;
 		}
@@ -597,10 +600,19 @@ var Editor = class {
 		const documentVersion = textDocument.version;
 		const selections = this.#selections;
 		const view = this.getState().view;
+		let inputWatch;
 		const applyState = (state) => {
 			const currentView = this.getState().view;
-			if (state === void 0 || generation !== this.#stateRestoreGeneration || this.#textDocument !== textDocument || textDocument.version !== documentVersion || this.#selections !== selections || currentView?.scrollLeft !== view?.scrollLeft || this.#fileInfo === void 0 || requirePersistedCacheKey(this.#fileInfo) !== cacheKey) return;
-			this.setState(cloneEditorState(state));
+			if (generation !== this.#stateRestoreGeneration || this.#textDocument !== textDocument || textDocument.version !== documentVersion || this.#selections !== selections || currentView?.scrollLeft !== view?.scrollLeft || this.#fileInfo === void 0 || requirePersistedCacheKey(this.#fileInfo) !== cacheKey) return;
+			const userScrolled = inputWatch?.userScrolled() === true;
+			if (state === void 0) {
+				this.#fileInstance?.setCodeScrollLeft(0);
+				if (!userScrolled) this.#setViewportScrollTop(0);
+				return;
+			}
+			const restored = cloneEditorState(state);
+			if (userScrolled && restored.view !== void 0) restored.view = { scrollLeft: restored.view.scrollLeft };
+			this.setState(restored);
 		};
 		const readState = () => {
 			let result;
@@ -617,6 +629,7 @@ var Editor = class {
 		const pendingWrite = this.#pendingStateWrites.get(cacheKey);
 		const result = pendingWrite === void 0 ? readState() : pendingWrite.then(readState);
 		if (isPromise(result)) {
+			inputWatch = this.#watchViewportUserInput();
 			const pendingRestore = {
 				cacheKey,
 				textDocument,
@@ -627,10 +640,36 @@ var Editor = class {
 			};
 			this.#pendingStateRestore = pendingRestore;
 			pendingRestore.completion.finally(() => {
+				inputWatch?.dispose();
 				if (this.#pendingStateRestore === pendingRestore) this.#pendingStateRestore = void 0;
 			});
 		}
 	}
+	#watchViewportUserInput() {
+		const viewport = this.#getScrollViewport();
+		if (!(viewport instanceof HTMLElement)) return;
+		let scrolled = false;
+		const eventTypes = [
+			"wheel",
+			"touchstart",
+			"mousedown"
+		];
+		const dispose = () => {
+			for (const type of eventTypes) viewport.removeEventListener(type, onInput, { capture: true });
+		};
+		const onInput = () => {
+			scrolled = true;
+			dispose();
+		};
+		for (const type of eventTypes) viewport.addEventListener(type, onInput, {
+			capture: true,
+			passive: true
+		});
+		return {
+			userScrolled: () => scrolled,
+			dispose
+		};
+	}
 	#isLineRenderable(line) {
 		return this.#fileInstance?.isLineRenderable?.(line + 1) ?? true;
 	}
@@ -713,6 +752,23 @@ var Editor = class {
 		attachState.callback = callback;
 		queueRender(callback);
 	}
+	#getScrollViewport() {
+		const viewport = this.#fileInstance?.getEditorViewport?.();
+		if (viewport !== void 0) return viewport;
+		const fileContainer = this.#fileContainer;
+		if (this.#fileInstance == null || fileContainer == null) return;
+		return lookupScrollContainer(fileContainer);
+	}
+	#getViewportScrollTop() {
+		const viewport = this.#getScrollViewport();
+		if (viewport instanceof HTMLElement) return viewport.scrollTop;
+		return viewport?.defaultView?.scrollY ?? 0;
+	}
+	#setViewportScrollTop(scrollTop) {
+		const viewport = this.#getScrollViewport();
+		if (viewport instanceof HTMLElement) viewport.scrollTop = scrollTop;
+		else if (viewport instanceof Document) viewport.defaultView?.scrollTo({ top: scrollTop });
+	}
 	#initialize() {
 		this.#globalStyleElement = h("style", {
 			dataset: "editorGlobalCss",
@@ -1747,7 +1803,8 @@ var Editor = class {
 		const contentElement = this.#contentElement;
 		const fileContainer = this.#fileContainer;
 		if (this.#textDocument == null || contentElement == null || fileContainer == null) return;
-		const viewport = this.#fileInstance?.getEditorViewport?.() ?? this.#getDefaultEditorViewport(fileContainer);
+		const viewport = this.#getScrollViewport();
+		if (viewport === void 0) return;
 		let viewportTop;
 		let viewportBottom;
 		if (viewport instanceof HTMLElement) {
@@ -1755,10 +1812,8 @@ var Editor = class {
 			viewportTop = viewportRect.top;
 			viewportBottom = viewportRect.bottom;
 		} else {
-			const viewportWindow = viewport.defaultView;
-			if (viewportWindow == null) return;
 			viewportTop = 0;
-			viewportBottom = viewportWindow.innerHeight;
+			viewportBottom = viewport.defaultView?.innerHeight ?? 0;
 		}
 		const stickyHeader = fileContainer.shadowRoot?.querySelector("[data-diffs-header][data-sticky]");
 		if (stickyHeader != null) viewportTop = Math.max(viewportTop, stickyHeader.getBoundingClientRect().bottom);
@@ -1774,16 +1829,6 @@ var Editor = class {
 			if (rowRect.top >= viewportTop && rowRect.top < viewportBottom) return lineNumber;
 		}
 	}
-	#getDefaultEditorViewport(fileContainer) {
-		const ownerDocument = fileContainer.ownerDocument;
-		let element = fileContainer.parentElement;
-		while (element != null && element !== ownerDocument.body && element !== ownerDocument.documentElement) {
-			const overflowY = element.ownerDocument.defaultView?.getComputedStyle(element).overflowY;
-			if (overflowY === "auto" || overflowY === "scroll" || overflowY === "overlay") return element;
-			element = element.parentElement;
-		}
-		return ownerDocument;
-	}
 	#focusAtPosition(position, preventScroll) {
 		const selection = {
 			start: position,