@pierre/diffs 1.3.5 → 1.3.6

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"editor.d.ts","names":[],"sources":["../../src/editor/editor.ts"],"mappings":";;;;;;;;;UAwMiB,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;EAmJtD,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;EA7NxB;;;;;;;AAOF;AAGT;;EA6OE,UAAA,CAAW,KAAA,EAAO,QAAA,IAAY,aAAA;EA7OwB;EAAA,IAgTlD,OAAA;EA9SJ;EAAA,IAmTI,OAAA;EA/SJ;EAoTA,IAAA;EApTM;EAyTN,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;EAwUlB,aAAA,CAAc,IAAA,EAAM,YAAA,GAAe,YAAA;EAhOvB;EA4PZ,+BAAA;EA9OuB;EAyPvB,+BAAA;EAnOe;EAkPf,gBAAA,EAAkB,WAAA,CAAY,WAAA;AAAA"}

package/dist/editor/editor.js

@@ -4,13 +4,13 @@ import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { isSafari } from "../utils/platform.js";
 import { isMoveCursorShortcut, isPrimaryModifier } from "./platform.js";
 import { resolveEditorCommandFromKeyboardEvent, resolveFindAgainShortcut } from "./command.js";
-import { EditStack } from "./editStack.js";
 import editor_default from "./editor2.js";
+import { EditStack } from "./editStack.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";
 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";
+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, snapCharacterToGraphemeBoundary } from "./selection.js";
 import { MarkerRenderer, markerSeverityDatasetKey } from "./marker.js";
 import { findBracketMatchRanges } from "./matchBrackets.js";
 import { createSpriteElement } from "./sprite.js";
@@ -100,6 +100,7 @@ var Editor = class {
 	#isComposing = false;
 	#isGutterMouseDown = false;
 	#isContentMouseDown = false;
+	#altColumnDrag;
 	#shiftKeyPressed = false;
 	#selectionStart;
 	#deletedSelectionText = "";
@@ -330,8 +331,6 @@ var Editor = class {
 		this.#globalEventDisposes = void 0;
 		this.#editorEventDisposes?.forEach((dispose) => dispose());
 		this.#editorEventDisposes = void 0;
-		this.#selectEventDisposes?.forEach((dispose) => dispose());
-		this.#selectEventDisposes = void 0;
 		this.#detach?.(recycle);
 		this.#detach = void 0;
 		this.#gutterWidthCache = void 0;
@@ -711,12 +710,11 @@ var Editor = class {
 		this.#setEditorActiveLineSafe(null);
 		this.#gutterWidthCache = void 0;
 		this.#contentWidthCache = void 0;
-		this.#shouldIgnoreSelectionChange = false;
+		this.#resetSelectionGesture();
 		this.#suppressNativeSelectionSync = false;
 		this.#overlayElements?.forEach((el) => el.remove());
 		this.#overlayElements = void 0;
 		this.#selections = void 0;
-		this.#reservedSelections = void 0;
 		this.#scrollingToLine = void 0;
 		this.#markerRenderer?.cleanup();
 		this.#markerRenderer = void 0;
@@ -796,6 +794,13 @@ var Editor = class {
 			this.#contentHasFocus = false;
 			this.#shouldIgnoreSelectionChange = false;
 		};
+		const finishMouseSelection = (event) => {
+			if (event.pointerType !== "mouse") return;
+			const refocusEditor = this.#isGutterMouseDown;
+			this.#resetSelectionGesture();
+			if (refocusEditor) this.#focus();
+			if (this.#options.enabledSelectionAction === true && this.#selections !== void 0 && this.#selections.length > 0 && !isCollapsedSelection(this.#selections.at(-1))) this.#updateSelections(this.#selections);
+		};
 		this.#globalEventDisposes = [
 			addEventListener(document, "focusin", (event) => {
 				if (!replacementFocusTargetIsContent(event)) cancelReplacementFocus();
@@ -828,24 +833,15 @@ var Editor = class {
 					const previous = this.#selections[0];
 					if (comparePosition(previous.start, selection.start) === 0 && comparePosition(previous.end, selection.end) === 0) selection.direction = previous.direction;
 				}
+				if (this.#altColumnDrag !== void 0) {
+					this.#altColumnDrag.focusLine = getCaretPosition(selection).line;
+					if (this.#updateAltColumnSelections()) return;
+				}
 				if (this.#reservedSelections !== void 0) this.#updateSelections([...this.#reservedSelections.filter((reservedSelection) => !selectionIntersects(reservedSelection, selection)), selection]);
 				else this.#updateSelections([selection]);
 			}, { passive: true }),
-			addEventListener(document, "pointerup", (e) => {
-				if (e.pointerType !== "mouse") return;
-				this.#selectEventDisposes?.forEach((dispose) => dispose());
-				this.#selectEventDisposes = void 0;
-				if (this.#isGutterMouseDown) {
-					this.#isGutterMouseDown = false;
-					this.#focus();
-				}
-				this.#shouldIgnoreSelectionChange = false;
-				this.#isContentMouseDown = false;
-				this.#shiftKeyPressed = false;
-				this.#selectionStart = void 0;
-				this.#reservedSelections = void 0;
-				if (this.#options.enabledSelectionAction === true && this.#selections !== void 0 && this.#selections.length > 0 && !isCollapsedSelection(this.#selections.at(-1))) this.#updateSelections(this.#selections);
-			}, { passive: true }),
+			addEventListener(document, "pointerup", finishMouseSelection, { passive: true }),
+			addEventListener(document, "pointercancel", finishMouseSelection, { passive: true }),
 			addEventListener(document, "keydown", (e) => {
 				if (e.key === "Shift") this.#selectionStart = this.#selections?.at(-1);
 			}, { passive: true }),
@@ -854,6 +850,17 @@ var Editor = class {
 			}, { passive: true })
 		];
 	}
+	#resetSelectionGesture() {
+		this.#selectEventDisposes?.forEach((dispose) => dispose());
+		this.#selectEventDisposes = void 0;
+		this.#shouldIgnoreSelectionChange = false;
+		this.#isGutterMouseDown = false;
+		this.#isContentMouseDown = false;
+		this.#altColumnDrag = void 0;
+		this.#shiftKeyPressed = false;
+		this.#selectionStart = void 0;
+		this.#reservedSelections = void 0;
+	}
 	#replaceSelectEventListeners(disposes) {
 		this.#selectEventDisposes?.forEach((dispose) => dispose());
 		this.#selectEventDisposes = disposes;
@@ -889,6 +896,7 @@ var Editor = class {
 				this.#canMountSelectionAction = true;
 				this.#suppressNativeSelectionSync = false;
 				if (e.pointerType !== "mouse") return;
+				this.#altColumnDrag = void 0;
 				if (this.#isDeletedLineTarget(e)) {
 					this.#setDeletedTextSelectionActive(true);
 					if (this.#selections !== void 0) this.#updateSelections([]);
@@ -896,17 +904,39 @@ var Editor = class {
 				}
 				this.#setDeletedTextSelectionActive(false);
 				this.#markerRenderer?.removePopover();
+				const selectEventDisposes = [];
 				if (isSafari() && this.#lineAnnotations !== void 0 && this.#lineAnnotations.length > 0) {
 					const annotationDisposes = [...contentEl.querySelectorAll("[data-line-annotation]")].map((el) => [addEventListener(el, "mouseenter", () => {
 						this.#shouldIgnoreSelectionChange = true;
 					}), addEventListener(el, "mouseleave", () => {
 						this.#shouldIgnoreSelectionChange = false;
 					})]).flat();
-					this.#replaceSelectEventListeners(annotationDisposes);
+					selectEventDisposes.push(...annotationDisposes);
 				}
 				this.#isContentMouseDown = true;
+				const isAltColumnDrag = e.button === 0 && e.altKey && !e.ctrlKey && !e.metaKey && !e.shiftKey;
 				this.#selectionStart = void 0;
-				if (e.button === 0 && isPrimaryModifier(e)) this.#reservedSelections = this.#selections?.map((selection) => ({ ...selection }));
+				if (isAltColumnDrag) {
+					this.#altColumnDrag = {
+						pointerId: e.pointerId,
+						startClientX: e.clientX,
+						clientX: e.clientX,
+						startScrollLeft: contentEl.parentElement?.scrollLeft ?? 0
+					};
+					this.#reservedSelections = void 0;
+					this.#selections = void 0;
+					this.#updateSelections([]);
+					selectEventDisposes.push(addEventListener(document, "pointermove", (moveEvent) => {
+						const drag = this.#altColumnDrag;
+						if (drag === void 0 || moveEvent.pointerType !== "mouse" || moveEvent.pointerId !== drag.pointerId) return;
+						drag.clientX = moveEvent.clientX;
+						this.#updateAltColumnSelections();
+					}, {
+						capture: true,
+						passive: true
+					}));
+				} else if (e.button === 0 && isPrimaryModifier(e)) this.#reservedSelections = this.#selections?.map((selection) => ({ ...selection }));
+				this.#replaceSelectEventListeners(selectEventDisposes);
 				if (e.shiftKey) {
 					const primarySelection = this.#selections?.at(-1);
 					if (primarySelection !== void 0) {
@@ -924,6 +954,7 @@ var Editor = class {
 				if (!targetIsContentElement(e)) return;
 				this.#canMountSelectionAction = true;
 				this.#suppressNativeSelectionSync = false;
+				if (e.isComposing || e.keyCode === 229) return;
 				const command = resolveEditorCommandFromKeyboardEvent(e, this.#options.keymap);
 				if (command !== void 0) {
 					e.preventDefault();
@@ -1610,7 +1641,7 @@ var Editor = class {
 		if (tokenizer === void 0 || fileInstance === void 0 || textDocument === void 0 || contentEl === void 0) return;
 		tokenizer.stopBackgroundTokenize();
 		const t = performance.now();
-		const dirtyLines = tokenizer.tokenize(change, renderRange, !this.#isDiff);
+		const dirtyLines = tokenizer.tokenize(change, renderRange, !this.#isDiff && fileInstance.getLinePosition !== void 0);
 		const t2 = performance.now();
 		if (dirtyLines.size > 0) {
 			const children = contentEl.children;
@@ -2068,6 +2099,48 @@ var Editor = class {
 			if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) this.#updateSelections(this.#selections ?? []);
 		});
 	}
+	#updateAltColumnSelections() {
+		const drag = this.#altColumnDrag;
+		const selectionStart = this.#selectionStart;
+		const textDocument = this.#textDocument;
+		if (drag === void 0 || drag.focusLine === void 0 || selectionStart === void 0 || textDocument === void 0) return false;
+		const anchor = selectionStart.direction === -1 ? selectionStart.end : selectionStart.start;
+		const scrollLeft = this.#contentElement?.parentElement?.scrollLeft ?? 0;
+		const characterDeltaRaw = (drag.clientX - drag.startClientX + scrollLeft - drag.startScrollLeft) / this.#metrics.ch;
+		const characterDelta = characterDeltaRaw < 0 ? -Math.round(-characterDeltaRaw) : Math.round(characterDeltaRaw);
+		const focusCharacter = Math.max(0, anchor.character + characterDelta);
+		const goal = {
+			line: drag.focusLine,
+			character: focusCharacter
+		};
+		if (drag.renderedGoal !== void 0 && comparePosition(drag.renderedGoal, goal) === 0) return true;
+		drag.renderedGoal = goal;
+		const selections = [];
+		const step = goal.line < anchor.line ? -1 : 1;
+		for (let line = anchor.line;; line += step) {
+			if (this.#isLineRenderable(line)) {
+				const lineText = textDocument.getLineText(line);
+				const anchorOffset = Math.min(anchor.character, lineText.length);
+				const focusOffset = Math.min(focusCharacter, lineText.length);
+				const anchorCharacter = snapCharacterToGraphemeBoundary(lineText, anchorOffset);
+				const lineFocusCharacter = focusOffset === anchorOffset ? anchorCharacter : snapCharacterToGraphemeBoundary(lineText, focusOffset);
+				selections.push({
+					start: {
+						line,
+						character: Math.min(anchorCharacter, lineFocusCharacter)
+					},
+					end: {
+						line,
+						character: Math.max(anchorCharacter, lineFocusCharacter)
+					},
+					direction: anchorCharacter === lineFocusCharacter ? 0 : anchorCharacter < lineFocusCharacter ? 1 : -1
+				});
+			}
+			if (line === goal.line) break;
+		}
+		this.#updateSelections(selections);
+		return true;
+	}
 	#updateSelections(selections) {
 		this.__postponeBgTokenizeToNextFrame();
 		this.#primaryCaretElement = void 0;