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

package/dist/editor/editor.js

@@ -2,36 +2,29 @@ import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { isMoveCursorShortcut, isPrimaryModifier, isSafari } from "./platform.js";
 import { resolveEditorCommandFromKeyboardEvent } from "./command.js";
 import editor_default from "./editor2.js";
-import { applyDocumentChangeToLineAnnotations } from "./lineAnnotations.js";
-import { SVGSpriteSheet } from "./sprite.js";
-import { addEventListener, debounce, extend, h, round } from "./utils.js";
-import { QuickEditWidget } from "./quickEdit.js";
+import { addEventListener, clampDomOffset, extend, getLineNumberAttr, h, round } from "./utils.js";
+import { applyDocumentChangeToLineAnnotations, renderLineAnnotations } from "./lineAnnotations.js";
+import { 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 } from "./selection.js";
+import { MarkerManager, markerSeverityDatasetKey } from "./marker.js";
+import { createSpriteElement } from "./sprite.js";
 import { SearchPanelWidget } from "./searchPanel.js";
-import { 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 } from "./selection.js";
+import { SelectionActionWidget } from "./selectionAction.js";
 import { TextDocument } from "./textDocument.js";
 import { Metrics, getExpandedAsciiTextColumns, getUnicodeMeasurementOffsets, snapTextOffsetToUnicodeBoundary } from "./textMeasure.js";
 import { EditorTokenizer, renderLineTokens } from "./tokenzier.js";
 
 //#region src/editor/editor.ts
-function clampDomOffset(node, offset) {
-	if (node.nodeType === 3) {
-		const length = node.textContent?.length ?? 0;
-		return Math.max(0, Math.min(offset, length));
-	}
-	if (node.nodeType === 1) return Math.max(0, Math.min(offset, node.childNodes.length));
-	return 0;
-}
 var Editor = class {
 	#options;
 	#wrap = false;
 	#metrics = new Metrics();
 	#tokenizer;
+	#markerManager;
 	#editorEventDisposes;
 	#globalEventDisposes;
-	#mouseUpDisposes;
+	#selectEventDisposes;
 	#detach;
 	#fileInstance;
-	#fileInstanceType;
 	#fileContents;
 	#lineAnnotations;
 	#textDocument;
@@ -41,17 +34,19 @@ var Editor = class {
 	#contentWidthCache;
 	#lineYCache = /* @__PURE__ */ new Map();
 	#wrapLineOffsetsCache = /* @__PURE__ */ new Map();
-	#lastCharX;
+	#lastAccessedLineElement;
+	#lastAccessedCharX;
 	#globalStyleElement;
 	#editorStyleElement;
 	#themeStyleElement;
 	#spriteElement;
 	#fileContainer;
+	#gutterElement;
 	#contentElement;
 	#overlayElement;
 	#primaryCaretElement;
-	#selectionElements;
-	#quickEdit;
+	#overlayElements;
+	#selectionAction;
 	#searchPanel;
 	#resizeObserver;
 	#shouldIgnoreSelectionChange = false;
@@ -67,11 +62,8 @@ var Editor = class {
 	#scrollingToLineChar;
 	#scrollingToLineNoFocus = false;
 	#retainSearchPanelFocus = false;
-	#emitChange = debounce((fileContents, lineAnnotations) => {
-		this.#options.onChange?.(fileContents, lineAnnotations);
-	}, 500);
 	#onDeferTokenize = (lines, themeType) => {
-		this.#fileInstance?.applyLineChange?.(lines, themeType);
+		this.#fileInstance?.updateRenderCache(lines, themeType);
 		if (this.#renderRange !== void 0 && this.#renderRange.totalLines !== Infinity) {
 			const { startingLine, totalLines } = this.#renderRange;
 			const endLine = Math.min(startingLine + totalLines, this.#textDocument?.lineCount ?? 0);
@@ -85,14 +77,15 @@ var Editor = class {
 		this.#options = options;
 	}
 	edit(component) {
-		const { useTokenTransformer, enableGutterUtility, enableLineSelection, expandUnchanged, lineHoverHighlight,...rest } = component.options;
-		if (useTokenTransformer !== true || enableGutterUtility === true || enableLineSelection === true || expandUnchanged !== true && Object.hasOwn(component, "fileDiff") || lineHoverHighlight !== "disabled") {
+		const { useTokenTransformer, enableGutterUtility, enableLineSelection, expandUnchanged, diffStyle, lineHoverHighlight,...rest } = component.options;
+		if (useTokenTransformer !== true || enableGutterUtility === true || enableLineSelection === true || expandUnchanged !== true && Object.hasOwn(component, "fileDiff") || diffStyle === "unified" || lineHoverHighlight !== "disabled") {
 			component.setOptions({
 				...rest,
 				useTokenTransformer: true,
 				enableGutterUtility: false,
 				enableLineSelection: false,
 				expandUnchanged: true,
+				diffStyle: "split",
 				lineHoverHighlight: "disabled"
 			});
 			component.rerender();
@@ -102,59 +95,34 @@ var Editor = class {
 		this.#detach = component.attachEditor(this);
 		return () => this.cleanUp();
 	}
-	syncToRenderedView(highlighter, fileInstanceType, fileContainer, fileContents, lineAnnotations, renderRange) {
+	syncToRenderedView(highlighter, fileContainer, fileContents, didFileChange, lineAnnotations, renderRange) {
 		const shadowRoot = fileContainer.shadowRoot;
 		if (shadowRoot == null) {
 			console.error("[editor] Could not find the shadow root.");
 			return;
 		}
 		let codeElement;
+		let gutterEl;
+		let contentEl;
 		for (const el of shadowRoot.querySelectorAll("[data-code]")) if (el.dataset.deletions === void 0) {
 			codeElement = el;
-			break;
-		}
-		if (codeElement === void 0) return;
-		const contentEl = codeElement.children[1];
-		if (contentEl === void 0 || contentEl.dataset.content === void 0) return;
-		this.#fileInstanceType = fileInstanceType;
-		this.#wrap = this.#fileInstance?.options.overflow === "wrap";
-		if (fileInstanceType === "diff" || lineAnnotations !== void 0 && lineAnnotations.length > 0) {
-			let startingLine;
-			let endLine;
-			for (const child of contentEl.children) {
-				const el = child;
-				const line = el.dataset.line;
-				const lineType = el.dataset.lineType;
-				if (line !== void 0) {
-					const lineNumber = parseInt(line, 10);
-					if (!Number.isNaN(lineNumber)) {
-						const lineIndex = lineNumber - 1;
-						startingLine ??= lineIndex;
-						endLine = lineIndex;
-					}
-				}
-				if (lineType === void 0 || !isLineEditable(lineType)) el.contentEditable = "false";
-			}
-			if (endLine !== void 0 && renderRange !== void 0) {
-				const { startingLine: startingLine$1, totalLines } = renderRange;
-				endLine = Math.max(endLine, startingLine$1 + totalLines);
+			for (const child of el.children) {
+				const el$1 = child;
+				const { gutter, content } = el$1.dataset;
+				if (gutter !== void 0) gutterEl = el$1;
+				else if (content !== void 0) contentEl = el$1;
 			}
-			if (startingLine !== void 0 && endLine !== void 0) renderRange = {
-				startingLine,
-				totalLines: endLine - startingLine,
-				bufferBefore: 0,
-				bufferAfter: 0
-			};
+			break;
 		}
+		if (codeElement === void 0 || contentEl === void 0) return;
 		if (this.#fileContainer !== fileContainer) {
 			this.#fileContainer = fileContainer;
-			const codePaddingTop = parseInt(getComputedStyle(codeElement).paddingTop.slice(0, -2), 10);
-			this.#codePaddingTop = Number.isNaN(codePaddingTop) ? 0 : codePaddingTop;
 			if (this.#globalStyleElement !== void 0) fileContainer.appendChild(this.#globalStyleElement);
 			if (this.#editorStyleElement !== void 0) shadowRoot.appendChild(this.#editorStyleElement);
 			if (this.#themeStyleElement !== void 0) shadowRoot.appendChild(this.#themeStyleElement);
+			if (this.#spriteElement !== void 0) shadowRoot.prepend(this.#spriteElement);
 		}
-		if (this.#textDocument === void 0 || this.#fileContents === void 0 || this.#fileContents.name !== fileContents.name || this.#fileContents.lang !== fileContents.lang) {
+		if (this.#textDocument === void 0 || this.#fileContents === void 0 || didFileChange) {
 			const textDocument = new TextDocument(fileContents.name, fileContents.contents, fileContents.lang ?? getFiletypeFromFileName(fileContents.name));
 			this.#fileContents = fileContents;
 			this.#textDocument = textDocument;
@@ -169,21 +137,26 @@ var Editor = class {
 				},
 				__debug: this.#options.__debug
 			});
-			this.#shouldIgnoreSelectionChange = false;
-			this.#selectionElements?.forEach((el) => el.remove());
-			this.#selectionElements?.clear();
 			this.#fileInstance?.setSelectedLines(null);
-			this.#selectionElements = void 0;
+			this.#shouldIgnoreSelectionChange = false;
+			this.#overlayElements?.forEach((el) => el.remove());
+			this.#overlayElements?.clear();
+			this.#overlayElements = void 0;
 			this.#selections = void 0;
 			this.#scrollingToLine = void 0;
 			this.#reservedSelections = void 0;
 			this.#searchPanel?.cleanup();
 			this.#searchPanel = void 0;
-			this.#quickEdit?.cleanup();
-			this.#quickEdit = void 0;
+			this.#selectionAction?.cleanup();
+			this.#selectionAction = void 0;
 		}
 		if (this.#contentElement !== contentEl) {
-			this.#metrics.init(contentEl);
+			if (this.#contentElement !== void 0 && this.#options.__debug === true) console.log("[diffs/editor] full re-render triggered !!!");
+			const codePaddingTop = parseInt(getComputedStyle(codeElement).paddingTop.slice(0, -2), 10);
+			this.#codePaddingTop = Number.isNaN(codePaddingTop) ? 0 : codePaddingTop;
+			this.#gutterWidthCache = void 0;
+			this.#contentWidthCache = void 0;
+			this.#gutterElement = gutterEl;
 			this.#contentElement = extend(contentEl, {
 				contentEditable: "true",
 				role: "textbox",
@@ -195,11 +168,14 @@ var Editor = class {
 				translate: false
 			});
 			if (this.#overlayElement !== void 0) contentEl.after(this.#overlayElement);
-			this.#listenContentElement(contentEl);
+			this.#metrics.init(contentEl);
+			this.#listenContentElement(contentEl, gutterEl);
 		}
 		this.#lineYCache.clear();
 		this.#wrapLineOffsetsCache.clear();
-		this.#lastCharX = void 0;
+		this.#lastAccessedLineElement = void 0;
+		this.#lastAccessedCharX = void 0;
+		this.#wrap = this.#fileInstance?.options.overflow === "wrap";
 		this.#lineAnnotations = lineAnnotations;
 		this.#renderRange = renderRange;
 		this.#tokenizer?.prebuildStateStack(renderRange);
@@ -207,19 +183,15 @@ var Editor = class {
 			this.setSelections(this.#initSelections);
 			this.#scrollToPrimaryCaret();
 			this.#initSelections = void 0;
-		} else if (this.#selections !== void 0 && this.#selections.length > 0) this.#updateSelections(this.#selections);
+		} else if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerManager !== void 0) this.#updateSelections(this.#selections ?? []);
 		if (this.#options.__debug === true && renderRange !== void 0) {
 			const { startingLine, totalLines } = renderRange;
 			console.log("[diffs/editor] render file:", fileContents.name, "RenderRange:", startingLine + "-" + (startingLine + totalLines), "of", this.#textDocument.lineCount, "lines");
 		}
-		if (this.#scrollingToLine !== void 0) {
-			this.#scrollToLine(this.#scrollingToLine, this.#scrollingToLineChar, this.#scrollingToLineNoFocus);
-			this.#scrollingToLine = void 0;
-			this.#scrollingToLineChar = void 0;
-			this.#scrollingToLineNoFocus = false;
-		} else if (this.#selections !== void 0 && this.#selections.length > 0 && !this.#retainSearchPanelFocus) this.focus({ preventScroll: true });
+		if (this.#scrollingToLine !== void 0) this.#scrollToLine(this.#scrollingToLine, this.#scrollingToLineChar, this.#scrollingToLineNoFocus);
+		else if (this.#selections !== void 0 && this.#selections.length > 0 && !this.#retainSearchPanelFocus) this.focus({ preventScroll: true });
 		if (this.#retainSearchPanelFocus) this.#searchPanel?.focus();
-		if (this.#quickEdit !== void 0 && this.#isLineVisible(this.#quickEdit.line) && this.#contentElement !== void 0) this.#quickEdit.render(this.#contentElement);
+		if (this.#selectionAction !== void 0 && this.#isLineVisible(this.#selectionAction.line) && this.#contentElement !== void 0) this.#selectionAction.render(this.#contentElement);
 	}
 	postponeBackgroundTokenizeToNextFrame() {
 		const tokenizer = this.#tokenizer;
@@ -246,6 +218,26 @@ var Editor = class {
 			this.#scrollToPrimaryCaret();
 		} else this.#initSelections = selections;
 	}
+	setMarkers(markers) {
+		const textDocument = this.#textDocument;
+		if (textDocument === void 0) throw new Error("Text document is not initialized");
+		if (markers.length === 0) {
+			this.#markerManager?.cleanup();
+			this.#markerManager = void 0;
+			this.#updateSelections(this.#selections ?? []);
+			return;
+		}
+		this.#markerManager ??= new MarkerManager({
+			getLineHeight: () => this.#metrics.lineHeight,
+			getFileContainer: () => this.#fileContainer,
+			getCharX: (line, character) => this.#getCharX(line, character),
+			getLineY: (line) => this.#getLineY(line),
+			isMouseDown: () => this.#isContentMouseDown || this.#isGutterMouseDown
+		});
+		this.#markerManager.setMarkers(markers, textDocument);
+		if (this.#contentElement !== void 0) this.#markerManager.listenHover(this.#contentElement);
+		this.#updateSelections(this.#selections ?? []);
+	}
 	focus(options) {
 		const preventScroll = options?.preventScroll ?? false;
 		const primarySelection = this.#selections?.at(-1);
@@ -261,6 +253,10 @@ 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.#markerManager?.cleanup();
+		this.#markerManager = void 0;
 		this.#detach?.();
 		this.#detach = void 0;
 		this.#fileInstance?.setSelectedLines(null);
@@ -273,7 +269,8 @@ var Editor = class {
 		this.#contentWidthCache = void 0;
 		this.#lineYCache.clear();
 		this.#wrapLineOffsetsCache.clear();
-		this.#lastCharX = void 0;
+		this.#lastAccessedLineElement = void 0;
+		this.#lastAccessedCharX = void 0;
 		this.#globalStyleElement?.remove();
 		this.#globalStyleElement = void 0;
 		this.#editorStyleElement?.remove();
@@ -283,19 +280,18 @@ var Editor = class {
 		this.#spriteElement?.remove();
 		this.#spriteElement = void 0;
 		this.#fileContainer = void 0;
+		this.#gutterElement = void 0;
 		this.#contentElement?.removeAttribute("contentEditable");
 		this.#contentElement = void 0;
 		this.#overlayElement?.remove();
 		this.#overlayElement = void 0;
-		this.#primaryCaretElement?.remove();
+		this.#overlayElements?.forEach((el) => el.remove());
+		this.#overlayElements = void 0;
 		this.#primaryCaretElement = void 0;
-		this.#selectionElements?.forEach((el) => el.remove());
-		this.#selectionElements?.clear();
-		this.#selectionElements = void 0;
 		this.#searchPanel?.cleanup();
 		this.#searchPanel = void 0;
-		this.#quickEdit?.cleanup();
-		this.#quickEdit = void 0;
+		this.#selectionAction?.cleanup();
+		this.#selectionAction = void 0;
 		this.#resizeObserver?.disconnect();
 		this.#resizeObserver = void 0;
 		this.#shouldIgnoreSelectionChange = false;
@@ -318,10 +314,7 @@ var Editor = class {
 			textContent: editor_default
 		});
 		this.#themeStyleElement = h("style", { dataset: "editorThemeCss" });
-		const fragment = document.createElement("div");
-		fragment.innerHTML = SVGSpriteSheet;
-		const sprite = fragment.firstElementChild;
-		this.#spriteElement = sprite instanceof SVGSVGElement ? sprite : void 0;
+		this.#spriteElement = createSpriteElement();
 		this.#overlayElement = h("div", { dataset: "editorOverlay" });
 		this.#globalEventDisposes = [
 			addEventListener(document, "selectionchange", () => {
@@ -345,8 +338,8 @@ var Editor = class {
 			}, { passive: true }),
 			addEventListener(document, "pointerup", (e) => {
 				if (e.pointerType !== "mouse") return;
-				this.#mouseUpDisposes?.forEach((dispose) => dispose());
-				this.#mouseUpDisposes = void 0;
+				this.#selectEventDisposes?.forEach((dispose) => dispose());
+				this.#selectEventDisposes = void 0;
 				if (this.#isGutterMouseDown) {
 					this.#isGutterMouseDown = false;
 					this.#focus();
@@ -356,8 +349,8 @@ var Editor = class {
 				this.#shiftKeyPressed = false;
 				this.#selectionStart = void 0;
 				this.#reservedSelections = void 0;
-				this.#selectionElements?.forEach((el, key) => {
-					if (key.startsWith("quickEditIcon-")) el.dataset.visible = "true";
+				this.#overlayElements?.forEach((el, key) => {
+					if (key.startsWith("selectionActionIcon-")) el.dataset.visible = "true";
 				});
 			}, { passive: true }),
 			addEventListener(document, "keydown", (e) => {
@@ -368,17 +361,17 @@ var Editor = class {
 			}, { passive: true })
 		];
 	}
-	#listenContentElement(contentEl) {
-		const gutterEl = contentEl.previousElementSibling;
+	#listenContentElement(contentEl, gutterEl) {
 		const targetIsContentElement = (e) => {
 			const target = e.composedPath()[0];
-			return target === contentEl || contentEl.contains(target);
+			return target !== void 0 && (target === contentEl || contentEl.contains(target));
 		};
 		this.#editorEventDisposes?.forEach((dispose) => dispose());
 		this.#editorEventDisposes = [
 			addEventListener(contentEl, "pointerdown", (e) => {
 				if (e.pointerType !== "mouse") return;
-				if (isSafari() && this.#lineAnnotations !== void 0 && this.#lineAnnotations.length > 0) this.#mouseUpDisposes = [...contentEl.querySelectorAll("[data-line-annotation]")].map((el) => [addEventListener(el, "mouseenter", () => {
+				this.#markerManager?.removePopup();
+				if (isSafari() && this.#lineAnnotations !== void 0 && this.#lineAnnotations.length > 0) this.#selectEventDisposes = [...contentEl.querySelectorAll("[data-line-annotation]")].map((el) => [addEventListener(el, "mouseenter", () => {
 					this.#shouldIgnoreSelectionChange = true;
 				}), addEventListener(el, "mouseleave", () => {
 					this.#shouldIgnoreSelectionChange = false;
@@ -405,8 +398,8 @@ var Editor = class {
 					this.#searchPanel?.cleanup();
 					this.#searchPanel = void 0;
 					this.#retainSearchPanelFocus = false;
-					this.#quickEdit?.cleanup();
-					this.#quickEdit = void 0;
+					this.#selectionAction?.cleanup();
+					this.#selectionAction = void 0;
 					if (this.#selections !== void 0 && this.#selections.length > 0) {
 						const primarySelection = this.#selections.at(-1);
 						if (!isCollapsedSelection(primarySelection) || this.#selections.length > 1) {
@@ -459,6 +452,10 @@ var Editor = class {
 				e.preventDefault();
 				this.#handleInput(e.inputType, e.data);
 			}),
+			addEventListener(contentEl, "drop", (e) => {
+				if (!targetIsContentElement(e)) return;
+				e.preventDefault();
+			}),
 			addEventListener(contentEl, "compositionstart", (e) => {
 				if (!targetIsContentElement(e)) return;
 				this.#shouldIgnoreSelectionChange = true;
@@ -469,51 +466,53 @@ var Editor = class {
 				this.#handleInput("insertText", e.data);
 			}, { passive: true })
 		];
-		if (gutterEl !== null && gutterEl.dataset.gutter !== void 0) this.#editorEventDisposes.push(addEventListener(gutterEl, "pointerdown", (e) => {
-			let target = e.composedPath()[0];
-			if (target?.dataset.lineNumberContent !== void 0) target = target.parentElement ?? void 0;
-			const textDocument = this.#textDocument;
-			if (target === void 0 || textDocument === void 0) return;
-			const columnNumber = target.dataset.columnNumber;
-			const lineType = target.dataset.lineType;
-			if (columnNumber === void 0 || lineType === void 0 || !isLineEditable(lineType)) return;
-			const lineNumber = parseInt(columnNumber, 10);
-			if (Number.isNaN(lineNumber)) return;
-			const line = lineNumber - 1;
-			const selection = {
-				start: {
-					line,
-					character: 0
-				},
-				end: {
-					line,
-					character: textDocument.getLineText(line).length
-				},
-				direction: DirectionForward
+		if (gutterEl !== void 0) {
+			const resolveGutterTarget = (eventTarget, includeContentLine = false) => {
+				let target = eventTarget;
+				if (target?.dataset.lineNumberContent !== void 0) target = target.parentElement ?? void 0;
+				else if (includeContentLine && target?.tagName === "SPAN") target = target.closest("[data-line]");
+				return target;
 			};
-			this.#isGutterMouseDown = true;
-			this.#selectionStart = selection;
-			this.#updateSelections([selection]);
-			this.#focus(selection.end);
-			this.#mouseUpDisposes = [addEventListener(document, "mousemove", (e$1) => {
-				let target$1 = e$1.composedPath()[0];
-				if (target$1?.dataset.lineNumberContent !== void 0) target$1 = target$1?.parentElement ?? void 0;
-				else if (target$1?.tagName === "SPAN") target$1 = target$1?.closest("[data-line]");
-				if (target$1 === void 0) return;
-				const line$1 = target$1.dataset.columnNumber ?? target$1.dataset.line;
-				const lineType$1 = target$1.dataset.lineType;
-				if (this.#isGutterMouseDown && this.#textDocument !== void 0 && line$1 !== void 0 && lineType$1 !== void 0 && isLineEditable(lineType$1)) {
-					const lineNumber$1 = parseInt(line$1, 10);
-					if (Number.isNaN(lineNumber$1)) return;
-					const lineIndex = lineNumber$1 - 1;
+			const resolveEditableLine = (target) => {
+				if (target === void 0) return;
+				const lineType = target.dataset.lineType;
+				const lineNumber = getLineNumberAttr(target) ?? getLineNumberAttr(target, "columnNumber");
+				if (lineNumber === void 0 || lineType === void 0 || !isLineEditable(lineType)) return;
+				return lineNumber - 1;
+			};
+			this.#editorEventDisposes.push(addEventListener(gutterEl, "pointerdown", (e) => {
+				const textDocument = this.#textDocument;
+				const lineIndex = resolveEditableLine(resolveGutterTarget(e.composedPath()[0]));
+				if (lineIndex === void 0 || textDocument === void 0) return;
+				this.#markerManager?.removePopup();
+				const selection = {
+					start: {
+						line: lineIndex,
+						character: 0
+					},
+					end: {
+						line: lineIndex,
+						character: textDocument.getLineText(lineIndex).length
+					},
+					direction: DirectionForward
+				};
+				this.#isGutterMouseDown = true;
+				this.#selectionStart = selection;
+				this.#updateSelections([selection]);
+				this.#focus(selection.end);
+				this.#selectEventDisposes = [addEventListener(document, "mousemove", (e$1) => {
+					if (!this.#isGutterMouseDown) return;
+					const textDocument$1 = this.#textDocument;
+					const lineIndex$1 = resolveEditableLine(resolveGutterTarget(e$1.composedPath()[0], true));
+					if (lineIndex$1 === void 0 || textDocument$1 === void 0) return;
 					let selection$1 = {
 						start: {
-							line: lineIndex,
+							line: lineIndex$1,
 							character: 0
 						},
 						end: {
-							line: lineIndex,
-							character: this.#textDocument.getLineText(lineIndex).length
+							line: lineIndex$1,
+							character: textDocument$1.getLineText(lineIndex$1).length
 						},
 						direction: DirectionForward
 					};
@@ -521,9 +520,10 @@ var Editor = class {
 					else this.#selectionStart = selection$1;
 					this.#updateSelections([selection$1]);
 					this.#focus(selection$1.end);
-				}
-			}, { passive: true })];
-		}, { passive: true }));
+				}, { passive: true })];
+			}, { passive: true }));
+		}
+		this.#markerManager?.listenHover(contentEl);
 		this.#resizeObserver?.disconnect();
 		this.#resizeObserver = new ResizeObserver(() => {
 			this.#handleLayoutResize();
@@ -540,17 +540,16 @@ var Editor = class {
 				break;
 			case "findNextMatch": {
 				const selections = this.#selections;
-				const textDocument$1 = this.#textDocument;
-				if (selections === void 0 || textDocument$1 === void 0) break;
+				if (selections === void 0) break;
 				if (selections.some(isCollapsedSelection)) {
 					const expanded = selections.map((sel) => {
-						if (isCollapsedSelection(sel)) return expandCollapsedSelectionToWord(textDocument$1, sel);
+						if (isCollapsedSelection(sel)) return expandCollapsedSelectionToWord(textDocument, sel);
 						return sel;
 					});
 					this.#updateSelections(expanded);
 					this.focus();
 				} else {
-					const nextMatch = findNexMatch(textDocument$1, selections);
+					const nextMatch = findNexMatch(textDocument, selections);
 					if (nextMatch !== void 0) {
 						this.#updateSelections(nextMatch);
 						this.#scrollToPrimaryCaret();
@@ -628,66 +627,49 @@ var Editor = class {
 		const gutterWidthChanged = this.#getGutterWidth() !== prevGutterWidth;
 		const contentWidthChanged = this.#getContentWidth() !== prevContentWidth;
 		if (!gutterWidthChanged && !contentWidthChanged) return;
-		this.#lastCharX = void 0;
+		this.#lastAccessedLineElement = void 0;
+		this.#lastAccessedCharX = void 0;
 		if (contentWidthChanged && (this.#wrap || lineAnnotations > 0)) {
 			this.#lineYCache.clear();
 			this.#wrapLineOffsetsCache.clear();
 		}
-		if (this.#selections !== void 0) {
-			this.#updateSelections(this.#selections);
-			this.focus();
+		if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerManager !== void 0) {
+			this.#updateSelections(this.#selections ?? []);
+			if (this.#selections !== void 0) this.focus();
 		}
+		this.#markerManager?.removePopup();
 	}
 	#rerender(change, newLineAnnotations, renderRange = this.#renderRange, shouldUpdateBuffer) {
 		const tokenizer = this.#tokenizer;
-		const component = this.#fileInstance;
+		const fileInstance = this.#fileInstance;
 		const fileContents = this.#fileContents;
 		const textDocument = this.#textDocument;
+		const gutterEl = this.#gutterElement;
 		const contentEl = this.#contentElement;
-		const gutterEl = this.#contentElement?.previousElementSibling ?? void 0;
-		if (tokenizer === void 0 || component === void 0 || fileContents === void 0 || textDocument === void 0 || contentEl === void 0 || gutterEl === void 0 || !(gutterEl instanceof HTMLElement) || gutterEl.dataset.gutter === void 0) return;
+		if (tokenizer === void 0 || fileInstance === void 0 || fileContents === void 0 || textDocument === void 0 || contentEl === void 0) return;
 		tokenizer.stopBackgroundTokenize();
 		const t = performance.now();
-		const isFileDiff = this.#fileInstanceType === "diff";
 		const dirtyLines = tokenizer.tokenize(change, renderRange);
 		const t2 = performance.now();
 		if (dirtyLines.size > 0) {
 			const children = contentEl.children;
 			const dirtyLineIndexes = new Set(dirtyLines.keys());
-			if (isFileDiff) for (const child of children) {
-				const el = child;
-				const line = el.dataset.line;
-				if (line !== void 0) {
-					const lineNumber = parseInt(line, 10);
-					if (!Number.isNaN(lineNumber)) {
+			const startingLine = renderRange?.startingLine ?? 0;
+			for (let i = change.startLine - startingLine; i < children.length; i++) {
+				const child = children[i];
+				if (child !== void 0) {
+					const lineNumber = getLineNumberAttr(child);
+					if (lineNumber !== void 0) {
 						const lineIndex = lineNumber - 1;
-						const tokens = dirtyLines.get(lineIndex);
-						if (tokens !== void 0) {
-							el.replaceChildren(...renderLineTokens(tokens, tokenizer.themeType));
+						if (dirtyLines.has(lineIndex)) {
+							const tokens = dirtyLines.get(lineIndex);
+							child.replaceChildren(...renderLineTokens(tokens, tokenizer.themeType));
 							dirtyLineIndexes.delete(lineIndex);
 							if (dirtyLineIndexes.size === 0) break;
 						}
 					}
 				}
 			}
-			else {
-				const startingLine = renderRange?.startingLine ?? 0;
-				for (let i = change.startLine - startingLine; i < children.length; i++) {
-					const child = children[i];
-					if (child !== void 0 && child.dataset.line !== void 0) {
-						const lineNumber = parseInt(child.dataset.line, 10);
-						if (!Number.isNaN(lineNumber)) {
-							const lineIndex = lineNumber - 1;
-							if (dirtyLines.has(lineIndex)) {
-								const tokens = dirtyLines.get(lineIndex);
-								child.replaceChildren(...renderLineTokens(tokens, tokenizer.themeType));
-								dirtyLineIndexes.delete(lineIndex);
-								if (dirtyLineIndexes.size === 0) break;
-							}
-						}
-					}
-				}
-			}
 			if (dirtyLineIndexes.size > 0) for (const lineIndex of dirtyLineIndexes) {
 				const tokens = dirtyLines.get(lineIndex);
 				const lineNumber = String(lineIndex + 1);
@@ -699,7 +681,7 @@ var Editor = class {
 					},
 					children: renderLineTokens(tokens, tokenizer.themeType)
 				}, contentEl);
-				h("div", {
+				if (gutterEl !== void 0) h("div", {
 					dataset: {
 						lineType: "context",
 						columnNumber: lineNumber,
@@ -712,25 +694,30 @@ var Editor = class {
 				}, gutterEl);
 			}
 		}
-		if (change.lineDelta < 0) for (const parent of [contentEl, gutterEl]) {
-			const children = parent.children;
-			for (let i = children.length - 1; i >= 0; i--) {
-				const child = children[i];
-				const { line, columnNumber, lineAnnotation } = child.dataset;
-				if (line === void 0 && columnNumber === void 0 && lineAnnotation === void 0) continue;
-				const lineIndex = lineAnnotation !== void 0 ? parseInt(lineAnnotation.split(",")[1], 10) : parseInt(line ?? columnNumber, 10) - 1;
-				if (Number.isNaN(lineIndex)) continue;
-				if (lineIndex < change.lineCount) break;
-				child.remove();
+		if (change.lineDelta < 0) for (const children of [contentEl.children, gutterEl?.children ?? []]) for (let i = children.length - 1; i >= 0; i--) {
+			const child = children[i];
+			const lineNumber = getLineNumberAttr(child) ?? getLineNumberAttr(child, "columnNumber");
+			if (lineNumber === void 0) continue;
+			if (lineNumber - 1 < change.lineCount) break;
+			child.remove();
+		}
+		const isDiff = Object.hasOwn(fileInstance, "fileDiff");
+		const didLineCountChange = change.lineDelta !== 0;
+		if (didLineCountChange) {
+			let gridRow = contentEl.children.length;
+			for (const child of contentEl.children) {
+				const { bufferSize } = child.dataset;
+				if (bufferSize !== void 0) gridRow += parseInt(bufferSize) - 1;
 			}
+			contentEl.style.gridRow = "span " + gridRow;
+			if (gutterEl !== void 0) gutterEl.style.gridRow = "span " + gridRow;
 		}
-		if (change.lineDelta !== 0) {
-			gutterEl.style.gridRow = "span " + gutterEl.children.length;
-			contentEl.style.gridRow = "span " + contentEl.children.length;
+		fileInstance.updateRenderCache(dirtyLines, tokenizer.themeType, isDiff ? !didLineCountChange : void 0);
+		if (didLineCountChange) fileInstance.applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer);
+		if (newLineAnnotations !== void 0) {
+			this.#lineAnnotations = newLineAnnotations;
+			renderLineAnnotations(newLineAnnotations, contentEl, gutterEl);
 		}
-		component.applyLineChange?.(dirtyLines, tokenizer.themeType);
-		if (change.lineDelta !== 0 || isFileDiff) component.applyLayoutChange(textDocument, newLineAnnotations, shouldUpdateBuffer);
-		if (isFileDiff) this.#tokenizer?.stopBackgroundTokenize();
 		if (this.#options.__debug === true) console.log(`[diffs/editor] re-render in: ${round(performance.now() - t2)}ms,`, `tokenize in: ${round(t2 - t)}ms (${dirtyLines.size} dirty lines)`);
 	}
 	#handleInput(inputType, data) {
@@ -747,74 +734,38 @@ var Editor = class {
 			case "deleteContentForward":
 				this.#deleteSelectionText(true);
 				break;
+			case "deleteSoftLineBackward":
+				this.#deleteSoftLineBackward();
+				break;
 			case "deleteHardLineForward":
 				this.#deleteHardLineForward();
 				break;
+			case "deleteWordBackward":
+				this.#deleteWordBackward();
+				break;
 			case "insertTranspose":
 				this.#insertTranspose();
 				break;
 			default:
-				console.warn(`[diffs] Unknown input type: ${inputType}`);
+				console.warn(`[diffs] Unknown input type: ${inputType}`, data);
 				break;
 		}
 	}
-	#updateSelections(selections) {
-		this.postponeBackgroundTokenizeToNextFrame();
-		const gutterBuffer = this.#contentElement?.previousElementSibling;
-		this.#primaryCaretElement = void 0;
-		this.#fileInstance?.setSelectedLines(null);
-		gutterBuffer?.querySelectorAll("[data-active]").forEach((el) => el.removeAttribute("data-active"));
-		if (selections.length === 0 && this.#matches === void 0) {
-			this.#selections = void 0;
-			this.#matches = void 0;
-			this.#selectionElements?.forEach((el) => el.remove());
-			this.#selectionElements?.clear();
-			return;
-		}
-		const fragment = document.createDocumentFragment();
-		const renderCtx = {
-			fragment,
-			elements: /* @__PURE__ */ new Map()
-		};
-		if (selections.length > 0) {
-			const normalizedSelections = mergeOverlappingSelections(selections);
-			const primarySelection = normalizedSelections.at(-1);
-			this.#selections = normalizedSelections;
-			if (isCollapsedSelection(primarySelection)) {
-				const line = primarySelection.start.line + 1;
-				this.#fileInstance?.setSelectedLines({
-					start: line,
-					end: line
+	#focus(position, preventScroll = true) {
+		if (position !== void 0) {
+			this.#shouldIgnoreSelectionChange = true;
+			this.#setWindowSelection({
+				start: position,
+				end: position,
+				direction: DirectionNone
+			});
+			requestAnimationFrame(() => {
+				this.#contentElement?.focus({ preventScroll });
+				requestAnimationFrame(() => {
+					this.#shouldIgnoreSelectionChange = false;
 				});
-			} else if (gutterBuffer !== void 0 && gutterBuffer instanceof HTMLElement) {
-				const pos = getCaretPosition(primarySelection);
-				gutterBuffer.querySelector(`[data-column-number="${pos.line + 1}"]`)?.setAttribute("data-active", "");
-			}
-			for (const selection of normalizedSelections) {
-				if (!isCollapsedSelection(selection)) this.#renderSelection(renderCtx, selection, "selection");
-				this.#renderCaret(renderCtx, selection, selection === primarySelection);
-			}
-			if (this.#options.enabledQuickEdit === true && !isCollapsedSelection(primarySelection)) this.#renderQuickEditIcon(renderCtx, primarySelection);
-		}
-		const textDocument = this.#textDocument;
-		if (this.#matches !== void 0 && textDocument !== void 0) {
-			const primarySelection = this.#selections?.at(-1);
-			const primaryStartOffset = primarySelection !== void 0 ? textDocument.offsetAt(primarySelection.start) : -1;
-			const primaryEndOffset = primarySelection !== void 0 ? textDocument.offsetAt(primarySelection.end) : -1;
-			for (const [startOffset, endOffset] of this.#matches) {
-				const selection = {
-					start: textDocument.positionAt(startOffset),
-					end: textDocument.positionAt(endOffset),
-					direction: DirectionNone
-				};
-				const isFocused = primaryStartOffset === startOffset && primaryEndOffset === endOffset;
-				this.#renderSelection(renderCtx, selection, "match", isFocused);
-			}
-		}
-		this.#overlayElement?.appendChild(fragment);
-		this.#selectionElements?.forEach((el) => el.remove());
-		this.#selectionElements?.clear();
-		this.#selectionElements = renderCtx.elements;
+			});
+		} else this.#contentElement?.focus({ preventScroll });
 	}
 	#setWindowSelection(selection) {
 		const winSelection = window.getSelection();
@@ -838,22 +789,6 @@ var Editor = class {
 			console.error("[diffs/editor] failed to update window selection:", err);
 		}
 	}
-	#focus(position, preventScroll = true) {
-		if (position !== void 0) {
-			this.#shouldIgnoreSelectionChange = true;
-			this.#setWindowSelection({
-				start: position,
-				end: position,
-				direction: DirectionNone
-			});
-			requestAnimationFrame(() => {
-				this.#contentElement?.focus({ preventScroll });
-				requestAnimationFrame(() => {
-					this.#shouldIgnoreSelectionChange = false;
-				});
-			});
-		} else this.#contentElement?.focus({ preventScroll });
-	}
 	#scrollToPrimaryCaret(noFocus = false) {
 		const primaryCaretElement = this.#primaryCaretElement;
 		const primarySelection = this.#selections?.at(-1);
@@ -899,23 +834,98 @@ var Editor = class {
 				line,
 				character: char
 			});
+			this.#scrollingToLine = void 0;
+			this.#scrollingToLineChar = void 0;
+			this.#scrollingToLineNoFocus = false;
 		} else {
-			const approximateLineY = ((this.#lineAnnotations ?? []).filter((annotation) => annotation.lineNumber < line).length + line) * this.#metrics.lineHeight;
+			let yFix = 0;
+			if (this.#scrollingToLine === line && this.#contentElement !== void 0) for (let i = this.#contentElement.childElementCount - 1; i >= 0; i--) {
+				const child = this.#contentElement.children[i];
+				const lineType = child.dataset.lineType;
+				const lineNumber = getLineNumberAttr(child);
+				if (lineType !== void 0 && isLineEditable(lineType) && lineNumber !== void 0) {
+					yFix = (line - lineNumber) * this.#metrics.lineHeight;
+					break;
+				}
+			}
+			const approximateLineY = ((this.#lineAnnotations ?? []).filter((annotation) => annotation.lineNumber < line).length + line) * this.#metrics.lineHeight + yFix;
 			virtualCaret.style.top = approximateLineY + "px";
 			this.#fileContainer?.shadowRoot?.appendChild(virtualCaret);
-			this.#scrollingToLine = line;
-			this.#scrollingToLineChar = char;
-			this.#scrollingToLineNoFocus = noFocus;
 			virtualCaret.scrollIntoView({
 				block: "center",
 				inline: "nearest"
 			});
+			if (this.#scrollingToLine === line && yFix === 0) {
+				this.#scrollingToLine = void 0;
+				this.#scrollingToLineChar = void 0;
+				this.#scrollingToLineNoFocus = false;
+			} else {
+				this.#scrollingToLine = line;
+				this.#scrollingToLineChar = char;
+				this.#scrollingToLineNoFocus = noFocus;
+			}
 		}
 		virtualCaret.remove();
 	}
-	#renderSelection(renderCtx, selection, type, isFocused) {
+	#updateSelections(selections) {
+		this.postponeBackgroundTokenizeToNextFrame();
+		this.#primaryCaretElement = void 0;
+		this.#fileInstance?.setSelectedLines(null);
+		this.#gutterElement?.querySelectorAll("[data-active]").forEach((el) => el.removeAttribute("data-active"));
+		if (selections.length === 0 && this.#matches === void 0 && this.#markerManager === void 0) {
+			this.#selections = void 0;
+			this.#overlayElements?.forEach((el) => el.remove());
+			this.#overlayElements?.clear();
+			return;
+		}
+		const fragment = document.createDocumentFragment();
+		const renderCtx = {
+			fragment,
+			elements: /* @__PURE__ */ new Map()
+		};
+		if (selections.length > 0) {
+			const normalizedSelections = mergeOverlappingSelections(selections);
+			const primarySelection = normalizedSelections.at(-1);
+			this.#selections = normalizedSelections;
+			if (isCollapsedSelection(primarySelection)) {
+				const line = primarySelection.start.line + 1;
+				this.#fileInstance?.setSelectedLines({
+					start: line,
+					end: line
+				});
+			} else if (this.#gutterElement !== void 0) {
+				const pos = getCaretPosition(primarySelection);
+				this.#gutterElement.querySelector(`[data-column-number="${pos.line + 1}"]`)?.setAttribute("data-active", "");
+			}
+			for (const selection of normalizedSelections) {
+				if (!isCollapsedSelection(selection)) this.#renderSelection(renderCtx, "selection", selection);
+				this.#renderCaret(renderCtx, selection, selection === primarySelection);
+			}
+			if (this.#options.enabledSelectionAction === true && !isCollapsedSelection(primarySelection)) this.#renderSelectionActionIcon(renderCtx, primarySelection);
+		}
+		const textDocument = this.#textDocument;
+		if (this.#matches !== void 0 && textDocument !== void 0) {
+			const primarySelection = this.#selections?.at(-1);
+			const primaryStartOffset = primarySelection !== void 0 ? textDocument.offsetAt(primarySelection.start) : -1;
+			const primaryEndOffset = primarySelection !== void 0 ? textDocument.offsetAt(primarySelection.end) : -1;
+			for (const [startOffset, endOffset] of this.#matches) {
+				const range = {
+					start: textDocument.positionAt(startOffset),
+					end: textDocument.positionAt(endOffset)
+				};
+				const isFocused = primaryStartOffset === startOffset && primaryEndOffset === endOffset;
+				this.#renderSelection(renderCtx, "match", range, isFocused ? "focus" : void 0);
+			}
+		}
+		if (this.#markerManager !== void 0 && textDocument !== void 0) for (const marker of this.#markerManager.markers) this.#renderSelection(renderCtx, "marker", marker, markerSeverityDatasetKey(marker.severity));
+		this.#overlayElement?.appendChild(fragment);
+		this.#overlayElements?.forEach((el) => el.remove());
+		this.#overlayElements?.clear();
+		this.#overlayElements = renderCtx.elements;
+	}
+	#renderSelection(renderCtx, type, range, extraDataset) {
 		if (this.#textDocument === void 0) return;
-		const { start, end } = selection;
+		const { start, end } = range;
 		for (let line = start.line; line <= end.line; line++) {
 			if (!this.#isLineVisible(line)) continue;
 			const isLastLine = line === end.line;
@@ -925,20 +935,22 @@ var Editor = class {
 			if (this.#wrap) {
 				const contentWidth = this.#getContentWidth();
 				if (2 * this.#metrics.ch + this.#metrics.measureTextWidth(lineText) > contentWidth) {
-					this.#renderWrappedSelection(renderCtx, line, lineText, startChar, endChar, isLastLine, type, isFocused);
+					this.#renderWrappedSelection(renderCtx, line, lineText, startChar, endChar, isLastLine, type, extraDataset);
 					continue;
 				}
 			}
 			let left = 0;
 			let width = 0;
+			let paddingEnd = 0;
 			if (startChar === 0) left = this.#getGutterWidth() + this.#metrics.ch;
 			else left = this.#getCharX(line, startChar)[0];
-			if (startChar === endChar) width = isLastLine ? 0 : this.#metrics.ch;
-			else width = this.#getCharX(line, endChar)[0] - left + (isLastLine ? 0 : this.#metrics.ch);
-			this.#renderSelectionBlock(renderCtx, line, 0, left, width, type, isFocused);
+			if (!isLastLine && type === "selection") paddingEnd = this.#metrics.ch;
+			if (startChar === endChar) width = paddingEnd;
+			else width = this.#getCharX(line, endChar)[0] - left + paddingEnd;
+			this.#renderSelectionBlock(renderCtx, type, line, 0, left, width, extraDataset);
 		}
 	}
-	#renderWrappedSelection(renderCtx, line, lineText, startChar, endChar, isLastLine, type, isFocused = false) {
+	#renderWrappedSelection(renderCtx, line, lineText, startChar, endChar, isLastLine, type, extraDataset) {
 		const wrapOffsets = this.#wrapLineText(line);
 		const segmentCount = wrapOffsets.length - 1;
 		const offsetLeft = this.#getGutterWidth() + this.#metrics.ch;
@@ -950,29 +962,31 @@ var Editor = class {
 			if (wrapStartChar > wrapEndChar) continue;
 			let segmentLeft;
 			let segmentWidth;
+			let paddingEnd = 0;
 			if (wrapStartChar === 0) segmentLeft = offsetLeft;
 			else {
 				const prefixInSegment = lineText.slice(segmentStart, wrapStartChar);
 				const prefixAsciiColumns = getExpandedAsciiTextColumns(prefixInSegment, this.#metrics.tabSize);
 				segmentLeft = offsetLeft + (prefixAsciiColumns !== -1 ? prefixAsciiColumns * this.#metrics.ch : this.#metrics.measureTextWidth(prefixInSegment));
 			}
-			if (wrapStartChar === wrapEndChar) segmentWidth = wrapLine === segmentCount - 1 ? 0 : this.#metrics.ch;
+			if (!isLastLine && wrapLine === segmentCount - 1 && type === "selection") paddingEnd = this.#metrics.ch;
+			if (wrapStartChar === wrapEndChar) segmentWidth = paddingEnd;
 			else {
 				const selectionInSegment = lineText.slice(wrapStartChar, wrapEndChar);
 				const selectionAsciiWidth = getExpandedAsciiTextColumns(selectionInSegment, this.#metrics.tabSize);
 				segmentWidth = selectionAsciiWidth !== -1 ? selectionAsciiWidth * this.#metrics.ch : this.#metrics.measureTextWidth(selectionInSegment);
-				if (!isLastLine && wrapLine === segmentCount - 1) segmentWidth += this.#metrics.ch;
+				segmentWidth += paddingEnd;
 			}
-			this.#renderSelectionBlock(renderCtx, line, wrapLine, segmentLeft, segmentWidth, type, isFocused);
+			this.#renderSelectionBlock(renderCtx, type, line, wrapLine, segmentLeft, segmentWidth, extraDataset);
 		}
 	}
-	#renderSelectionBlock(renderCtx, line, wrapLine, left, width, type, isFocused = false) {
+	#renderSelectionBlock(renderCtx, type, line, wrapLine, left, width, extraDataset) {
 		if (width === 0) return;
 		const { ch, lineHeight } = this.#metrics;
 		const y = this.#getLineY(line) + wrapLine * lineHeight;
 		const css = `width:${width}px;transform:translateX(${left}px) translateY(${y}px);`;
-		const cacheKey = `${type}-block-${left}-${y}-${width}-${isFocused ? "f" : ""}`;
-		const selectionEls = this.#selectionElements;
+		const cacheKey = `${type}-${left}-${y}-${width}${extraDataset ?? ""}`;
+		const overlayEls = this.#overlayElements;
 		const rounded = (this.#options.roundedSelection ?? true) && type === "selection";
 		const addRoundedCorner = (line$1, wrapLine$1, left$1, radius) => {
 			const top = this.#getLineY(line$1) + wrapLine$1 * lineHeight;
@@ -995,9 +1009,9 @@ var Editor = class {
 			}
 			let cornerEl = renderCtx.elements.get(cacheKey$1);
 			if (cornerEl !== void 0) return;
-			if (selectionEls?.has(cacheKey$1) === true) {
-				cornerEl = selectionEls.get(cacheKey$1);
-				selectionEls.delete(cacheKey$1);
+			if (overlayEls?.has(cacheKey$1) === true) {
+				cornerEl = overlayEls.get(cacheKey$1);
+				overlayEls.delete(cacheKey$1);
 			} else cornerEl = h("div", {
 				dataset: "selectionRange",
 				style: { cssText: css$1 },
@@ -1050,16 +1064,13 @@ var Editor = class {
 			if (rounded) addRadiusStyle(rangeEl);
 			return;
 		}
-		if (selectionEls?.has(cacheKey) === true) {
-			rangeEl = selectionEls.get(cacheKey);
-			selectionEls.delete(cacheKey);
-		} else {
-			rangeEl = h("div", {
-				dataset: type + "Range",
-				style: { cssText: css }
-			}, renderCtx.fragment);
-			if (type === "match" && isFocused === true) rangeEl.dataset.focus = "";
-		}
+		if (overlayEls?.has(cacheKey) === true) {
+			rangeEl = overlayEls.get(cacheKey);
+			overlayEls.delete(cacheKey);
+		} else rangeEl = h("div", {
+			dataset: extraDataset ? [type + "Range", extraDataset] : type + "Range",
+			style: { cssText: css }
+		}, renderCtx.fragment);
 		if (rounded) addRadiusStyle(rangeEl);
 		renderCtx.elements.set(cacheKey, rangeEl);
 	}
@@ -1079,29 +1090,29 @@ var Editor = class {
 			this.#primaryCaretElement = caretEl;
 		}
 	}
-	#renderQuickEditIcon(renderCtx, selection) {
+	#renderSelectionActionIcon(renderCtx, selection) {
 		const line = getCaretPosition(selection).line;
 		if (!this.#isLineVisible(line)) return;
 		const [left, wrapLine] = this.#getCharX(line, 0);
-		const cacheKey = "quickEditIcon-" + line + "(" + wrapLine + ")";
+		const cacheKey = "selectionActionIcon-" + line + "(" + wrapLine + ")";
 		if (renderCtx.elements.has(cacheKey)) return;
-		const quickEditIcon = QuickEditWidget.renderIcon(left, this.#getLineY(line) + wrapLine * this.#metrics.lineHeight, renderCtx.fragment, () => {
-			const cleanUpQuickEdit = () => {
-				this.#quickEdit?.cleanup();
-				this.#quickEdit = void 0;
+		const selectionActionIcon = SelectionActionWidget.renderIcon(left, this.#getLineY(line) + wrapLine * this.#metrics.lineHeight, renderCtx.fragment, () => {
+			const cleanUpSelectionAction = () => {
+				this.#selectionAction?.cleanup();
+				this.#selectionAction = void 0;
 			};
 			const handleWidgetDomResize = () => {
 				this.#lineYCache.clear();
 				if (this.#selections !== void 0) this.#updateSelections(this.#selections);
 			};
-			cleanUpQuickEdit();
+			cleanUpSelectionAction();
 			const textDocument = this.#textDocument;
-			const renderQuickEdit = this.#options.renderQuickEdit;
+			const renderSelectionAction = this.#options.renderSelectionAction;
 			const fileContainer = this.#fileContainer;
-			if (textDocument === void 0 || renderQuickEdit === void 0 || fileContainer == null) return;
+			if (textDocument === void 0 || renderSelectionAction === void 0 || fileContainer == null) return;
 			const line$1 = selection.end.line;
 			const lineText = textDocument.getLineText(line$1);
-			const quickEditElement = renderQuickEdit({
+			const selectionActionElement = renderSelectionAction({
 				textDocument,
 				selection,
 				applyEdits: (edits) => {
@@ -1115,7 +1126,7 @@ var Editor = class {
 					this.#replaceSelectionText(text);
 				},
 				close: () => {
-					cleanUpQuickEdit();
+					cleanUpSelectionAction();
 					handleWidgetDomResize();
 					this.#scrollToPrimaryCaret();
 				}
@@ -1127,11 +1138,11 @@ var Editor = class {
 				else if (charCode === 9) leadingWhitespaces += this.#metrics.tabSize;
 				else break;
 			}
-			this.#quickEdit = new QuickEditWidget(line$1, quickEditElement, fileContainer, leadingWhitespaces, handleWidgetDomResize);
+			this.#selectionAction = new SelectionActionWidget(line$1, selectionActionElement, fileContainer, leadingWhitespaces, handleWidgetDomResize);
 			this.#updateSelections([selection]);
-			if (this.#isLineVisible(line$1) && this.#contentElement !== void 0) this.#quickEdit.render(this.#contentElement);
+			if (this.#isLineVisible(line$1) && this.#contentElement !== void 0) this.#selectionAction.render(this.#contentElement);
 		});
-		renderCtx.elements.set(cacheKey, quickEditIcon);
+		renderCtx.elements.set(cacheKey, selectionActionIcon);
 	}
 	#renderSearchPanel() {
 		this.#searchPanel?.cleanup();
@@ -1181,8 +1192,7 @@ var Editor = class {
 					break;
 				}
 				if (nextMatch !== void 0) scrollToMatch(nextMatch, true);
-				this.#matches = allMatches;
-				this.#updateSelections(this.#selections ?? []);
+				else this.#updateSelections(this.#selections ?? []);
 				return nextMatch;
 			},
 			onClose: () => {
@@ -1219,21 +1229,44 @@ var Editor = class {
 		if (selections === void 0 || textDocument === void 0) return;
 		const primarySelection = selections.at(-1);
 		if (primarySelection === void 0) return;
-		const edit = isCollapsedSelection(primarySelection) ? (() => {
+		let edit;
+		if (isCollapsedSelection(primarySelection)) {
 			const offset = textDocument.offsetAt(primarySelection.start);
 			const nextOffset = forward ? Math.min(textDocument.getText().length, offset + 1) : Math.max(0, offset - 1);
-			return {
+			edit = {
 				start: Math.min(offset, nextOffset),
 				end: Math.max(offset, nextOffset),
 				text: ""
 			};
-		})() : {
+		} else edit = {
 			start: textDocument.offsetAt(primarySelection.start),
 			end: textDocument.offsetAt(primarySelection.end),
 			text: ""
 		};
 		this.#applyResolvedTextEdit(edit);
 	}
+	#deleteSoftLineBackward() {
+		const selections = this.#selections;
+		const textDocument = this.#textDocument;
+		if (selections === void 0 || textDocument === void 0) return;
+		const { nextSelections, change } = applyDeleteSoftLineBackwardToSelections(textDocument, selections, this.#wrap ? (line, character) => {
+			const wrapOffsets = this.#wrapLineText(line);
+			for (let w = 0; w + 1 < wrapOffsets.length; w++) {
+				const segmentStart = wrapOffsets[w];
+				const segmentEnd = wrapOffsets[w + 1];
+				if (character >= segmentStart && character <= segmentEnd) return segmentStart;
+			}
+			return 0;
+		} : void 0, this.#lineAnnotations);
+		if (change !== void 0) this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
+	}
+	#deleteWordBackward() {
+		const selections = this.#selections;
+		const textDocument = this.#textDocument;
+		if (selections === void 0 || textDocument === void 0) return;
+		const { nextSelections, change } = applyDeleteWordBackwardToSelections(textDocument, selections, this.#lineAnnotations);
+		if (change !== void 0) this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
+	}
 	#deleteHardLineForward() {
 		const selections = this.#selections;
 		const textDocument = this.#textDocument;
@@ -1259,9 +1292,11 @@ var Editor = class {
 		const onChange = this.#options.onChange;
 		if (fileContents !== void 0 && textDocument !== void 0 && onChange !== void 0) {
 			const { contents: _,...file } = fileContents;
-			let contents;
-			Object.defineProperty(file, "contents", { get: () => contents ??= textDocument.getText() });
-			this.#emitChange(file, newLineAnnotations ?? this.#lineAnnotations);
+			Object.defineProperty(file, "contents", {
+				enumerable: true,
+				get: () => textDocument.getText()
+			});
+			onChange(file, newLineAnnotations ?? this.#lineAnnotations);
 		}
 		if (change.lineDelta !== 0) {
 			for (const line of this.#lineYCache.keys()) if (line >= change.startLine) this.#lineYCache.delete(line);
@@ -1269,7 +1304,7 @@ var Editor = class {
 		if (this.#wrap) {
 			for (const line of this.#wrapLineOffsetsCache.keys()) if (line >= change.startLine) this.#wrapLineOffsetsCache.delete(line);
 		}
-		this.#lastCharX = void 0;
+		this.#lastAccessedCharX = void 0;
 		let renderRange = this.#renderRange;
 		let shouldUpdateBuffer;
 		if (renderRange !== void 0 && selections !== void 0 && selections.length > 0) {
@@ -1305,28 +1340,40 @@ var Editor = class {
 		}
 	}
 	#getLineElement(line) {
+		const lastAccessed = this.#lastAccessedLineElement;
+		if (lastAccessed !== void 0 && lastAccessed[0] === line) return lastAccessed[1];
 		const contentElement = this.#contentElement;
 		if (contentElement === void 0) return;
-		if (this.#renderRange !== void 0 && this.#fileInstanceType === "file") {
+		let lineElement = null;
+		if (this.#renderRange !== void 0) {
 			const { startingLine } = this.#renderRange;
 			const { children } = contentElement;
 			for (let i = line - startingLine; i <= children.length; i++) {
 				const child = children[i];
-				const lineNumber = child?.dataset.line;
-				const lineType = child?.dataset.lineType;
-				if (lineNumber !== void 0 && lineType !== void 0 && isLineEditable(lineType) && parseInt(lineNumber, 10) === line + 1) return child;
+				if (child === void 0) break;
+				const lineNumber = getLineNumberAttr(child);
+				const lineType = child.dataset.lineType;
+				if (lineNumber !== void 0 && lineNumber === line + 1 && lineType !== void 0 && isLineEditable(lineType)) {
+					lineElement = child;
+					break;
+				}
 			}
 		}
-		if (this.#fileInstanceType === "diff") return contentElement.querySelector(`[data-line="${line + 1}"]:not([data-line-type="change-deletion"])`) ?? void 0;
-		return contentElement.querySelector(`[data-line="${line + 1}"]`) ?? void 0;
+		lineElement ??= contentElement.querySelector(`[data-line="${line + 1}"]`);
+		if (lineElement !== null) {
+			if (lastAccessed !== void 0) {
+				lastAccessed[0] = line;
+				lastAccessed[1] = lineElement;
+			} else this.#lastAccessedLineElement = [line, lineElement];
+			return lineElement;
+		}
 	}
 	#getGutterWidth() {
-		const gutterElement = this.#contentElement?.previousElementSibling;
-		if (gutterElement == null || !(gutterElement instanceof HTMLElement) || !gutterElement.hasAttribute("data-gutter")) return 0;
+		if (this.#gutterElement === void 0) return 0;
 		if (this.#gutterWidthCache === void 0) {
 			const diffsColumnNumberWidth = this.#contentElement?.parentElement?.style.getPropertyValue("--diffs-column-number-width");
 			if (diffsColumnNumberWidth !== void 0 && diffsColumnNumberWidth.length > 2 && diffsColumnNumberWidth.endsWith("px")) this.#gutterWidthCache = parseInt(diffsColumnNumberWidth.slice(0, -2), 10);
-			else this.#gutterWidthCache = gutterElement.offsetWidth;
+			else this.#gutterWidthCache = this.#gutterElement.offsetWidth;
 		}
 		return this.#gutterWidthCache;
 	}
@@ -1349,7 +1396,7 @@ var Editor = class {
 		return y;
 	}
 	#getCharX(line, char) {
-		if (this.#lastCharX !== void 0 && this.#lastCharX[0] === line && this.#lastCharX[1] === char) return [this.#lastCharX[2], this.#lastCharX[3]];
+		if (this.#lastAccessedCharX !== void 0 && this.#lastAccessedCharX[0] === line && this.#lastAccessedCharX[1] === char) return [this.#lastAccessedCharX[2], this.#lastAccessedCharX[3]];
 		const lineText = this.#textDocument?.getLineText(line);
 		const offsetLeft = this.#getGutterWidth() + this.#metrics.ch;
 		if (lineText === void 0 || lineText.length === 0 || char <= 0) return [offsetLeft, 0];
@@ -1377,12 +1424,12 @@ var Editor = class {
 				}
 			}
 		}
-		if (this.#lastCharX !== void 0) {
-			this.#lastCharX[0] = line;
-			this.#lastCharX[1] = char;
-			this.#lastCharX[2] = left;
-			this.#lastCharX[3] = wrapLine;
-		} else this.#lastCharX = [
+		if (this.#lastAccessedCharX !== void 0) {
+			this.#lastAccessedCharX[0] = line;
+			this.#lastAccessedCharX[1] = char;
+			this.#lastAccessedCharX[2] = left;
+			this.#lastAccessedCharX[3] = wrapLine;
+		} else this.#lastAccessedCharX = [
 			line,
 			char,
 			left,