@pierre/diffs 1.3.0-beta.9 → 1.3.0-rc.2

package/dist/editor/selection.js

@@ -4,6 +4,26 @@ import { applyDocumentChangeToLineAnnotations } from "./lineAnnotations.js";
 const DirectionBackward = -1;
 const DirectionNone = 0;
 const DirectionForward = 1;
+const AUTO_SURROUND_CLOSE_CHARS = /* @__PURE__ */ new Map([
+	["'", "'"],
+	["\"", "\""],
+	["`", "`"],
+	["{", "}"],
+	["[", "]"],
+	["<", ">"],
+	["(", ")"]
+]);
+const AUTO_SURROUND_QUOTE_CHARS = /* @__PURE__ */ new Set([
+	"'",
+	"\"",
+	"`"
+]);
+const AUTO_SURROUND_BRACKET_CHARS = /* @__PURE__ */ new Set([
+	"{",
+	"[",
+	"(",
+	"<"
+]);
 /**
 * Converts a selection from a web selection to an editor selection.
 */
@@ -25,11 +45,13 @@ function resolveIndentEdits(textDocument, selection, tabSize, outdent) {
 	const { start, end } = selection;
 	const edits = [];
 	let newSelection = { ...selection };
+	const blockIndent = start.line !== end.line;
 	let endLine = end.line;
 	if (start.line < end.line && end.character === 0) endLine--;
 	for (let line = start.line; line <= endLine; line++) {
 		const lineText = textDocument.getLineText(line);
 		if (lineText === void 0) continue;
+		if (blockIndent && lineText.trim().length === 0) continue;
 		const indentUnit = lineText.startsWith("	") ? "	" : " ".repeat(tabSize);
 		let deleteLength = 0;
 		let newText = indentUnit;
@@ -76,7 +98,7 @@ function resolveIndentEdits(textDocument, selection, tabSize, outdent) {
 /**
 * Maps the cursor move to all selections.
 */
-function mapCursorMove(textDocument, selections, shortcut) {
+function mapCursorMove(textDocument, selections, shortcut, options = {}) {
 	const lineCount = textDocument.lineCount;
 	return selections.map((selection) => {
 		let { line, character } = shortcut === "up" || shortcut === "left" ? selection.start : selection.end;
@@ -84,25 +106,46 @@ function mapCursorMove(textDocument, selections, shortcut) {
 			const caret = getCaretPosition(selection);
 			line = caret.line;
 			character = caret.character;
+			const softLine = getSoftLineInfo(textDocument, line, character, options);
 			if (shortcut === "textStart") {
-				const indent = getLeadingSpaces(textDocument.getLineText(line));
-				character = character === indent ? 0 : indent;
-			} else character = shortcut === "start" ? 0 : textDocument.getLineLength(line);
-		} else if (shortcut === "up") line = Math.max(0, line - 1);
-		else if (shortcut === "down") line = Math.min(Math.max(lineCount - 1, 0), line + 1);
-		else if (isCollapsedSelection(selection)) {
+				const softLineText = textDocument.getLineText(line).slice(softLine.start, softLine.end);
+				const indent = softLine.start + getLeadingSpaces(softLineText);
+				character = character === indent ? softLine.start : indent;
+			} else character = shortcut === "start" ? softLine.start : softLine.end;
+		} else if (shortcut === "up") {
+			const moved = moveBySoftLine(textDocument, line, character, -1, options);
+			if (moved !== void 0) {
+				line = moved.line;
+				character = moved.character;
+			} else if (line > 0) line = options.resolveRenderableLine == null ? line - 1 : options.resolveRenderableLine(line - 1, "up") ?? line;
+		} else if (shortcut === "down") {
+			const moved = moveBySoftLine(textDocument, line, character, 1, options);
+			if (moved !== void 0) {
+				line = moved.line;
+				character = moved.character;
+			} else {
+				const maxLine = Math.max(lineCount - 1, 0);
+				if (line < maxLine) line = options.resolveRenderableLine == null ? line + 1 : Math.min(options.resolveRenderableLine(line + 1, "down") ?? line, maxLine);
+			}
+		} else if (isCollapsedSelection(selection)) {
 			const lineLength = textDocument.getLineLength(line);
 			character = Math.min(character, lineLength);
 			if (shortcut === "left") {
 				if (character > 0) character = stepCharacterByGrapheme(textDocument, line, character, false);
 				else if (line > 0) {
-					line = line - 1;
-					character = textDocument.getLineLength(line);
+					const targetLine = options.resolveRenderableLine == null ? line - 1 : options.resolveRenderableLine(line - 1, "up");
+					if (targetLine !== void 0) {
+						line = targetLine;
+						character = textDocument.getLineLength(line);
+					}
 				}
 			} else if (character < lineLength) character = stepCharacterByGrapheme(textDocument, line, character, true);
 			else if (line < lineCount - 1) {
-				line = line + 1;
-				character = 0;
+				const targetLine = options.resolveRenderableLine == null ? line + 1 : options.resolveRenderableLine(line + 1, "down");
+				if (targetLine !== void 0) {
+					line = Math.min(targetLine, lineCount - 1);
+					character = 0;
+				}
 			}
 		}
 		const pos = {
@@ -116,17 +159,106 @@ function mapCursorMove(textDocument, selections, shortcut) {
 		};
 	});
 }
+function moveBySoftLine(textDocument, line, character, direction, options) {
+	if (options.getSoftLineOffsets === void 0) return;
+	const current = getSoftLineInfo(textDocument, line, character, options);
+	const targetIndex = current.index + direction;
+	let targetLine = line;
+	let target;
+	if (targetIndex >= 0 && targetIndex < current.count) target = getSoftLineInfoAtIndex(textDocument, targetLine, targetIndex, options);
+	else {
+		const nextLine = line + direction;
+		if (nextLine < 0 || nextLine >= textDocument.lineCount) return {
+			line,
+			character
+		};
+		const resolvedLine = options.resolveRenderableLine == null ? nextLine : options.resolveRenderableLine(nextLine, direction < 0 ? "up" : "down");
+		if (resolvedLine === void 0) return {
+			line,
+			character
+		};
+		targetLine = Math.min(resolvedLine, textDocument.lineCount - 1);
+		const targetCount = getSoftLineCount(textDocument, targetLine, options);
+		target = getSoftLineInfoAtIndex(textDocument, targetLine, direction < 0 ? targetCount - 1 : 0, options);
+	}
+	const column = Math.max(0, character - current.start);
+	const targetCharacter = target.start + column;
+	const landedCharacter = target.index === target.count - 1 ? targetCharacter : Math.min(targetCharacter, target.end);
+	const targetLineText = textDocument.getLineText(targetLine);
+	return {
+		line: targetLine,
+		character: landedCharacter > targetLineText.length ? landedCharacter : snapCharacterToGraphemeBoundary(targetLineText, landedCharacter)
+	};
+}
+function snapCharacterToGraphemeBoundary(lineText, character) {
+	if (character <= 0 || character >= lineText.length) return character;
+	const segmenter = getGraphemeSegmenter();
+	if (segmenter !== void 0) {
+		for (const segment of segmenter.segment(lineText)) {
+			if (character <= segment.index) return character;
+			const segmentEnd = segment.index + segment.segment.length;
+			if (character < segmentEnd) return segmentEnd;
+		}
+		return character;
+	}
+	let segmentStart = 0;
+	for (const codePoint of lineText) {
+		if (character <= segmentStart) return character;
+		const segmentEnd = segmentStart + codePoint.length;
+		if (character < segmentEnd) return segmentEnd;
+		segmentStart = segmentEnd;
+	}
+	return character;
+}
+function getSoftLineInfo(textDocument, line, character, options) {
+	const lineLength = textDocument.getLineLength(line);
+	const offsets = options.getSoftLineOffsets?.(line);
+	if (offsets === void 0 || offsets.length < 2) return {
+		start: 0,
+		end: lineLength,
+		index: 0,
+		count: 1
+	};
+	for (let index = 0; index + 1 < offsets.length; index++) {
+		const softLine = getSoftLineInfoAtIndex(textDocument, line, index, options);
+		if (character >= softLine.start && character <= softLine.end) return softLine;
+	}
+	return getSoftLineInfoAtIndex(textDocument, line, character < (offsets[0] ?? 0) ? 0 : offsets.length - 2, options);
+}
+function getSoftLineCount(textDocument, line, options) {
+	const offsets = options.getSoftLineOffsets?.(line);
+	return offsets === void 0 || offsets.length < 2 ? 1 : offsets.length - 1;
+}
+function getSoftLineInfoAtIndex(textDocument, line, index, options) {
+	const lineLength = textDocument.getLineLength(line);
+	const offsets = options.getSoftLineOffsets?.(line);
+	if (offsets === void 0 || offsets.length < 2) return {
+		start: 0,
+		end: lineLength,
+		index: 0,
+		count: 1
+	};
+	const count = offsets.length - 1;
+	const boundedIndex = Math.max(0, Math.min(index, count - 1));
+	const start = Math.max(0, Math.min(lineLength, offsets[boundedIndex] ?? 0));
+	return {
+		start,
+		end: Math.max(start, Math.min(lineLength, offsets[boundedIndex + 1] ?? lineLength)),
+		index: boundedIndex,
+		count
+	};
+}
 /**
 * Same as mapCursorMove, but with shift key pressed.
 */
-function mapSelectionShift(textDocument, selections, shortcut) {
+function mapSelectionShift(textDocument, selections, shortcut, options = {}) {
 	return selections.map((selection) => {
 		const focusPosition = selection.direction === -1 ? selection.start : selection.end;
 		const [movedFocusSelection] = mapCursorMove(textDocument, [{
 			start: focusPosition,
 			end: focusPosition,
 			direction: 0
-		}], shortcut);
+		}], shortcut, options);
 		return createSelectionFrom(selection, movedFocusSelection);
 	});
 }
@@ -218,12 +350,18 @@ function applyTextChangeToSelections(textDocument, selections, edit, lineAnnotat
 * When the inserted text still contains the original selection (auto-surround),
 * the inner range is reselected to match VS Code/CodeMirror behavior.
 */
+function getAutoSurroundPreservedOffset(originalText, newText) {
+	if (newText.length !== originalText.length + 2) return;
+	const closeChar = AUTO_SURROUND_CLOSE_CHARS.get(newText[0]);
+	if (closeChar === void 0 || newText[newText.length - 1] !== closeChar || newText.slice(1, -1) !== originalText) return;
+	return 1;
+}
 function getNextSelectionOffsetPairAfterReplace(textDocument, entry, offsetDelta, newText) {
 	const insertStart = entry.start + offsetDelta;
 	const insertEnd = insertStart + newText.length;
 	if (entry.end - entry.start > 0) {
 		const originalText = textDocument.getTextSlice(entry.start, entry.end);
-		const preservedOffset = newText.indexOf(originalText);
+		const preservedOffset = getAutoSurroundPreservedOffset(originalText, newText) ?? newText.indexOf(originalText);
 		if (preservedOffset !== -1 && preservedOffset + originalText.length <= newText.length) {
 			const rangeStart = insertStart + preservedOffset;
 			return [rangeStart, rangeStart + originalText.length];
@@ -232,9 +370,10 @@ function getNextSelectionOffsetPairAfterReplace(textDocument, entry, offsetDelta
 	return [insertEnd, insertEnd];
 }
 /**
-* Applies a text replace to multiple selections.
+* Applies text replacements to multiple selections. Texts pair by selection
+* index unless they are explicitly marked as document ordered.
 */
-function applyTextReplaceToSelections(textDocument, selections, texts, lineAnnotations, undoBoundary = false) {
+function applyTextReplaceToSelections(textDocument, selections, texts, lineAnnotations, undoBoundary = false, textOrder = "selection") {
 	if (selections.length !== texts.length) throw new Error("Selection text replacements must match the selection count");
 	const selectionPositions = [];
 	for (const selection of selections) selectionPositions.push(selection.start, selection.end);
@@ -245,8 +384,7 @@ function applyTextReplaceToSelections(textDocument, selections, texts, lineAnnot
 		const entry = {
 			index,
 			start: selectionOffsets[index * 2],
-			end: selectionOffsets[index * 2 + 1],
-			text: texts[index]
+			end: selectionOffsets[index * 2 + 1]
 		};
 		const previous = ordered[ordered.length - 1];
 		if (previous !== void 0 && (entry.start < previous.start || entry.start === previous.start && entry.end < previous.end)) isAlreadyOrdered = false;
@@ -302,10 +440,11 @@ function applyTextReplaceToSelections(textDocument, selections, texts, lineAnnot
 		edits = [];
 		let offsetDelta = 0;
 		let previousEditEnd = -1;
-		for (const entry of ordered) {
+		for (let index = 0; index < ordered.length; index++) {
+			const entry = ordered[index];
 			if (entry.start < previousEditEnd) throw new Error("Overlapping multi-selection edits are not supported");
 			previousEditEnd = entry.end;
-			const newText = expandSingleNewlineInsert(textDocument, entry.text, entry.start);
+			const newText = expandSingleNewlineInsert(textDocument, texts[textOrder === "document" ? index : entry.index], entry.start);
 			edits.push({
 				start: entry.start,
 				end: entry.end,
@@ -330,26 +469,6 @@ function applyTextReplaceToSelections(textDocument, selections, texts, lineAnnot
 		change
 	};
 }
-const AUTO_SURROUND_CLOSE_CHARS = /* @__PURE__ */ new Map([
-	["'", "'"],
-	["\"", "\""],
-	["`", "`"],
-	["{", "}"],
-	["[", "]"],
-	["<", ">"],
-	["(", ")"]
-]);
-const AUTO_SURROUND_QUOTE_CHARS = /* @__PURE__ */ new Set([
-	"'",
-	"\"",
-	"`"
-]);
-const AUTO_SURROUND_BRACKET_CHARS = /* @__PURE__ */ new Set([
-	"{",
-	"[",
-	"(",
-	"<"
-]);
 function shouldAutoSurroundChar(autoSurround, char) {
 	if (autoSurround === "never") return false;
 	if (autoSurround === "brackets") return AUTO_SURROUND_BRACKET_CHARS.has(char);
@@ -827,7 +946,7 @@ function shiftSelectionLines(selection, direction, lineCount, getLineLength) {
 /**
 * Finds the next matching word and updates the selections.
 */
-function findNexMatch(textDocument, selections) {
+function findNextMatch(textDocument, selections) {
 	if (selections.length === 0) return;
 	const normalizedSelections = selections.map((selection) => isCollapsedSelection(selection) ? expandCollapsedSelectionToWord(textDocument, selection) : selection);
 	const texts = normalizedSelections.map((s) => textDocument.getText(s));
@@ -879,6 +998,34 @@ function getDocumentBoundarySelection(textDocument, atEnd, trimmedEndNewLine) {
 		direction: 1
 	};
 }
+/** Resolves the document offset range one selection contributes to a copy. */
+function resolveClipboardRegion(textDocument, selection) {
+	if (isCollapsedSelection(selection)) {
+		const line = selection.start.line;
+		return {
+			start: textDocument.offsetAt({
+				line,
+				character: 0
+			}),
+			end: line < textDocument.lineCount - 1 ? textDocument.offsetAt({
+				line: line + 1,
+				character: 0
+			}) : textDocument.offsetAt({
+				line,
+				character: textDocument.getLineLength(line)
+			})
+		};
+	}
+	const start = textDocument.offsetAt(selection.start);
+	const end = textDocument.offsetAt(selection.end);
+	return start <= end ? {
+		start,
+		end
+	} : {
+		start: end,
+		end: start
+	};
+}
 /**
 * Resolves the document offset range each selection contributes to the
 * clipboard, ordered by position. A collapsed selection contributes its whole
@@ -886,38 +1033,19 @@ function getDocumentBoundarySelection(textDocument, atEnd, trimmedEndNewLine) {
 * trailing break to include. A ranged selection contributes the selected text.
 */
 function resolveClipboardRegions(textDocument, selections) {
-	return selections.map((selection) => {
-		if (isCollapsedSelection(selection)) {
-			const line = selection.start.line;
-			return {
-				start: textDocument.offsetAt({
-					line,
-					character: 0
-				}),
-				end: line < textDocument.lineCount - 1 ? textDocument.offsetAt({
-					line: line + 1,
-					character: 0
-				}) : textDocument.offsetAt({
-					line,
-					character: textDocument.getLineLength(line)
-				})
-			};
-		}
-		const start = textDocument.offsetAt(selection.start);
-		const end = textDocument.offsetAt(selection.end);
-		return start <= end ? {
-			start,
-			end
-		} : {
-			start: end,
-			end: start
-		};
-	}).sort((a, b) => {
+	return selections.map((selection) => resolveClipboardRegion(textDocument, selection)).sort((a, b) => {
 		const startOrder = a.start - b.start;
 		return startOrder !== 0 ? startOrder : a.end - b.end;
 	});
 }
 /**
+* Gets the text contributed by each selection in document order, preserving
+* the pairing needed to paste the values into another set of selections.
+*/
+function getSelectionClipboardTexts(textDocument, selections) {
+	return resolveClipboardRegions(textDocument, selections).map(({ start, end }) => textDocument.getTextSlice(start, end));
+}
+/**
 * Get the clipboard text of the selections for the given text document. Used by
 * both copy and cut so the two stay in sync. Overlapping regions (e.g. several
 * carets on one line) are merged so the same text is never emitted twice, and a
@@ -1135,7 +1263,7 @@ function resolveDeleteWordBackwardRange(textDocument, selection) {
 		const nextChar = lineText.slice(prev, pos);
 		const nextMatch = !/\S/.test(nextChar) ? 0 : /\p{Alphabetic}|\p{Number}|_/u.test(nextChar) ? 1 : 2;
 		if (match !== void 0 && nextMatch !== match) break;
-		if (nextChar !== " " || pos !== head) match = nextMatch;
+		if (nextMatch !== 0 || pos !== head) match = nextMatch;
 		pos = prev;
 	}
 	return [{
@@ -1493,6 +1621,6 @@ function getTextOffset(text, offset) {
 	return Math.min(offset, lineBreakIndex === -1 ? value.length : lineBreakIndex);
 }
 //#endregion
-export { DirectionBackward, DirectionForward, DirectionNone, applyDeleteCharacterToSelections, applyDeleteHardLineForwardToSelections, applyDeleteSoftLineBackwardToSelections, applyDeleteWordBackwardToSelections, applyTextChangeToSelections, applyTextReplaceToSelections, applyTransposeToSelections, comparePosition, convertSelection, createSelectionFrom, createSelectionFromAnchorAndFocusOffsets, expandCollapsedSelectionToWord, extendSelection, extendSelections, findNexMatch, getAutoSurroundReplacementTexts, getCaretPosition, getDocumentBoundarySelection, getDocumentFullSelection, getSelectedLineBlocks, getSelectionAnchor, getSelectionText, isCollapsedSelection, isLineEditable, mapCursorMove, mapSelectionShift, mergeOverlappingSelections, remapSelectionsAfterEdits, resolveDeleteCharacterRange, resolveIndentEdits, resolveSelectionCut, selectionIntersects, shiftSelectionLines };
+export { DirectionBackward, DirectionForward, DirectionNone, 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, resolveDeleteCharacterRange, resolveIndentEdits, resolveSelectionCut, selectionIntersects, shiftSelectionLines };
 
 //# sourceMappingURL=selection.js.map