@pierre/diffs 1.3.0-beta.2 → 1.3.0-beta.4

package/dist/editor/selection.js

@@ -84,24 +84,28 @@ function mapCursorMove(textDocument, selections, shortcut) {
 			if (shortcut === "textStart") {
 				const indent = getLeadingSpaces(textDocument.getLineText(line));
 				character = character === indent ? 0 : indent;
-			} else character = shortcut === "start" ? 0 : textDocument.getLineText(line).length;
+			} else character = shortcut === "start" ? 0 : textDocument.getLineLength(line);
 			if (selection.direction === DirectionBackward) line = selection.start.line;
 			else line = selection.end.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)) if (shortcut === "left") {
-			character--;
-			if (character < 0) if (line === 0) character = 0;
-			else {
-				line = Math.max(0, line - 1);
-				character = textDocument.getLineText(line).length;
-			}
-		} else {
-			character++;
-			if (character > textDocument.getLineText(line).length) if (line === lineCount - 1) character--;
-			else {
-				line = Math.min(Math.max(lineCount - 1, 0), line + 1);
-				character = 0;
+		else if (isCollapsedSelection(selection)) {
+			const lineLength = textDocument.getLineLength(line);
+			character = Math.min(character, lineLength);
+			if (shortcut === "left") {
+				character--;
+				if (character < 0) if (line === 0) character = 0;
+				else {
+					line = Math.max(0, line - 1);
+					character = textDocument.getLineLength(line);
+				}
+			} else {
+				character++;
+				if (character > lineLength) if (line === lineCount - 1) character--;
+				else {
+					line = Math.min(Math.max(lineCount - 1, 0), line + 1);
+					character = 0;
+				}
 			}
 		}
 		const pos = {
@@ -137,7 +141,7 @@ function applyTextChangeToSelections(textDocument, selections, edit, lineAnnotat
 	if (selections[selections.length - 1] === void 0) return { nextSelections: [] };
 	const selectionPositions = [];
 	for (const selection of selections) selectionPositions.push(selection.start, selection.end);
-	const selectionOffsets = textDocument.offsetsAt(selectionPositions);
+	const selectionOffsets = selectionPositions.map((position) => textDocument.offsetAt(position));
 	const primaryStartOffset = selectionOffsets[(selections.length - 1) * 2];
 	const primaryEndOffset = selectionOffsets[(selections.length - 1) * 2 + 1];
 	const ordered = [];
@@ -220,7 +224,7 @@ function applyTextReplaceToSelections(textDocument, selections, texts, lineAnnot
 	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);
-	const selectionOffsets = textDocument.offsetsAt(selectionPositions);
+	const selectionOffsets = selectionPositions.map((position) => textDocument.offsetAt(position));
 	const ordered = [];
 	let isAlreadyOrdered = true;
 	for (let index = 0; index < selections.length; index++) {
@@ -241,21 +245,61 @@ function applyTextReplaceToSelections(textDocument, selections, texts, lineAnnot
 		if (endOrder !== 0) return endOrder;
 		return a.index - b.index;
 	});
-	const edits = [];
+	const allDeletes = texts.every((text) => text === "");
+	let edits;
 	const nextSelectionOffsets = Array.from({ length: selections.length });
-	let offsetDelta = 0;
-	let previousEditEnd = -1;
-	for (const entry of ordered) {
-		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);
-		edits.push({
-			start: entry.start,
-			end: entry.end,
-			text: newText
-		});
-		nextSelectionOffsets[entry.index] = entry.start + offsetDelta + newText.length;
-		offsetDelta += newText.length - (entry.end - entry.start);
+	if (allDeletes) {
+		edits = [];
+		let hasEffect = false;
+		for (const entry of ordered) {
+			nextSelectionOffsets[entry.index] = entry.end;
+			if (entry.start >= entry.end) continue;
+			hasEffect = true;
+			const last = edits[edits.length - 1];
+			if (last !== void 0 && entry.start < last.end) edits[edits.length - 1] = {
+				start: last.start,
+				end: Math.max(last.end, entry.end),
+				text: ""
+			};
+			else edits.push({
+				start: entry.start,
+				end: entry.end,
+				text: ""
+			});
+		}
+		if (!hasEffect) return { nextSelections: selections };
+		for (const entry of ordered) {
+			const caret = entry.end;
+			let delta = 0;
+			let next = caret;
+			for (const edit of edits) {
+				if (caret <= edit.start) break;
+				if (caret >= edit.end) {
+					delta -= edit.end - edit.start;
+					continue;
+				}
+				next = edit.start + delta;
+				break;
+			}
+			if (next === caret) next += delta;
+			nextSelectionOffsets[entry.index] = next;
+		}
+	} else {
+		edits = [];
+		let offsetDelta = 0;
+		let previousEditEnd = -1;
+		for (const entry of ordered) {
+			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);
+			edits.push({
+				start: entry.start,
+				end: entry.end,
+				text: newText
+			});
+			nextSelectionOffsets[entry.index] = entry.start + offsetDelta + newText.length;
+			offsetDelta += newText.length - (entry.end - entry.start);
+		}
 	}
 	const change = textDocument.applyResolvedEdits(edits, true, selections);
 	const nextSelections = createSelectionsFromOffsetPairs(textDocument, nextSelectionOffsets.map((offset) => [offset, offset]));
@@ -285,7 +329,7 @@ function applyTransposeToSelections(textDocument, selections, lineAnnotations) {
 		}
 		const { line, character } = selection.start;
 		const offset = anchor;
-		const lineLength = textDocument.getLineText(line).length;
+		const lineLength = textDocument.getLineLength(line);
 		let edit;
 		if (character > 0 && character < lineLength) {
 			edit = {
@@ -303,7 +347,7 @@ function applyTransposeToSelections(textDocument, selections, lineAnnotations) {
 			nextOffsetPairs.push([offset, offset]);
 		} else if (character === 0 && line > 0 && lineLength > 0) {
 			const prevLine = line - 1;
-			const prevLength = textDocument.getLineText(prevLine).length;
+			const prevLength = textDocument.getLineLength(prevLine);
 			const prevEnd = textDocument.offsetAt({
 				line: prevLine,
 				character: prevLength
@@ -350,7 +394,66 @@ function applyDeleteHardLineForwardToSelections(textDocument, selections, lineAn
 			direction: DirectionNone
 		};
 	});
-	if (!deleteSelections.some((selection) => comparePosition(selection.start, selection.end) !== 0)) return { nextSelections: selections };
+	return applyTextReplaceToSelections(textDocument, deleteSelections, deleteSelections.map(() => ""), lineAnnotations);
+}
+/**
+* Deletes from each selection back to the start of its soft (visual) line.
+* Non-collapsed selections delete their selected text instead.
+*/
+function applyDeleteSoftLineBackwardToSelections(textDocument, selections, getSoftLineStart, lineAnnotations) {
+	const deleteSelections = selections.map((selection) => {
+		if (!isCollapsedSelection(selection)) return {
+			start: selection.start,
+			end: selection.end,
+			direction: DirectionNone
+		};
+		const caret = getCaretPosition(selection);
+		const { line, character } = caret;
+		const softLineStart = getSoftLineStart?.(line, character) ?? 0;
+		if (character > softLineStart) return {
+			start: {
+				line,
+				character: softLineStart
+			},
+			end: {
+				line,
+				character
+			},
+			direction: DirectionNone
+		};
+		if (line === 0) return {
+			start: caret,
+			end: caret,
+			direction: DirectionNone
+		};
+		const prevLineLength = textDocument.getLineLength(line - 1);
+		return {
+			start: {
+				line: line - 1,
+				character: prevLineLength
+			},
+			end: {
+				line,
+				character: 0
+			},
+			direction: DirectionNone
+		};
+	});
+	return applyTextReplaceToSelections(textDocument, deleteSelections, deleteSelections.map(() => ""), lineAnnotations);
+}
+/**
+* Deletes the word or separator group immediately before each selection.
+* Non-collapsed selections delete their selected text instead.
+*/
+function applyDeleteWordBackwardToSelections(textDocument, selections, lineAnnotations) {
+	const deleteSelections = selections.map((selection) => {
+		const [start, end] = resolveDeleteWordBackwardRange(textDocument, selection);
+		return {
+			start,
+			end,
+			direction: DirectionNone
+		};
+	});
 	return applyTextReplaceToSelections(textDocument, deleteSelections, deleteSelections.map(() => ""), lineAnnotations);
 }
 /**
@@ -370,7 +473,7 @@ function getCaretPosition(selection) {
 * Checks if a line is editable.
 */
 function isLineEditable(lineType) {
-	return lineType === "context" || lineType === "change-addition" || lineType === "context-expanded";
+	return lineType === "context" || lineType === "context-expanded" || lineType === "change-addition";
 }
 /**
 * Checks whether selections `a` and `b` intersect.
@@ -517,7 +620,7 @@ function getDocumentFullSelection(textDocument) {
 		},
 		end: {
 			line: lastLine,
-			character: textDocument.getLineText(lastLine)?.length ?? 0
+			character: textDocument.getLineLength(lastLine)
 		},
 		direction: DirectionForward
 	};
@@ -529,7 +632,7 @@ function getDocumentBoundarySelection(textDocument, atEnd) {
 	const line = atEnd ? textDocument.lineCount - 1 : 0;
 	const start = {
 		line,
-		character: atEnd ? textDocument.getLineText(line)?.length ?? 0 : 0
+		character: atEnd ? textDocument.getLineLength(line) : 0
 	};
 	return {
 		start,
@@ -615,6 +718,54 @@ function expandCollapsedLineWord(lineText, character) {
 		};
 	}
 }
+function resolveDeleteWordBackwardRange(textDocument, selection) {
+	if (!isCollapsedSelection(selection)) return [selection.start, selection.end];
+	const caret = getCaretPosition(selection);
+	const { line, character: head } = caret;
+	if (head === 0) {
+		if (line === 0) return [caret, caret];
+		const prevLineLength = textDocument.getLineLength(line - 1);
+		return [{
+			line: line - 1,
+			character: prevLineLength
+		}, {
+			line,
+			character: 0
+		}];
+	}
+	const lineText = textDocument.getLineText(line);
+	const graphemeStarts = [0];
+	const segmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+	for (const segment of segmenter.segment(lineText)) if (segment.index > 0) graphemeStarts.push(segment.index);
+	let pos = head;
+	let match;
+	while (pos > 0) {
+		const prev = findClusterBreak(lineText, pos, false, graphemeStarts);
+		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;
+		pos = prev;
+	}
+	return [{
+		line,
+		character: pos
+	}, {
+		line,
+		character: head
+	}];
+}
+function findClusterBreak(text, pos, forward, graphemeStarts) {
+	if (forward) {
+		for (const start of graphemeStarts) if (start > pos) return start;
+		return text.length;
+	}
+	for (let i = graphemeStarts.length - 1; i >= 0; i--) {
+		const start = graphemeStarts[i];
+		if (start < pos) return start;
+	}
+	return 0;
+}
 function getSelectionAnchorAndFocusOffsets(textDocument, selection) {
 	const isBackward = selection.direction === DirectionBackward;
 	return [textDocument.offsetAt(isBackward ? selection.end : selection.start), textDocument.offsetAt(getCaretPosition(selection))];
@@ -883,11 +1034,17 @@ function getLineChildEnd(child, textOffsetInChild) {
 }
 function getLineIndex(el) {
 	const { line } = el.dataset;
-	if (line !== void 0) return parseInt(line) - 1;
+	if (line !== void 0) {
+		const lineNumber = parseInt(line, 10);
+		if (!Number.isNaN(lineNumber)) return lineNumber - 1;
+	}
 }
 function getCharacterIndex(el) {
 	const { char } = el.dataset;
-	return char !== void 0 ? parseInt(char) : void 0;
+	if (char !== void 0) {
+		const charIndex = parseInt(char, 10);
+		if (!Number.isNaN(charIndex)) return charIndex;
+	}
 }
 function getTextOffset(text, offset) {
 	const value = text ?? "";
@@ -896,5 +1053,5 @@ function getTextOffset(text, offset) {
 }
 
 //#endregion
-export { DirectionBackward, DirectionForward, DirectionNone, applyDeleteHardLineForwardToSelections, applyTextChangeToSelections, applyTextReplaceToSelections, applyTransposeToSelections, comparePosition, convertSelection, createSelectionFrom, createSelectionFromAnchorAndFocusOffsets, expandCollapsedSelectionToWord, extendSelection, extendSelections, findNexMatch, getCaretPosition, getDocumentBoundarySelection, getDocumentFullSelection, getSelectionAnchor, getSelectionText, isCollapsedSelection, isLineEditable, mapCursorMove, mapSelectionShift, mergeOverlappingSelections, resolveIndentEdits, selectionIntersects };
+export { DirectionBackward, DirectionForward, DirectionNone, applyDeleteHardLineForwardToSelections, applyDeleteSoftLineBackwardToSelections, applyDeleteWordBackwardToSelections, applyTextChangeToSelections, applyTextReplaceToSelections, applyTransposeToSelections, comparePosition, convertSelection, createSelectionFrom, createSelectionFromAnchorAndFocusOffsets, expandCollapsedSelectionToWord, extendSelection, extendSelections, findNexMatch, getCaretPosition, getDocumentBoundarySelection, getDocumentFullSelection, getSelectionAnchor, getSelectionText, isCollapsedSelection, isLineEditable, mapCursorMove, mapSelectionShift, mergeOverlappingSelections, resolveIndentEdits, selectionIntersects };
 //# sourceMappingURL=selection.js.map