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

package/dist/editor/editor.js

@@ -1,11 +1,12 @@
 import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { isMoveCursorShortcut, isPrimaryModifier, isSafari } from "./platform.js";
 import { resolveEditorCommandFromKeyboardEvent } from "./command.js";
+import { EditStack } from "./editStack.js";
 import editor_default from "./editor2.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 { MarkerRenderer, markerSeverityDatasetKey } from "./marker.js";
 import { createSpriteElement } from "./sprite.js";
 import { SearchPanelWidget } from "./searchPanel.js";
 import { SelectionActionWidget } from "./selectionAction.js";
@@ -19,17 +20,10 @@ var Editor = class {
 	#wrap = false;
 	#metrics = new Metrics();
 	#tokenizer;
-	#markerManager;
 	#editorEventDisposes;
 	#globalEventDisposes;
 	#selectEventDisposes;
 	#detach;
-	#fileInstance;
-	#fileContents;
-	#lineAnnotations;
-	#textDocument;
-	#renderRange;
-	#codePaddingTop = 0;
 	#gutterWidthCache;
 	#contentWidthCache;
 	#lineYCache = /* @__PURE__ */ new Map();
@@ -44,19 +38,25 @@ var Editor = class {
 	#gutterElement;
 	#contentElement;
 	#overlayElement;
-	#primaryCaretElement;
 	#overlayElements;
-	#selectionAction;
-	#searchPanel;
+	#primaryCaretElement;
 	#resizeObserver;
+	#fileInstance;
+	#fileContents;
+	#lineAnnotations;
+	#textDocument;
+	#renderRange;
+	#markerRenderer;
+	#searchPanel;
+	#selectionAction;
 	#shouldIgnoreSelectionChange = false;
 	#isGutterMouseDown = false;
 	#isContentMouseDown = false;
 	#shiftKeyPressed = false;
 	#selectionStart;
 	#reservedSelections;
-	#selections;
 	#initSelections;
+	#selections;
 	#matches;
 	#scrollingToLine;
 	#scrollingToLineChar;
@@ -78,15 +78,16 @@ var Editor = class {
 	}
 	edit(component) {
 		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") {
+		const isDiff = component.type === "file-diff";
+		if (useTokenTransformer !== true || enableGutterUtility === true || enableLineSelection === true || lineHoverHighlight !== "disabled" || expandUnchanged !== true && isDiff || diffStyle === "unified" && isDiff) {
 			component.setOptions({
 				...rest,
 				useTokenTransformer: true,
 				enableGutterUtility: false,
 				enableLineSelection: false,
+				lineHoverHighlight: "disabled",
 				expandUnchanged: true,
-				diffStyle: "split",
-				lineHoverHighlight: "disabled"
+				diffStyle: "split"
 			});
 			component.rerender();
 		}
@@ -95,7 +96,134 @@ var Editor = class {
 		this.#detach = component.attachEditor(this);
 		return () => this.cleanUp();
 	}
-	syncToRenderedView(highlighter, fileContainer, fileContents, didFileChange, lineAnnotations, renderRange) {
+	/**
+	* Apply edits to current attached file.
+	*/
+	applyEdits(edits, updateHistory = false) {
+		const textDocument = this.#textDocument;
+		if (textDocument == null) throw new Error("Editor is not attached");
+		const change = textDocument.applyEdits(edits, updateHistory, this.#selections);
+		if (change !== void 0) this.#applyChange(change, void 0, this.#applyChangeToLineAnnotations(change));
+	}
+	getState() {
+		const fileRef = this.#getFileRef();
+		if (fileRef === void 0) throw new Error("Editor is not attached");
+		return {
+			file: {
+				...fileRef,
+				cacheKey: "edited-at-" + Date.now()
+			},
+			selections: this.#selections,
+			lineAnnotations: this.#lineAnnotations,
+			renderRange: this.#renderRange
+		};
+	}
+	setState({ file, lineAnnotations, renderRange, selections }) {
+		this.#resetCache();
+		this.#resetState();
+		this.#initSelections = selections;
+		this.#fileInstance?.render({
+			file: {
+				...file,
+				cacheKey: "edited-at-" + Date.now()
+			},
+			lineAnnotations,
+			renderRange
+		});
+	}
+	setSelections(selections) {
+		const textDocument = this.#textDocument;
+		if (textDocument === void 0) throw new Error("Text document is not initialized");
+		const resolvedSelections = selections.map((selection) => {
+			const start = textDocument.normalizePosition(selection.start);
+			const end = textDocument.normalizePosition(selection.end);
+			return {
+				direction: selection.direction === "none" ? DirectionNone : selection.direction === "backward" ? DirectionBackward : DirectionForward,
+				start,
+				end
+			};
+		});
+		this.#updateSelections(resolvedSelections);
+		this.#scrollToPrimaryCaret(false, "center");
+	}
+	setMarkers(markers) {
+		const textDocument = this.#textDocument;
+		if (textDocument === void 0) throw new Error("Text document is not initialized");
+		if (markers.length === 0) {
+			this.#markerRenderer?.cleanup();
+			this.#markerRenderer = void 0;
+			this.#updateSelections(this.#selections ?? []);
+			return;
+		}
+		this.#markerRenderer ??= new MarkerRenderer({
+			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.#markerRenderer.setMarkers(markers, textDocument);
+		if (this.#contentElement !== void 0) this.#markerRenderer.listenHover(this.#contentElement);
+		this.#updateSelections(this.#selections ?? []);
+	}
+	focus(options) {
+		const preventScroll = options?.preventScroll ?? false;
+		const primarySelection = this.#selections?.at(-1);
+		if (primarySelection !== void 0) {
+			const pos = primarySelection.direction === DirectionBackward ? primarySelection.end : primarySelection.start;
+			this.#focus(pos, preventScroll);
+		} else this.#focus(void 0, preventScroll);
+	}
+	blur() {
+		this.#contentElement?.blur();
+	}
+	cleanUp() {
+		this.#tokenizer?.cleanUp();
+		this.#tokenizer = void 0;
+		this.#globalEventDisposes?.forEach((dispose) => dispose());
+		this.#globalEventDisposes = void 0;
+		this.#editorEventDisposes?.forEach((dispose) => dispose());
+		this.#editorEventDisposes = void 0;
+		this.#selectEventDisposes?.forEach((dispose) => dispose());
+		this.#selectEventDisposes = void 0;
+		this.#detach?.();
+		this.#detach = void 0;
+		this.#gutterWidthCache = void 0;
+		this.#contentWidthCache = void 0;
+		this.#lineYCache.clear();
+		this.#wrapLineOffsetsCache.clear();
+		this.#lastAccessedLineElement = void 0;
+		this.#lastAccessedCharX = void 0;
+		this.#globalStyleElement?.remove();
+		this.#globalStyleElement = void 0;
+		this.#editorStyleElement?.remove();
+		this.#editorStyleElement = void 0;
+		this.#themeStyleElement?.remove();
+		this.#themeStyleElement = void 0;
+		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.#resizeObserver?.disconnect();
+		this.#resizeObserver = void 0;
+		this.#resetState();
+	}
+	/** @internal */
+	__postponeBackgroundTokenizeToNextFrame() {
+		const tokenizer = this.#tokenizer;
+		if (tokenizer !== void 0) {
+			tokenizer.pauseBackgroundTokenize();
+			requestAnimationFrame(() => {
+				tokenizer.resumeBackgroundTokenize();
+			});
+		}
+	}
+	/** @internal */
+	__syncRenderView = (highlighter, fileContainer, fileContents, lineAnnotations, renderRange) => {
 		const shadowRoot = fileContainer.shadowRoot;
 		if (shadowRoot == null) {
 			console.error("[editor] Could not find the shadow root.");
@@ -122,8 +250,9 @@ var Editor = class {
 			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 || didFileChange) {
-			const textDocument = new TextDocument(fileContents.name, fileContents.contents, fileContents.lang ?? getFiletypeFromFileName(fileContents.name));
+		if (this.#textDocument === void 0 || this.#fileContents === void 0 || this.#fileContents.name !== fileContents.name || this.#fileContents.contents !== fileContents.contents || this.#fileContents.lang !== fileContents.lang || this.#fileContents.cacheKey !== fileContents.cacheKey) {
+			const editStack = new EditStack({ maxEntries: this.#options.historyMaxEntries });
+			const textDocument = new TextDocument(fileContents.name, fileContents.contents, fileContents.lang ?? getFiletypeFromFileName(fileContents.name), 0, editStack);
 			this.#fileContents = fileContents;
 			this.#textDocument = textDocument;
 			this.#tokenizer?.cleanUp();
@@ -137,25 +266,12 @@ var Editor = class {
 				},
 				__debug: this.#options.__debug
 			});
-			this.#fileInstance?.setSelectedLines(null);
-			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.#selectionAction?.cleanup();
-			this.#selectionAction = void 0;
+			this.#resetState();
+			this.#selections = this.#initSelections;
+			this.#options.onAttach?.(this, this.#fileInstance);
+			if (this.#textDocument !== void 0 && this.#options.__debug === true) console.log("[diffs/editor] text document changed !!!");
 		}
 		if (this.#contentElement !== 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",
@@ -170,134 +286,48 @@ var Editor = class {
 			if (this.#overlayElement !== void 0) contentEl.after(this.#overlayElement);
 			this.#metrics.init(contentEl);
 			this.#listenContentElement(contentEl, gutterEl);
+			if (this.#contentElement !== void 0 && this.#options.__debug === true) console.log("[diffs/editor] full re-render triggered !!!");
 		}
-		this.#lineYCache.clear();
-		this.#wrapLineOffsetsCache.clear();
-		this.#lastAccessedLineElement = void 0;
-		this.#lastAccessedCharX = void 0;
+		this.#resetCache();
 		this.#wrap = this.#fileInstance?.options.overflow === "wrap";
 		this.#lineAnnotations = lineAnnotations;
 		this.#renderRange = renderRange;
 		this.#tokenizer?.prebuildStateStack(renderRange);
-		if (this.#initSelections !== void 0) {
-			this.setSelections(this.#initSelections);
-			this.#scrollToPrimaryCaret();
+		if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) this.#updateSelections(this.#selections ?? []);
+		if (this.#initSelections !== void 0 && this.#primaryCaretElement !== void 0) {
 			this.#initSelections = void 0;
-		} 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.#scrollToPrimaryCaret(false, "center");
+		} else 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.#selectionAction !== void 0 && this.#isLineVisible(this.#selectionAction.line) && this.#contentElement !== void 0) this.#selectionAction.render(this.#contentElement);
-	}
-	postponeBackgroundTokenizeToNextFrame() {
-		const tokenizer = this.#tokenizer;
-		if (tokenizer !== void 0) {
-			tokenizer.pauseBackgroundTokenize();
-			requestAnimationFrame(() => {
-				tokenizer.resumeBackgroundTokenize();
-			});
-		}
-	}
-	setSelections(selections) {
-		const textDocument = this.#textDocument;
-		if (textDocument !== void 0) {
-			const resolvedSelections = selections.map((selection) => {
-				const start = textDocument.normalizePosition(selection.start);
-				const end = textDocument.normalizePosition(selection.end);
-				return {
-					direction: selection.direction === "none" ? DirectionNone : selection.direction === "backward" ? DirectionBackward : DirectionForward,
-					start,
-					end
-				};
-			});
-			this.#updateSelections(resolvedSelections);
-			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;
+		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");
 		}
-		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);
-		if (primarySelection !== void 0) {
-			const pos = primarySelection.direction === DirectionBackward ? primarySelection.end : primarySelection.start;
-			this.#focus(pos, preventScroll);
-		} else this.#focus(void 0, preventScroll);
-	}
-	cleanUp() {
-		this.#tokenizer?.cleanUp();
-		this.#tokenizer = void 0;
-		this.#globalEventDisposes?.forEach((dispose) => dispose());
-		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);
-		this.#fileInstance = void 0;
-		this.#fileContents = void 0;
-		this.#lineAnnotations = void 0;
-		this.#textDocument = void 0;
-		this.#renderRange = void 0;
-		this.#gutterWidthCache = void 0;
-		this.#contentWidthCache = void 0;
+	};
+	#resetCache() {
 		this.#lineYCache.clear();
 		this.#wrapLineOffsetsCache.clear();
 		this.#lastAccessedLineElement = void 0;
 		this.#lastAccessedCharX = void 0;
-		this.#globalStyleElement?.remove();
-		this.#globalStyleElement = void 0;
-		this.#editorStyleElement?.remove();
-		this.#editorStyleElement = void 0;
-		this.#themeStyleElement?.remove();
-		this.#themeStyleElement = void 0;
-		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;
+	}
+	#resetState() {
+		this.#gutterWidthCache = void 0;
+		this.#contentWidthCache = void 0;
+		this.#fileInstance?.setSelectedLines(null);
+		this.#shouldIgnoreSelectionChange = false;
 		this.#overlayElements?.forEach((el) => el.remove());
 		this.#overlayElements = void 0;
-		this.#primaryCaretElement = void 0;
+		this.#selections = void 0;
+		this.#reservedSelections = void 0;
+		this.#scrollingToLine = void 0;
+		this.#markerRenderer?.cleanup();
+		this.#markerRenderer = void 0;
 		this.#searchPanel?.cleanup();
 		this.#searchPanel = void 0;
 		this.#selectionAction?.cleanup();
 		this.#selectionAction = void 0;
-		this.#resizeObserver?.disconnect();
-		this.#resizeObserver = void 0;
-		this.#shouldIgnoreSelectionChange = false;
-		this.#selectionStart = void 0;
-		this.#selections = void 0;
-		this.#reservedSelections = void 0;
 	}
 	#initialize() {
 		this.#globalStyleElement = h("style", {
@@ -370,7 +400,7 @@ var Editor = class {
 		this.#editorEventDisposes = [
 			addEventListener(contentEl, "pointerdown", (e) => {
 				if (e.pointerType !== "mouse") return;
-				this.#markerManager?.removePopup();
+				this.#markerRenderer?.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", () => {
@@ -484,7 +514,7 @@ var Editor = class {
 				const textDocument = this.#textDocument;
 				const lineIndex = resolveEditableLine(resolveGutterTarget(e.composedPath()[0]));
 				if (lineIndex === void 0 || textDocument === void 0) return;
-				this.#markerManager?.removePopup();
+				this.#markerRenderer?.removePopup();
 				const selection = {
 					start: {
 						line: lineIndex,
@@ -523,7 +553,7 @@ var Editor = class {
 				}, { passive: true })];
 			}, { passive: true }));
 		}
-		this.#markerManager?.listenHover(contentEl);
+		this.#markerRenderer?.listenHover(contentEl);
 		this.#resizeObserver?.disconnect();
 		this.#resizeObserver = new ResizeObserver(() => {
 			this.#handleLayoutResize();
@@ -536,7 +566,10 @@ var Editor = class {
 		if (textDocument === void 0) return;
 		switch (command) {
 			case "openSearchPanel":
-				this.#renderSearchPanel();
+				this.#openSearchPanel("find");
+				break;
+			case "openSearchReplacePanel":
+				this.#openSearchPanel("replace");
 				break;
 			case "findNextMatch": {
 				const selections = this.#selections;
@@ -633,11 +666,11 @@ var Editor = class {
 			this.#lineYCache.clear();
 			this.#wrapLineOffsetsCache.clear();
 		}
-		if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerManager !== void 0) {
+		if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) {
 			this.#updateSelections(this.#selections ?? []);
 			if (this.#selections !== void 0) this.focus();
 		}
-		this.#markerManager?.removePopup();
+		this.#markerRenderer?.removePopup();
 	}
 	#rerender(change, newLineAnnotations, renderRange = this.#renderRange, shouldUpdateBuffer) {
 		const tokenizer = this.#tokenizer;
@@ -789,13 +822,13 @@ var Editor = class {
 			console.error("[diffs/editor] failed to update window selection:", err);
 		}
 	}
-	#scrollToPrimaryCaret(noFocus = false) {
-		const primaryCaretElement = this.#primaryCaretElement;
+	#scrollToPrimaryCaret(noFocus = false, scrollPosition = "nearest") {
 		const primarySelection = this.#selections?.at(-1);
 		if (primarySelection === void 0) return;
+		const primaryCaretElement = this.#primaryCaretElement;
 		if (primaryCaretElement !== void 0) {
 			primaryCaretElement.scrollIntoView({
-				block: "nearest",
+				block: scrollPosition,
 				inline: "nearest"
 			});
 			if (!noFocus) this.#focus(primarySelection.direction === DirectionBackward ? primarySelection.end : primarySelection.start);
@@ -812,7 +845,7 @@ var Editor = class {
 		return `${componentTop + top}px ${end}px 0 ${start}px`;
 	}
 	#scrollToLine(line, char = 0, noFocus = false) {
-		this.postponeBackgroundTokenizeToNextFrame();
+		this.__postponeBackgroundTokenizeToNextFrame();
 		const virtualCaret = h("div", { style: {
 			position: "absolute",
 			left: "0",
@@ -868,11 +901,11 @@ var Editor = class {
 		virtualCaret.remove();
 	}
 	#updateSelections(selections) {
-		this.postponeBackgroundTokenizeToNextFrame();
+		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) {
+		if (selections.length === 0 && this.#matches === void 0 && this.#markerRenderer === void 0) {
 			this.#selections = void 0;
 			this.#overlayElements?.forEach((el) => el.remove());
 			this.#overlayElements?.clear();
@@ -917,7 +950,7 @@ var Editor = class {
 				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));
+		if (this.#markerRenderer !== void 0 && textDocument !== void 0) for (const marker of this.#markerRenderer.markers) this.#renderSelection(renderCtx, "marker", marker, markerSeverityDatasetKey(marker.severity));
 		this.#overlayElement?.appendChild(fragment);
 		this.#overlayElements?.forEach((el) => el.remove());
 		this.#overlayElements?.clear();
@@ -1097,7 +1130,7 @@ var Editor = class {
 		const cacheKey = "selectionActionIcon-" + line + "(" + wrapLine + ")";
 		if (renderCtx.elements.has(cacheKey)) return;
 		const selectionActionIcon = SelectionActionWidget.renderIcon(left, this.#getLineY(line) + wrapLine * this.#metrics.lineHeight, renderCtx.fragment, () => {
-			const cleanUpSelectionAction = () => {
+			const cleanUp = () => {
 				this.#selectionAction?.cleanup();
 				this.#selectionAction = void 0;
 			};
@@ -1105,7 +1138,7 @@ var Editor = class {
 				this.#lineYCache.clear();
 				if (this.#selections !== void 0) this.#updateSelections(this.#selections);
 			};
-			cleanUpSelectionAction();
+			cleanUp();
 			const textDocument = this.#textDocument;
 			const renderSelectionAction = this.#options.renderSelectionAction;
 			const fileContainer = this.#fileContainer;
@@ -1115,18 +1148,15 @@ var Editor = class {
 			const selectionActionElement = renderSelectionAction({
 				textDocument,
 				selection,
-				applyEdits: (edits) => {
-					const change = textDocument.applyEdits(edits, true, this.#selections);
-					if (change !== void 0) this.#applyChange(change);
-				},
+				applyEdits: (edits) => this.applyEdits(edits, true),
 				getSelectionText: () => {
 					return this.#textDocument?.getText(selection) ?? "";
 				},
 				replaceSelectionText: (text) => {
-					this.#replaceSelectionText(text);
+					this.#replaceSelectionText(text, [selection]);
 				},
 				close: () => {
-					cleanUpSelectionAction();
+					cleanUp();
 					handleWidgetDomResize();
 					this.#scrollToPrimaryCaret();
 				}
@@ -1144,7 +1174,14 @@ var Editor = class {
 		});
 		renderCtx.elements.set(cacheKey, selectionActionIcon);
 	}
-	#renderSearchPanel() {
+	#openSearchPanel(mode) {
+		if (this.#searchPanel !== void 0) {
+			this.#searchPanel.setMode(mode);
+			return;
+		}
+		this.#renderSearchPanel(mode);
+	}
+	#renderSearchPanel(mode) {
 		this.#searchPanel?.cleanup();
 		const textDocument = this.#textDocument;
 		const preElement = this.#fileContainer?.shadowRoot?.querySelector("pre");
@@ -1174,15 +1211,37 @@ var Editor = class {
 			textDocument,
 			containerElement: preElement,
 			defaultQuery,
+			mode,
 			initialMatch,
 			scrollToMatch,
-			onUpdate: (allMatches) => {
+			applyReplace: (edits) => {
+				if (edits.length === 0) return;
+				const change = textDocument.applyEdits(edits.map((edit) => ({
+					range: {
+						start: textDocument.positionAt(edit.start),
+						end: textDocument.positionAt(edit.end)
+					},
+					newText: edit.text
+				})), true, this.#selections);
+				if (change !== void 0) this.#applyChange(change, void 0, this.#applyChangeToLineAnnotations(change), { skipSearchRefresh: true });
+			},
+			onUpdate: (allMatches, options) => {
 				if (allMatches.length === 0) {
 					this.#matches = void 0;
 					this.#updateSelections(this.#selections ?? []);
 					return;
 				}
 				this.#matches = allMatches;
+				if (options?.syncSelection === false) {
+					this.#updateSelections(this.#selections ?? []);
+					const primarySelection$1 = this.#selections?.at(-1);
+					if (primarySelection$1 !== void 0) {
+						const startOffset = textDocument.offsetAt(primarySelection$1.start);
+						const endOffset = textDocument.offsetAt(primarySelection$1.end);
+						for (const match of allMatches) if (match[0] === startOffset && match[1] === endOffset) return match;
+					}
+					return;
+				}
 				const primarySelection = this.#selections?.at(-1);
 				let searchOffset = 0;
 				let nextMatch;
@@ -1210,8 +1269,7 @@ var Editor = class {
 		if (textDocument === void 0 || selections === void 0) return "";
 		return getSelectionText(textDocument, selections);
 	}
-	#replaceSelectionText(text) {
-		const selections = this.#selections;
+	#replaceSelectionText(text, selections = this.#selections) {
 		if (selections === void 0) return;
 		const textDocument = this.#textDocument;
 		const primarySelection = selections.at(-1);
@@ -1286,18 +1344,21 @@ var Editor = class {
 		const { nextSelections, change } = applyTextChangeToSelections(this.#textDocument, this.#selections, edit, this.#lineAnnotations, this.#metrics.tabSize);
 		if (change !== void 0) this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
 	}
-	#applyChange(change, selections, newLineAnnotations) {
+	#getFileRef() {
 		const fileContents = this.#fileContents;
 		const textDocument = this.#textDocument;
+		if (fileContents === void 0 || textDocument === void 0) return;
+		const { contents: _,...file } = fileContents;
+		Object.defineProperty(file, "contents", {
+			enumerable: true,
+			get: () => textDocument.getText()
+		});
+		return file;
+	}
+	#applyChange(change, selections, newLineAnnotations, options) {
+		const fileRef = this.#getFileRef();
 		const onChange = this.#options.onChange;
-		if (fileContents !== void 0 && textDocument !== void 0 && onChange !== void 0) {
-			const { contents: _,...file } = fileContents;
-			Object.defineProperty(file, "contents", {
-				enumerable: true,
-				get: () => textDocument.getText()
-			});
-			onChange(file, newLineAnnotations ?? this.#lineAnnotations);
-		}
+		if (fileRef !== void 0 && onChange !== void 0) onChange(fileRef, newLineAnnotations ?? this.#lineAnnotations);
 		if (change.lineDelta !== 0) {
 			for (const line of this.#lineYCache.keys()) if (line >= change.startLine) this.#lineYCache.delete(line);
 		}
@@ -1317,6 +1378,7 @@ var Editor = class {
 			else if (primarySelection.end.line > renderRangeEndLine) shouldUpdateBuffer = true;
 		}
 		this.#rerender(change, newLineAnnotations, renderRange, shouldUpdateBuffer);
+		if (options?.skipSearchRefresh !== true && this.#searchPanel !== void 0 && this.#matches !== void 0) this.#searchPanel.updateMatches({ syncSelection: false });
 		if (selections !== void 0) {
 			this.#updateSelections(selections);
 			if (this.#primaryCaretElement !== void 0) this.#primaryCaretElement.scrollIntoView({
@@ -1391,7 +1453,7 @@ var Editor = class {
 		if (cachedY !== void 0) return cachedY;
 		const lineElement = this.#getLineElement(line);
 		if (lineElement === void 0) return -1;
-		const y = lineElement.offsetTop + this.#codePaddingTop;
+		const y = lineElement.offsetTop + this.#metrics.paddingTop;
 		this.#lineYCache.set(line, y);
 		return y;
 	}