@pierre/diffs 1.3.0-beta.8 → 1.3.0-rc.1

package/dist/editor/editor.js

@@ -1,32 +1,69 @@
-import { queueRender } from "../managers/UniversalRenderingManager.js";
+import { dequeueRender, queueRender } from "../managers/UniversalRenderingManager.js";
+import { isGutterUtilityPath } from "../utils/isGutterUtilityPath.js";
 import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { isMoveCursorShortcut, isPrimaryModifier, isSafari } from "./platform.js";
 import { resolveEditorCommandFromKeyboardEvent, resolveFindAgainShortcut } from "./command.js";
-import { EditStack } from "./editStack.js";
 import editor_default from "./editor2.js";
+import { EditStack } from "./editStack.js";
+import { resolveBlockCommentEdits, resolveCommentConfig, resolveLineCommentEdits } from "./languages.js";
 import { addEventListener, clampDomOffset, extend, getLineNumberAttr, h, round } from "./utils.js";
 import { applyDocumentChangeToLineAnnotations, renderLineAnnotations } from "./lineAnnotations.js";
 import { PopoverManager } from "./popover.js";
-import { applyDeleteCharacterToSelections, applyDeleteHardLineForwardToSelections, applyDeleteSoftLineBackwardToSelections, applyDeleteWordBackwardToSelections, applyTextChangeToSelections, applyTextReplaceToSelections, applyTransposeToSelections, comparePosition, convertSelection, createSelectionFrom, createSelectionFromAnchorAndFocusOffsets, expandCollapsedSelectionToWord, extendSelection, extendSelections, findNexMatch, getAutoSurroundReplacementTexts, getCaretPosition, getDocumentBoundarySelection, getDocumentFullSelection, getSelectedLineBlocks, getSelectionAnchor, getSelectionText, isCollapsedSelection, isLineEditable, mapCursorMove, mapSelectionShift, mergeOverlappingSelections, remapSelectionsAfterEdits, resolveIndentEdits, resolveSelectionCut, selectionIntersects, shiftSelectionLines } from "./selection.js";
+import { applyDeleteCharacterToSelections, applyDeleteHardLineForwardToSelections, applyDeleteSoftLineBackwardToSelections, applyDeleteWordBackwardToSelections, applyTextChangeToSelections, applyTextReplaceToSelections, applyTransposeToSelections, comparePosition, convertSelection, createSelectionFrom, createSelectionFromAnchorAndFocusOffsets, expandCollapsedSelectionToWord, extendSelection, extendSelections, findNextMatch, getAutoSurroundReplacementTexts, getCaretPosition, getDocumentBoundarySelection, getDocumentFullSelection, getSelectedLineBlocks, getSelectionAnchor, getSelectionClipboardTexts, getSelectionText, isCollapsedSelection, isLineEditable, mapCursorMove, mapSelectionShift, mergeOverlappingSelections, remapSelectionsAfterEdits, resolveIndentEdits, resolveSelectionCut, selectionIntersects, shiftSelectionLines } from "./selection.js";
 import { MarkerRenderer, markerSeverityDatasetKey } from "./marker.js";
 import { findBracketMatchRanges } from "./matchBrackets.js";
 import { createSpriteElement } from "./sprite.js";
 import { SearchPanelWidget } from "./searchPanel.js";
 import { SelectionActionWidget } from "./selectionAction.js";
+import { cloneEditorState, createStateStorage } from "./stateStorage.js";
 import { TextDocument } from "./textDocument.js";
 import { Metrics, getExpandedAsciiTextColumns, getUnicodeMeasurementOffsets, snapTextOffsetToUnicodeBoundary } from "./textMeasure.js";
-import { EditorTokenizer, renderLineTokens } from "./tokenzier.js";
+import { EditorTokenizer, renderLineTokens } from "./tokenizer.js";
 //#region src/editor/editor.ts
+function getShadowRootRange(shadowRoot) {
+	const selection = shadowRoot.getSelection?.();
+	if (selection == null || selection.rangeCount === 0) return;
+	const range = selection.getRangeAt(0);
+	return {
+		collapsed: range.collapsed,
+		startContainer: range.startContainer,
+		startOffset: range.startOffset,
+		endContainer: range.endContainer,
+		endOffset: range.endOffset
+	};
+}
+function requirePersistedCacheKey(file) {
+	if (typeof file.cacheKey !== "string" || file.cacheKey.length === 0) throw new Error(`Editor persistState requires a non-empty file.cacheKey for "${file.name}". Provide a unique, stable cacheKey for every editable file.`);
+	return file.cacheKey;
+}
+function isPromise(value) {
+	return typeof value === "object" && value !== null && "then" in value && typeof value.then === "function";
+}
 const MAX_EDIT_WIDEN_WINDOW_MULTIPLE = 2;
+const MAX_WRAP_OFFSETS_CACHE_LINES = 1e4;
+const SELECTION_ACTION_POPOVER_PLACEMENT_KEY = "selection-action";
+const MULTI_SELECTION_CLIPBOARD_TYPE = "application/vnd.pierre.diffs-selections+json";
 var Editor = class {
 	#options;
 	#metrics = new Metrics();
 	#tokenizer;
 	#popoverManager;
+	#textDocumentCache = /* @__PURE__ */ new Map();
+	#stateStorage;
+	#stateStorageOption;
+	#pendingStateWrites = /* @__PURE__ */ new Map();
+	#pendingStateRestore;
+	#stateRestoreGeneration = 0;
+	#restoreStateOnNextSync = false;
 	#editorEventDisposes;
 	#globalEventDisposes;
 	#selectEventDisposes;
 	#detach;
+	#attachState = {
+		generation: 0,
+		callback: void 0,
+		delivered: false
+	};
 	#contentOffset;
 	#gutterWidthCache;
 	#contentWidthCache;
@@ -54,9 +91,11 @@ var Editor = class {
 	#markerRenderer;
 	#searchPanel;
 	#selectionAction;
+	#canMountSelectionAction = true;
 	#shouldIgnoreSelectionChange = false;
 	#suppressNativeSelectionSync = false;
 	#contentHasFocus = false;
+	#replacementFocusRequest;
 	#isComposing = false;
 	#isGutterMouseDown = false;
 	#isContentMouseDown = false;
@@ -75,13 +114,13 @@ var Editor = class {
 	#fontRemeasureScheduled = false;
 	#themeSelectionRefreshFrame;
 	#onDeferTokenize = (lines, themeType) => {
-		this.#fileInstance?.updateRenderCache(lines, themeType, false);
+		this.#fileInstance?.updateRenderCache(lines, themeType, false, false);
 		if (this.#renderRange !== void 0 && this.#renderRange.totalLines !== Infinity) {
 			const { startingLine, totalLines } = this.#renderRange;
 			const endLine = Math.min(startingLine + totalLines, this.#textDocument?.lineCount ?? 0);
 			for (const [line, tokens] of lines) if (line >= startingLine && line < endLine) {
 				const lineElement = this.#getLineElement(line);
-				if (lineElement !== void 0) lineElement.replaceChildren(...renderLineTokens(tokens, themeType));
+				if (lineElement !== void 0) lineElement.replaceChildren(...renderLineTokens(tokens));
 			}
 		}
 	};
@@ -89,21 +128,38 @@ var Editor = class {
 		this.#options = options;
 	}
 	setOptions(options) {
-		this.#options = {
+		const previousStorageOption = this.#options.persistStateStorage ?? "inMemory";
+		const nextOptions = {
 			...this.#options,
 			...options
 		};
+		if (nextOptions.persistState === true && this.#fileInstance?.type === "file") {
+			const file = this.#fileInstance.__getCurrentFile?.() ?? this.#fileInfo;
+			if (file !== void 0) requirePersistedCacheKey(file);
+		}
+		this.#options = nextOptions;
+		if (this.#options.persistState !== true) {
+			this.#textDocumentCache.clear();
+			this.#stateRestoreGeneration++;
+			this.#restoreStateOnNextSync = false;
+		}
+		if ((this.#options.persistStateStorage ?? "inMemory") !== previousStorageOption) {
+			this.#stateRestoreGeneration++;
+			this.#stateStorage = void 0;
+			this.#stateStorageOption = void 0;
+			this.#pendingStateWrites.clear();
+		}
 	}
 	edit(fileInstance) {
-		const { useTokenTransformer, enableGutterUtility, enableLineSelection, expandUnchanged, lineHoverHighlight = "disabled", ...rest } = fileInstance.options;
-		if (useTokenTransformer !== true || enableGutterUtility === true || enableLineSelection === true || expandUnchanged !== true && fileInstance.type === "file-diff" || lineHoverHighlight !== "disabled") {
+		if (this.#options.persistState === true && fileInstance.type === "file") {
+			const file = fileInstance.__getCurrentFile?.();
+			if (file !== void 0) requirePersistedCacheKey(file);
+		}
+		this.#invalidateOnAttach();
+		if (fileInstance.options.useTokenTransformer !== true) {
 			fileInstance.setOptions({
-				...rest,
-				useTokenTransformer: true,
-				enableGutterUtility: false,
-				enableLineSelection: false,
-				expandUnchanged: true,
-				lineHoverHighlight: "disabled"
+				...fileInstance.options,
+				useTokenTransformer: true
 			});
 			fileInstance.rerender();
 		}
@@ -113,23 +169,22 @@ var Editor = class {
 		return () => this.cleanUp();
 	}
 	/**
-	* Apply edits to current attached file.
+	* Apply edits to current attached file. Every edit joins the undo timeline:
+	* a programmatic edit must leave the document and its history exactly as
+	* the same edit typed by the user would (history equivalence — see
+	* TextDocument.applyResolvedEdits), so it is undoable like any other edit.
+	*
+	* @param updateHistory Whether to record caller selection snapshots for
+	* exact undo/redo restoration. Defaults to true. When false, live selections
+	* are remapped during replay and the text edit still joins the undo timeline.
 	*/
-	applyEdits(edits, updateHistory = false) {
+	applyEdits(edits, updateHistory = true) {
 		const textDocument = this.#textDocument;
 		if (textDocument == null) throw new Error("Editor is not attached");
 		const wasFocused = this.#contentHasFocus;
 		const selectionsBefore = this.#selections;
 		const selectionOffsetsBefore = selectionsBefore?.map((selection) => [textDocument.offsetAt(selection.start), textDocument.offsetAt(selection.end)]);
-		const resolvedEditOffsets = selectionsBefore === void 0 ? void 0 : edits.map((edit) => {
-			const a = textDocument.offsetAt(edit.range.start);
-			const b = textDocument.offsetAt(edit.range.end);
-			return {
-				start: Math.min(a, b),
-				end: Math.max(a, b),
-				text: edit.newText
-			};
-		}).sort((a, b) => a.start - b.start);
+		const resolvedEditOffsets = selectionsBefore === void 0 ? void 0 : textDocument.resolveEdits(edits).sort((a, b) => a.start - b.start);
 		const change = textDocument.applyEdits(edits, updateHistory, selectionsBefore);
 		if (change === void 0) return;
 		let nextSelections;
@@ -155,45 +210,58 @@ var Editor = class {
 	redo() {
 		this.#runCommand("redo");
 	}
+	getFile() {
+		const fileInfo = this.#fileInfo;
+		const textDocument = this.#textDocument;
+		if (fileInfo === void 0 || textDocument === void 0) return;
+		const file = { ...fileInfo };
+		Object.defineProperty(file, "contents", {
+			enumerable: true,
+			get: () => textDocument.getText()
+		});
+		return file;
+	}
+	getText() {
+		return this.#textDocument?.getText() ?? "";
+	}
 	getState() {
-		const fileRef = this.#getFileRef();
-		if (fileRef === void 0) throw new Error("Editor is not attached");
+		const fileInstance = this.#fileInstance;
 		return {
-			file: {
-				...fileRef,
-				cacheKey: "edited-at-" + Date.now()
-			},
 			selections: this.#selections,
-			lineAnnotations: this.#lineAnnotations,
-			renderRange: this.#renderRange
+			view: fileInstance != null ? { scrollLeft: fileInstance.getCodeScrollLeft() } : void 0
 		};
 	}
-	setState({ file, lineAnnotations, renderRange, selections }) {
-		this.#resetCache();
-		this.#resetState();
-		this.#initSelections = selections;
-		this.#fileInstance?.render({
-			file: {
-				...file,
-				cacheKey: "edited-at-" + Date.now()
-			},
-			lineAnnotations,
-			renderRange
-		});
+	setState({ selections, view }) {
+		if (this.#fileInstance === void 0 || this.#textDocument === void 0) throw new Error("Editor is not attached");
+		this.#canMountSelectionAction = false;
+		this.#updateSelections(selections ?? []);
+		if (view != null) {
+			this.#fileInstance.setCodeScrollLeft(view.scrollLeft);
+			return;
+		}
+		this.#scrollToPrimaryCaret();
 	}
 	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);
+			let start = textDocument.normalizePosition(selection.start);
+			let end = textDocument.normalizePosition(selection.end);
+			let direction = selection.direction === "none" ? 0 : selection.direction === "backward" ? -1 : 1;
+			if (comparePosition(start, end) > 0) {
+				[start, end] = [end, start];
+				if (direction !== 0) direction = direction === 1 ? -1 : 1;
+			}
 			return {
-				direction: selection.direction === "none" ? 0 : selection.direction === "backward" ? -1 : 1,
+				direction,
 				start,
 				end
 			};
 		});
+		this.#canMountSelectionAction = false;
 		this.#updateSelections(resolvedSelections);
+		const primarySelection = resolvedSelections.at(-1);
+		if (primarySelection !== void 0) this.#revealLineIfCollapsed(getCaretPosition(primarySelection).line);
 		this.#scrollToPrimaryCaret();
 	}
 	setMarkers(markers) {
@@ -220,6 +288,19 @@ var Editor = class {
 	}
 	focus(options) {
 		const preventScroll = options?.preventScroll ?? false;
+		const lineNumber = options?.lineNumber;
+		if (lineNumber === "first-visible" || typeof lineNumber === "number") {
+			const textDocument = this.#textDocument;
+			if (textDocument == null || this.#fileInstance == null) return;
+			const targetLineNumber = lineNumber === "first-visible" ? this.#getFirstVisibleLineNumber(options?.offset) : lineNumber;
+			if (targetLineNumber == null) return;
+			const position = textDocument.normalizePosition({
+				line: targetLineNumber - 1,
+				character: lineNumber === "first-visible" ? 0 : options?.character ?? 0
+			});
+			this.#focusAtPosition(position, preventScroll);
+			return;
+		}
 		const primarySelection = this.#selections?.at(-1);
 		if (primarySelection !== void 0) {
 			const pos = primarySelection.direction === -1 ? primarySelection.end : primarySelection.start;
@@ -227,9 +308,20 @@ var Editor = class {
 		} else this.#focus(void 0, preventScroll);
 	}
 	blur() {
+		this.#replacementFocusRequest = void 0;
+		this.#contentHasFocus = false;
+		this.#shouldIgnoreSelectionChange = false;
 		this.#contentElement?.blur();
 	}
 	cleanUp(recycle = false) {
+		this.#invalidateOnAttach();
+		if (!recycle) this.#attachState.delivered = false;
+		const hadFileInstance = this.#fileInstance != null;
+		const shouldRestoreState = this.#isStatePersistenceEnabled;
+		this.#stateRestoreGeneration++;
+		this.#persistCurrentState();
+		if (hadFileInstance) this.#restoreStateOnNextSync = shouldRestoreState;
+		dequeueRender(this.#handleCustomPasteEvent);
 		this.#tokenizer?.cleanUp();
 		this.#tokenizer = void 0;
 		if (!recycle) {
@@ -242,7 +334,7 @@ var Editor = class {
 		this.#editorEventDisposes = void 0;
 		this.#selectEventDisposes?.forEach((dispose) => dispose());
 		this.#selectEventDisposes = void 0;
-		this.#detach?.();
+		this.#detach?.(recycle);
 		this.#detach = void 0;
 		this.#gutterWidthCache = void 0;
 		this.#contentWidthCache = void 0;
@@ -264,6 +356,7 @@ var Editor = class {
 		this.#gutterElement = void 0;
 		this.#contentElement?.removeAttribute("contentEditable");
 		this.#contentElement = void 0;
+		this.#replacementFocusRequest = void 0;
 		this.#contentHasFocus = false;
 		this.#overlayElement?.remove();
 		this.#overlayElement = void 0;
@@ -275,6 +368,24 @@ var Editor = class {
 			this.#themeSelectionRefreshFrame = void 0;
 		}
 		this.#resetState();
+		this.#fileInstance = void 0;
+	}
+	/** @internal Capture outgoing state and substitute cached text before render. */
+	__prepareFile(file) {
+		if (this.#options.persistState !== true) return file;
+		const cacheKey = requirePersistedCacheKey(file);
+		const fileInfo = this.#fileInfo;
+		const languageId = file.lang ?? getFiletypeFromFileName(file.name);
+		if (fileInfo !== void 0 && (requirePersistedCacheKey(fileInfo) !== cacheKey || fileInfo.name !== file.name || this.#textDocument?.languageId !== languageId)) {
+			this.#stateRestoreGeneration++;
+			this.#persistCurrentState();
+		}
+		const textDocument = this.#getCachedTextDocument(file, cacheKey);
+		if (textDocument === void 0 || textDocument.getText() === file.contents) return file;
+		return {
+			...file,
+			contents: textDocument.getText()
+		};
 	}
 	/** @internal */
 	__postponeBgTokenizeToNextFrame() {
@@ -287,7 +398,15 @@ var Editor = class {
 		}
 	}
 	/** @internal */
+	__captureFocusForDOMReplacement() {
+		const contentElement = this.#contentElement;
+		const shadowActiveElement = this.#fileContainer?.shadowRoot?.activeElement;
+		if (contentElement != null && (this.#contentHasFocus || shadowActiveElement === contentElement || shadowActiveElement != null && contentElement.contains(shadowActiveElement))) this.#replacementFocusRequest = {};
+	}
+	/** @internal */
 	__syncRenderView = (highlighter, fileContainer, fileOrDiff, lineAnnotations, renderRange) => {
+		const fileInstance = this.#fileInstance;
+		if (fileInstance == null) return;
 		const shadowRoot = fileContainer.shadowRoot;
 		if (shadowRoot == null) {
 			console.error("[editor] Could not find the shadow root.");
@@ -306,7 +425,10 @@ var Editor = class {
 			}
 			break;
 		}
-		if (codeElement === void 0 || contentEl === void 0) return;
+		if (codeElement === void 0 || contentEl === void 0) {
+			this.#replacementFocusRequest = void 0;
+			return;
+		}
 		this.#getPopoverManager().setViewportElements(fileContainer, codeElement);
 		if (this.#fileContainer !== fileContainer) {
 			this.#fileContainer = fileContainer;
@@ -315,28 +437,42 @@ 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.#fileInfo === void 0 || this.#fileInfo.name !== fileOrDiff.name || this.#fileInfo.lang !== fileOrDiff.lang || this.#fileInfo.cacheKey !== fileOrDiff.cacheKey) {
+		const shouldRebuildDocument = this.#textDocument === void 0 || this.#fileInfo === void 0 || this.#fileInfo.name !== fileOrDiff.name || this.#fileInfo.lang !== fileOrDiff.lang || this.#fileInfo.cacheKey !== fileOrDiff.cacheKey;
+		const persistedCacheKey = this.#isStatePersistenceEnabled ? requirePersistedCacheKey(fileOrDiff) : void 0;
+		let persistedStateTarget;
+		if (shouldRebuildDocument) {
+			this.#invalidateOnAttach();
 			let contents = "";
 			if ("contents" in fileOrDiff) contents = fileOrDiff.contents;
 			else contents = fileOrDiff.additionLines.join("");
 			const editStack = new EditStack({ maxEntries: this.#options.historyMaxEntries });
-			const textDocument = new TextDocument(fileOrDiff.name, contents, fileOrDiff.lang ?? getFiletypeFromFileName(fileOrDiff.name), 0, editStack);
 			const { name, lang, cacheKey } = fileOrDiff;
+			const languageId = lang ?? getFiletypeFromFileName(fileOrDiff.name);
+			const textDocument = (persistedCacheKey !== void 0 ? this.#getCachedTextDocument(fileOrDiff, persistedCacheKey) : void 0) ?? new TextDocument(fileOrDiff.name, contents, languageId, 0, editStack);
 			this.#fileInfo = {
 				name,
 				lang,
 				cacheKey
 			};
 			this.#textDocument = textDocument;
+			if (persistedCacheKey !== void 0) {
+				this.#textDocumentCache.set(persistedCacheKey, textDocument);
+				persistedStateTarget = {
+					cacheKey: persistedCacheKey,
+					textDocument
+				};
+			}
 			this.#tokenizer?.cleanUp();
 			this.#tokenizer = void 0;
 			this.#resetState();
+			this.#wrapLineOffsetsCache.clear();
 			this.#selections = this.#initSelections;
-			requestAnimationFrame(() => {
-				this.#options.onAttach?.(this, this.#fileInstance);
-			});
 			if (this.#textDocument !== void 0 && this.#options.__debug === true) console.log("[diffs/editor] text document rebuilt from", fileOrDiff.name);
 		}
+		if (persistedStateTarget === void 0 && this.#restoreStateOnNextSync && persistedCacheKey !== void 0 && this.#textDocument !== void 0) persistedStateTarget = {
+			cacheKey: persistedCacheKey,
+			textDocument: this.#textDocument
+		};
 		const textDocument = this.#textDocument;
 		if (this.#tokenizer == null && textDocument != null) this.#tokenizer = new EditorTokenizer({
 			highlighter,
@@ -368,11 +504,12 @@ var Editor = class {
 			this.#listenContentElement(contentEl, gutterEl);
 			if (this.#contentElement !== void 0 && this.#options.__debug === true) console.log("[diffs/editor] full re-render triggered !!!");
 		}
+		if (this.#replacementFocusRequest != null) this.#replacementFocusRequest.target = contentEl;
 		if (contentEl.ariaLabel !== fileOrDiff.name) contentEl.ariaLabel = fileOrDiff.name;
-		if (lineAnnotations !== void 0 && lineAnnotations.length > 0 || this.#isDiff && this.#diffSyle === "unified") for (const child of this.#contentElement.children) {
+		if (lineAnnotations !== void 0 && lineAnnotations.length > 0 || this.#isDiff) for (const child of this.#contentElement.children) {
 			const el = child;
-			const { lineAnnotation, lineType } = el.dataset;
-			if (lineAnnotation !== void 0 || lineType === "change-deletion") el.setAttribute("contenteditable", "false");
+			const { lineAnnotation, lineType, separator } = el.dataset;
+			if (lineAnnotation !== void 0 || separator !== void 0 || lineType === "change-deletion") el.setAttribute("contenteditable", "false");
 		}
 		this.#resetCache();
 		this.#tokenizer?.syncTheme(this.#fileInstance?.options ?? {});
@@ -380,19 +517,140 @@ var Editor = class {
 		this.#renderRange = renderRange;
 		this.#viewportWindowLines = renderRange?.totalLines;
 		this.#tokenizer?.prebuildStateStack(renderRange);
-		this.#markerRenderer?.removePopup();
+		this.#markerRenderer?.removePopover();
 		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;
 			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 });
+		else if (this.#replacementFocusRequest !== void 0) this.#restoreReplacementFocus();
+		else if (this.#selections !== void 0 && this.#selections.length > 0 && this.#contentHasFocus && !this.#retainSearchPanelFocus) this.focus({ preventScroll: true });
 		if (this.#retainSearchPanelFocus) this.#searchPanel?.focus();
 		if (this.#options.__debug === true && renderRange !== void 0) {
 			const { startingLine, totalLines } = renderRange;
 			console.log("[diffs/editor] render file:", fileOrDiff.name, "RenderRange:", startingLine + "-" + (startingLine + totalLines), "of", this.#textDocument?.lineCount, "lines");
 		}
+		if (persistedStateTarget !== void 0) {
+			this.#restoreStateOnNextSync = false;
+			this.#restorePersistedState(persistedStateTarget.cacheKey, persistedStateTarget.textDocument);
+		}
+		this.#scheduleOnAttach(fileInstance);
 	};
+	get #isStatePersistenceEnabled() {
+		return this.#options.persistState === true && this.#fileInstance?.type === "file";
+	}
+	#getCachedTextDocument(file, cacheKey) {
+		const textDocument = this.#textDocumentCache.get(cacheKey);
+		const languageId = file.lang ?? getFiletypeFromFileName(file.name);
+		return textDocument?.languageId === languageId ? textDocument : void 0;
+	}
+	#getStateStorage() {
+		const option = this.#options.persistStateStorage ?? "inMemory";
+		if (this.#stateStorage === void 0 || this.#stateStorageOption !== option) {
+			this.#stateStorage = createStateStorage(option);
+			this.#stateStorageOption = option;
+		}
+		return this.#stateStorage;
+	}
+	#persistCurrentState() {
+		const fileInfo = this.#fileInfo;
+		const textDocument = this.#textDocument;
+		if (!this.#isStatePersistenceEnabled || fileInfo === void 0 || textDocument === void 0) return;
+		const cacheKey = requirePersistedCacheKey(fileInfo);
+		this.#textDocumentCache.set(cacheKey, textDocument);
+		let storage;
+		try {
+			storage = this.#getStateStorage();
+		} catch {
+			return;
+		}
+		const state = cloneEditorState(this.getState());
+		const pendingRestore = this.#pendingStateRestore;
+		if (pendingRestore?.cacheKey === cacheKey && pendingRestore.textDocument === textDocument) {
+			this.#pendingStateRestore = void 0;
+			if (textDocument.version === pendingRestore.documentVersion && this.#selections === pendingRestore.selections && state.view?.scrollLeft === pendingRestore.view?.scrollLeft) return;
+			this.#writeState(storage, cacheKey, state, pendingRestore.completion);
+			return;
+		}
+		this.#writeState(storage, cacheKey, state);
+	}
+	#writeState(storage, cacheKey, state, waitFor) {
+		const previousWrite = this.#pendingStateWrites.get(cacheKey);
+		if (waitFor !== void 0 || previousWrite !== void 0) {
+			let pending = waitFor ?? Promise.resolve();
+			if (previousWrite !== void 0) pending = pending.then(() => previousWrite);
+			this.#trackStateWrite(cacheKey, pending.then(() => storage.set(cacheKey, state)));
+			return;
+		}
+		let result;
+		try {
+			result = storage.set(cacheKey, state);
+		} catch {
+			return;
+		}
+		if (!isPromise(result)) return;
+		this.#trackStateWrite(cacheKey, result);
+	}
+	#trackStateWrite(cacheKey, result) {
+		const pending = result.catch(() => {});
+		this.#pendingStateWrites.set(cacheKey, pending);
+		pending.finally(() => {
+			if (this.#pendingStateWrites.get(cacheKey) === pending) this.#pendingStateWrites.delete(cacheKey);
+		});
+	}
+	#restorePersistedState(cacheKey, textDocument) {
+		const generation = ++this.#stateRestoreGeneration;
+		const documentVersion = textDocument.version;
+		const selections = this.#selections;
+		const view = this.getState().view;
+		const applyState = (state) => {
+			const currentView = this.getState().view;
+			if (state === void 0 || generation !== this.#stateRestoreGeneration || this.#textDocument !== textDocument || textDocument.version !== documentVersion || this.#selections !== selections || currentView?.scrollLeft !== view?.scrollLeft || this.#fileInfo === void 0 || requirePersistedCacheKey(this.#fileInfo) !== cacheKey) return;
+			this.setState(cloneEditorState(state));
+		};
+		const readState = () => {
+			let result;
+			try {
+				result = this.#getStateStorage().get(cacheKey);
+			} catch {
+				return;
+			}
+			if (isPromise(result)) return result.then(applyState).catch(() => {});
+			else try {
+				applyState(result);
+			} catch {}
+		};
+		const pendingWrite = this.#pendingStateWrites.get(cacheKey);
+		const result = pendingWrite === void 0 ? readState() : pendingWrite.then(readState);
+		if (isPromise(result)) {
+			const pendingRestore = {
+				cacheKey,
+				textDocument,
+				documentVersion,
+				selections,
+				view,
+				completion: result.catch(() => {})
+			};
+			this.#pendingStateRestore = pendingRestore;
+			pendingRestore.completion.finally(() => {
+				if (this.#pendingStateRestore === pendingRestore) this.#pendingStateRestore = void 0;
+			});
+		}
+	}
+	#isLineRenderable(line) {
+		return this.#fileInstance?.isLineRenderable?.(line + 1) ?? true;
+	}
+	get #resolveRenderableLine() {
+		const fileInstance = this.#fileInstance;
+		if (fileInstance?.getNearestRenderableLine == null) return;
+		return (line, direction) => {
+			const nearest = fileInstance.getNearestRenderableLine(line + 1, direction);
+			return nearest == null ? void 0 : nearest - 1;
+		};
+	}
+	#revealLineIfCollapsed(line) {
+		if (!this.#isLineRenderable(line)) this.#fileInstance?.revealLine?.(line + 1);
+	}
 	get #diffSyle() {
 		return this.#fileInstance?.options.diffStyle ?? "split";
 	}
@@ -404,21 +662,24 @@ var Editor = class {
 	}
 	#getPopoverManager() {
 		return this.#popoverManager ??= new PopoverManager({
-			hasActivePopover: () => this.#selectionAction !== void 0,
-			updateActivePopover: () => this.#updateSelectionActionPopover()
+			hasActivePopover: () => this.#selectionAction !== void 0 || this.#markerRenderer?.isPopoverVisible() === true,
+			updateActivePopover: () => {
+				this.#updateSelectionActionPopover();
+				this.#markerRenderer?.updatePopoverPosition();
+			}
 		});
 	}
 	#resetCache() {
 		this.#lineYCache.clear();
-		this.#wrapLineOffsetsCache.clear();
 		this.#lineElementsCache.clear();
 		this.#lastAccessedCharX = void 0;
 	}
 	#resetState() {
-		this.#setSelectedLinesSafe(null);
+		this.#setEditorActiveLineSafe(null);
 		this.#gutterWidthCache = void 0;
 		this.#contentWidthCache = void 0;
 		this.#shouldIgnoreSelectionChange = false;
+		this.#suppressNativeSelectionSync = false;
 		this.#overlayElements?.forEach((el) => el.remove());
 		this.#overlayElements = void 0;
 		this.#selections = void 0;
@@ -430,6 +691,33 @@ var Editor = class {
 		this.#searchPanel = void 0;
 		this.#selectionAction?.cleanup();
 		this.#selectionAction = void 0;
+		this.#canMountSelectionAction = true;
+	}
+	#invalidateOnAttach() {
+		const attachState = this.#attachState;
+		attachState.generation++;
+		if (attachState.callback != null) {
+			dequeueRender(attachState.callback);
+			attachState.callback = void 0;
+		}
+	}
+	#scheduleOnAttach(fileInstance) {
+		const attachState = this.#attachState;
+		const textDocument = this.#textDocument;
+		if (attachState.delivered || attachState.callback != null || textDocument == null) return;
+		const { generation } = attachState;
+		const callback = () => {
+			if (attachState.callback !== callback) return;
+			attachState.callback = void 0;
+			if (generation !== attachState.generation || this.#fileInstance !== fileInstance || this.#textDocument !== textDocument) return;
+			const contentElement = this.#contentElement;
+			const shadowRoot = this.#fileContainer?.shadowRoot;
+			if (contentElement == null || shadowRoot == null || !shadowRoot.contains(contentElement)) return;
+			attachState.delivered = true;
+			this.#options.onAttach?.(this, fileInstance);
+		};
+		attachState.callback = callback;
+		queueRender(callback);
 	}
 	#initialize() {
 		this.#globalStyleElement = h("style", {
@@ -448,14 +736,33 @@ var Editor = class {
 		this.#themeStyleElement = h("style", { dataset: "editorThemeCss" });
 		this.#spriteElement = createSpriteElement();
 		this.#overlayElement = h("div", { dataset: "editorOverlay" });
+		const replacementFocusTargetIsContent = (event) => {
+			const target = event.composedPath()[0];
+			return target instanceof Node && this.#contentElement?.contains(target) === true;
+		};
+		const cancelReplacementFocus = () => {
+			if (this.#replacementFocusRequest == null) return;
+			this.#replacementFocusRequest = void 0;
+			this.#contentHasFocus = false;
+			this.#shouldIgnoreSelectionChange = false;
+		};
 		this.#globalEventDisposes = [
+			addEventListener(document, "focusin", (event) => {
+				if (!replacementFocusTargetIsContent(event)) cancelReplacementFocus();
+			}, { passive: true }),
+			addEventListener(document, "pointerdown", (event) => {
+				if (!replacementFocusTargetIsContent(event)) queueMicrotask(cancelReplacementFocus);
+			}, {
+				capture: true,
+				passive: true
+			}),
 			addEventListener(document, "selectionchange", () => {
 				const shadowRoot = this.#fileContainer?.shadowRoot;
 				if (this.#shouldIgnoreSelectionChange || this.#suppressNativeSelectionSync || shadowRoot == null || !this.#contentHasFocus) return;
 				if (this.#selections !== void 0 && this.#selections.length > 1 && !this.#isContentMouseDown) return;
 				const selectionRaw = document.getSelection();
-				if (selectionRaw == null || typeof selectionRaw.getComposedRanges !== "function") return;
-				const composedRange = selectionRaw.getComposedRanges({ shadowRoots: [shadowRoot] })?.[0];
+				if (selectionRaw == null) return;
+				const composedRange = typeof selectionRaw.getComposedRanges === "function" ? selectionRaw.getComposedRanges({ shadowRoots: [shadowRoot] })?.[0] : getShadowRootRange(shadowRoot);
 				if (composedRange === void 0 || !this.#rangeBelongsToEditor(composedRange)) return;
 				let selection = convertSelection(composedRange, 0);
 				if (selection === void 0) return;
@@ -501,6 +808,12 @@ var Editor = class {
 		this.#selectEventDisposes?.forEach((dispose) => dispose());
 		this.#selectEventDisposes = disposes;
 	}
+	#isLineSelectionEnabled() {
+		return this.#fileInstance?.options.enableLineSelection === true;
+	}
+	#preserveEditorSelectionsForGutterGesture() {
+		this.#suppressNativeSelectionSync = this.#selections !== void 0;
+	}
 	#listenContentElement(contentEl, gutterEl) {
 		const { onFocus, onBlur } = this.#options;
 		const targetIsContentElement = (e) => {
@@ -515,10 +828,15 @@ var Editor = class {
 				if (!this.#isContentMouseDown && !this.#shouldIgnoreSelectionChange && this.#selections !== void 0 && this.#selections.length > 0) this.#setWindowSelection(this.#selections.at(-1));
 			}, { passive: true }),
 			addEventListener(contentEl, "blur", () => {
+				if (this.#replacementFocusRequest?.target === contentEl) {
+					this.#replacementFocusRequest = void 0;
+					this.#shouldIgnoreSelectionChange = false;
+				}
 				this.#contentHasFocus = false;
 				onBlur?.();
 			}, { passive: true }),
 			addEventListener(contentEl, "pointerdown", (e) => {
+				this.#canMountSelectionAction = true;
 				this.#suppressNativeSelectionSync = false;
 				if (e.pointerType !== "mouse") return;
 				if (this.#isDeletedLineTarget(e)) {
@@ -527,7 +845,7 @@ var Editor = class {
 					return;
 				}
 				this.#setDeletedTextSelectionActive(false);
-				this.#markerRenderer?.removePopup();
+				this.#markerRenderer?.removePopover();
 				if (isSafari() && this.#lineAnnotations !== void 0 && this.#lineAnnotations.length > 0) {
 					const annotationDisposes = [...contentEl.querySelectorAll("[data-line-annotation]")].map((el) => [addEventListener(el, "mouseenter", () => {
 						this.#shouldIgnoreSelectionChange = true;
@@ -555,32 +873,26 @@ var Editor = class {
 			addEventListener(contentEl, "keydown", (e) => {
 				if (e.key === "Escape") {
 					e.preventDefault();
-					this.#searchPanel?.cleanup();
+					this.#searchPanel?.close();
 					this.#searchPanel = void 0;
 					this.#retainSearchPanelFocus = false;
 					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) {
-							const pos = getCaretPosition(primarySelection);
-							this.#updateSelections([{
-								start: pos,
-								end: pos,
-								direction: 0
-							}]);
-							this.#focus(pos);
-						}
-					}
+					this.#runCommand("simplifySelection");
 					return;
 				}
 				if (!targetIsContentElement(e)) return;
+				this.#canMountSelectionAction = true;
 				this.#suppressNativeSelectionSync = false;
 				const mvShortcut = isMoveCursorShortcut(e);
 				const textDocument = this.#textDocument;
 				if (this.#selections !== void 0 && this.#selections.length > 0 && mvShortcut !== void 0 && textDocument !== void 0) {
-					if (e.shiftKey) this.#updateSelections(mapSelectionShift(textDocument, this.#selections, mvShortcut));
-					else this.#updateSelections(mapCursorMove(textDocument, this.#selections, mvShortcut));
+					const cursorMoveOptions = {
+						getSoftLineOffsets: this.#isWrap ? (line) => this.#wrapLineText(line) : void 0,
+						resolveRenderableLine: this.#resolveRenderableLine
+					};
+					if (e.shiftKey) this.#updateSelections(mapSelectionShift(textDocument, this.#selections, mvShortcut, cursorMoveOptions));
+					else this.#updateSelections(mapCursorMove(textDocument, this.#selections, mvShortcut, cursorMoveOptions));
 					this.#scrollToPrimaryCaret();
 					e.preventDefault();
 					return;
@@ -613,19 +925,34 @@ var Editor = class {
 			addEventListener(contentEl, "copy", (e) => {
 				if (!targetIsContentElement(e)) return;
 				e.preventDefault();
-				e.clipboardData?.setData("text", this.#isDeletedTextSelectionActive() ? this.#deletedTextForClipboard() : this.#getSelectionText());
+				if (this.#isDeletedTextSelectionActive()) e.clipboardData?.setData("text", this.#deletedTextForClipboard());
+				else this.#writeSelectionClipboardData(e.clipboardData, this.#getSelectionText(), this.#getSelectionClipboardTexts());
 			}),
 			addEventListener(contentEl, "cut", (e) => {
 				if (!targetIsContentElement(e)) return;
 				e.preventDefault();
-				e.clipboardData?.setData("text", this.#isDeletedTextSelectionActive() ? this.#deletedTextForClipboard() : this.#cutSelectionText());
+				if (this.#isDeletedTextSelectionActive()) e.clipboardData?.setData("text", this.#deletedTextForClipboard());
+				else {
+					const selectionTexts = this.#getSelectionClipboardTexts();
+					this.#writeSelectionClipboardData(e.clipboardData, this.#cutSelectionText(), selectionTexts);
+				}
 			}),
 			addEventListener(contentEl, "paste", (e) => {
 				if (!targetIsContentElement(e)) return;
 				e.preventDefault();
-				const text = e.clipboardData?.getData("text");
+				const clipboardData = e.clipboardData;
 				const textDocument = this.#textDocument;
-				if (text !== void 0 && textDocument !== void 0) this.#replaceSelectionText(textDocument.normalizeEol(text), void 0, true);
+				if (clipboardData === null || textDocument === void 0) return;
+				let text = clipboardData.getData("text");
+				const selectionCount = this.#selections?.length ?? 0;
+				if (selectionCount > 1) {
+					const multiSelectionText = clipboardData.getData(MULTI_SELECTION_CLIPBOARD_TYPE);
+					if (multiSelectionText !== void 0) try {
+						const selectionTexts = JSON.parse(multiSelectionText);
+						if (Array.isArray(selectionTexts) && selectionTexts.length === selectionCount) text = selectionTexts;
+					} catch {}
+				}
+				this.#replaceSelectionText(Array.isArray(text) ? text.map((t) => textDocument.normalizeEol(t)) : textDocument.normalizeEol(text), void 0, true, "document");
 			}),
 			addEventListener(contentEl, "beforeinput", (e) => {
 				if (!targetIsContentElement(e)) return;
@@ -652,9 +979,20 @@ var Editor = class {
 		];
 		const deletionsCode = this.#fileContainer?.shadowRoot?.querySelector("[data-deletions]");
 		if (deletionsCode != null) this.#editorEventDisposes.push(addEventListener(deletionsCode, "pointerdown", (e) => {
-			const target = e.composedPath()[0];
+			const path = e.composedPath();
+			if (isGutterUtilityPath(path)) {
+				this.#preserveEditorSelectionsForGutterGesture();
+				return;
+			}
+			const target = path[0];
 			const gutterRow = target instanceof HTMLElement ? target.closest("[data-column-number]") : null;
-			if (gutterRow instanceof HTMLElement && this.#beginDeletionGutterSelection(gutterRow, deletionsCode, e.pointerType === "mouse")) return;
+			if (gutterRow instanceof HTMLElement) {
+				if (this.#isLineSelectionEnabled()) {
+					this.#preserveEditorSelectionsForGutterGesture();
+					return;
+				}
+				if (this.#beginDeletionGutterSelection(gutterRow, deletionsCode, e.pointerType === "mouse")) return;
+			}
 			this.#setDeletedTextSelectionActive(true);
 			if (this.#selections !== void 0) this.#updateSelections([]);
 		}, { passive: true }));
@@ -673,7 +1011,16 @@ var Editor = class {
 				return lineNumber - 1;
 			};
 			this.#editorEventDisposes.push(addEventListener(gutterEl, "pointerdown", (e) => {
-				const gutterRow = resolveGutterTarget(e.composedPath()[0]);
+				const path = e.composedPath();
+				if (isGutterUtilityPath(path)) {
+					this.#preserveEditorSelectionsForGutterGesture();
+					return;
+				}
+				const gutterRow = resolveGutterTarget(path[0]);
+				if (gutterRow !== void 0 && this.#isLineSelectionEnabled()) {
+					this.#preserveEditorSelectionsForGutterGesture();
+					return;
+				}
 				if (gutterRow?.dataset.lineType === "change-deletion") {
 					const code = gutterRow.closest("[data-code]");
 					if (code != null) this.#beginDeletionGutterSelection(gutterRow, code, e.pointerType === "mouse");
@@ -683,7 +1030,8 @@ var Editor = class {
 				const textDocument = this.#textDocument;
 				const lineIndex = resolveEditableLine(gutterRow);
 				if (lineIndex === void 0 || textDocument === void 0) return;
-				this.#markerRenderer?.removePopup();
+				this.#canMountSelectionAction = true;
+				this.#markerRenderer?.removePopover();
 				const selection = this.#spanLineSelection(lineIndex, lineIndex, textDocument);
 				this.#isGutterMouseDown = true;
 				this.#selectionStart = selection;
@@ -713,8 +1061,17 @@ var Editor = class {
 	#handleCustomPasteEvent = async () => {
 		const clipboard = this.#options.clipboard;
 		if (clipboard !== void 0) {
-			const text = await clipboard.readText();
-			this.#replaceSelectionText(text, void 0, true);
+			let text = await clipboard.readText();
+			const selectionCount = this.#selections?.length ?? 0;
+			if (selectionCount > 1) {
+				const multiSelectionText = await clipboard.readText(MULTI_SELECTION_CLIPBOARD_TYPE);
+				try {
+					const selectionTexts = JSON.parse(multiSelectionText);
+					if (Array.isArray(selectionTexts) && selectionTexts.length === selectionCount) text = selectionTexts;
+				} catch {}
+			}
+			const textDocument = this.#textDocument;
+			if (textDocument !== void 0) this.#replaceSelectionText(Array.isArray(text) ? text.map((t) => textDocument.normalizeEol(t)) : textDocument.normalizeEol(text), void 0, true, "document");
 		}
 	};
 	#computeContentOffset(contentEl) {
@@ -750,9 +1107,11 @@ var Editor = class {
 					this.#updateSelections(expanded);
 					this.focus();
 				} else {
-					const nextMatch = findNexMatch(textDocument, selections);
+					const nextMatch = findNextMatch(textDocument, selections);
 					if (nextMatch !== void 0) {
 						this.#updateSelections(nextMatch);
+						const primaryMatch = nextMatch.at(-1);
+						if (primaryMatch !== void 0) this.#revealLineIfCollapsed(getCaretPosition(primaryMatch).line);
 						this.#scrollToPrimaryCaret();
 					}
 				}
@@ -762,18 +1121,74 @@ var Editor = class {
 			case "moveLineDown":
 				this.#moveSelectedLines(command === "moveLineUp" ? -1 : 1);
 				break;
+			case "copyLineUp":
+			case "copyLineDown":
+				this.#copySelectedLines(command === "copyLineUp" ? -1 : 1);
+				break;
+			case "simplifySelection": {
+				const selections = this.#selections;
+				const primarySelection = selections?.at(-1);
+				if (selections === void 0 || primarySelection === void 0) break;
+				if (selections.length > 1) {
+					this.#updateSelections([primarySelection]);
+					this.#focus(getCaretPosition(primarySelection));
+				} else if (!isCollapsedSelection(primarySelection)) {
+					const caret = getCaretPosition(primarySelection);
+					this.#updateSelections([{
+						start: caret,
+						end: caret,
+						direction: 0
+					}]);
+					this.#focus(caret);
+				}
+				break;
+			}
+			case "insertBlankLine":
+				this.#insertBlankLine();
+				break;
+			case "deleteHardLineForward":
+				this.#deleteHardLineForward();
+				break;
+			case "toggleComment":
+			case "toggleBlockComment": {
+				const selections = this.#selections;
+				if (selections === void 0) break;
+				const { lineComment, blockComment } = resolveCommentConfig(textDocument.languageId, this.#options.languageCommentConfig);
+				if (command === "toggleComment" && lineComment !== null) {
+					this.#applyCommandEdits(resolveLineCommentEdits(textDocument, selections, lineComment));
+					break;
+				}
+				const linewise = command === "toggleComment";
+				const result = resolveBlockCommentEdits(textDocument, selections, blockComment, linewise);
+				if (result !== void 0) this.#applyCommandEdits(result.edits, linewise ? void 0 : (document) => result.nextSelectionOffsets.map(([start, end, direction]) => ({
+					start: document.positionAt(start),
+					end: document.positionAt(end),
+					direction
+				})));
+				break;
+			}
 			case "indent":
 			case "outdent":
+			case "indentLess":
+			case "indentMore":
 				if (this.#selections !== void 0) {
 					const edits = [];
 					const nextSelections = [];
+					const editedLines = /* @__PURE__ */ new Set();
 					const sameLineIndents = [];
 					for (const selection of this.#selections) {
 						const startLine = selection.start.line;
-						const outdent = command === "outdent";
-						if (startLine !== selection.end.line || outdent) {
+						const outdent = command === "outdent" || command === "indentLess";
+						const lineBased = command === "indentLess" || command === "indentMore";
+						if (startLine !== selection.end.line || outdent || lineBased) {
 							const ret = resolveIndentEdits(textDocument, selection, this.#metrics.tabSize, outdent);
-							edits.push(...ret[0]);
+							for (const edit of ret[0]) {
+								const line = edit.range.start.line;
+								if (!editedLines.has(line)) {
+									editedLines.add(line);
+									edits.push(edit);
+								}
+							}
 							nextSelections.push(ret[1]);
 						} else {
 							const text = textDocument.charAt({
@@ -825,17 +1240,19 @@ var Editor = class {
 				const fullSelection = getDocumentFullSelection(textDocument);
 				this.#updateSelections([fullSelection]);
 				this.focus();
-				const renderedLines = this.#getRenderedEditableLineRange();
-				if (renderedLines !== void 0) {
+				const renderedLineRanges = this.#getRenderedEditableLineRanges();
+				const firstRenderedLine = renderedLineRanges[0]?.[0];
+				const lastRenderedLine = renderedLineRanges.at(-1)?.[1];
+				if (firstRenderedLine !== void 0 && lastRenderedLine !== void 0) {
 					this.#suppressNativeSelectionSync = true;
 					this.#setWindowSelection({
 						start: {
-							line: renderedLines.first,
+							line: firstRenderedLine,
 							character: 0
 						},
 						end: {
-							line: renderedLines.last,
-							character: textDocument.getLineLength(renderedLines.last)
+							line: lastRenderedLine,
+							character: textDocument.getLineLength(lastRenderedLine)
 						},
 						direction: 1
 					});
@@ -845,8 +1262,9 @@ var Editor = class {
 			case "moveCursorToDocStart":
 			case "moveCursorToDocEnd":
 				{
-					const atEnd = command === "moveCursorToDocEnd";
-					this.#updateSelections([getDocumentBoundarySelection(textDocument, atEnd, this.#isDiff)]);
+					const boundarySelection = getDocumentBoundarySelection(textDocument, command === "moveCursorToDocEnd", this.#isDiff);
+					this.#updateSelections([boundarySelection]);
+					this.#revealLineIfCollapsed(getCaretPosition(boundarySelection).line);
 					this.#scrollToPrimaryCaret();
 				}
 				break;
@@ -856,25 +1274,191 @@ var Editor = class {
 					const atEnd = command === "expandSelectionDocEnd";
 					const selections = this.#selections;
 					if (selections !== void 0) {
-						this.#updateSelections(extendSelections(selections, getDocumentBoundarySelection(textDocument, atEnd, this.#isDiff)));
+						const boundarySelection = getDocumentBoundarySelection(textDocument, atEnd, this.#isDiff);
+						this.#updateSelections(extendSelections(selections, boundarySelection));
+						this.#revealLineIfCollapsed(getCaretPosition(boundarySelection).line);
 						this.#scrollToPrimaryCaret();
 					}
 				}
 				break;
 			case "undo":
-				if (this.#textDocument?.canUndo === true) {
-					const undoResult = this.#textDocument.undo();
-					if (undoResult !== void 0) this.#applyChange(...undoResult);
-				}
-				break;
 			case "redo":
-				if (this.#textDocument?.canRedo === true) {
-					const redoResult = this.#textDocument.redo();
-					if (redoResult !== void 0) this.#applyChange(...redoResult);
-				}
+				this.#applyHistoryChange(command);
 				break;
 		}
 	}
+	#applyHistoryChange(command) {
+		const textDocument = this.#textDocument;
+		if (textDocument === void 0) return;
+		if (command === "undo" && !textDocument.canUndo || command === "redo" && !textDocument.canRedo) return;
+		const selections = this.#selections;
+		const selectionOffsets = selections?.map((selection) => [textDocument.offsetAt(selection.start), textDocument.offsetAt(selection.end)]);
+		const result = command === "undo" ? textDocument.undo() : textDocument.redo();
+		if (result === void 0) return;
+		const [change, recordedSelections, lineAnnotations, selectionEdits] = result;
+		const nextSelections = recordedSelections ?? (selections !== void 0 && selectionOffsets !== void 0 && selectionEdits !== void 0 ? remapSelectionsAfterEdits(textDocument, selections, selectionOffsets, selectionEdits) : void 0);
+		this.#applyChange(change, nextSelections, lineAnnotations);
+	}
+	/** Applies one undoable command batch and records its resulting selections. */
+	#applyCommandEdits(edits, resolveNextSelections) {
+		const textDocument = this.#textDocument;
+		const selections = this.#selections;
+		if (textDocument === void 0 || selections === void 0) return;
+		const remapSelections = resolveNextSelections === void 0;
+		const selectionOffsets = remapSelections ? selections.map((selection) => [textDocument.offsetAt(selection.start), textDocument.offsetAt(selection.end)]) : void 0;
+		const resolvedEdits = remapSelections ? edits.map((edit) => {
+			const start = textDocument.offsetAt(edit.range.start);
+			const end = textDocument.offsetAt(edit.range.end);
+			return {
+				start: Math.min(start, end),
+				end: Math.max(start, end),
+				text: edit.newText
+			};
+		}).sort((a, b) => {
+			const startOrder = a.start - b.start;
+			return startOrder !== 0 ? startOrder : a.end - b.end;
+		}) : void 0;
+		const change = textDocument.applyEdits(edits, true, selections, void 0, true);
+		if (change === void 0) return;
+		const nextSelections = remapSelections ? remapSelectionsAfterEdits(textDocument, selections, selectionOffsets, resolvedEdits) : resolveNextSelections(textDocument);
+		textDocument.setLastUndoSelectionsAfter(nextSelections);
+		this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
+	}
+	/** Copies selected line blocks and keeps the selection in the requested copy. */
+	#copySelectedLines(direction) {
+		const textDocument = this.#textDocument;
+		const selections = this.#selections;
+		if (textDocument === void 0 || selections === void 0) return;
+		const blocks = getSelectedLineBlocks(selections);
+		if (blocks.length === 0) return;
+		const copiedLinesBefore = [];
+		let copiedLineCount = 0;
+		const edits = [];
+		for (const block of blocks) {
+			copiedLinesBefore.push(copiedLineCount);
+			const blockLineCount = block.endLine - block.startLine + 1;
+			copiedLineCount += blockLineCount;
+			const text = textDocument.getText({
+				start: {
+					line: block.startLine,
+					character: 0
+				},
+				end: {
+					line: block.endLine,
+					character: textDocument.getLineLength(block.endLine)
+				}
+			});
+			if (direction > 0) {
+				const position = {
+					line: block.startLine,
+					character: 0
+				};
+				edits.push({
+					range: {
+						start: position,
+						end: position
+					},
+					newText: text + textDocument.eol
+				});
+			} else if (block.endLine < textDocument.lineCount - 1) {
+				const position = {
+					line: block.endLine + 1,
+					character: 0
+				};
+				edits.push({
+					range: {
+						start: position,
+						end: position
+					},
+					newText: text + textDocument.eol
+				});
+			} else {
+				const position = {
+					line: block.endLine,
+					character: textDocument.getLineLength(block.endLine)
+				};
+				edits.push({
+					range: {
+						start: position,
+						end: position
+					},
+					newText: textDocument.eol + text
+				});
+			}
+		}
+		const nextSelections = selections.map((selection) => {
+			const line = selection.start.line;
+			let low = 0;
+			let high = blocks.length - 1;
+			while (low <= high) {
+				const middle = low + high >>> 1;
+				const block = blocks[middle];
+				if (line < block.startLine) high = middle - 1;
+				else if (line > block.endLine) low = middle + 1;
+				else {
+					low = middle;
+					break;
+				}
+			}
+			const blockIndex = Math.max(0, low <= high ? low : high);
+			const block = blocks[blockIndex];
+			const shift = copiedLinesBefore[blockIndex] + (direction > 0 ? block.endLine - block.startLine + 1 : 0);
+			return {
+				start: {
+					...selection.start,
+					line: selection.start.line + shift
+				},
+				end: {
+					...selection.end,
+					line: selection.end.line + shift
+				},
+				direction: selection.direction
+			};
+		});
+		this.#applyCommandEdits(edits, () => nextSelections);
+	}
+	/** Inserts an indented blank line after each selection's final line. */
+	#insertBlankLine() {
+		const textDocument = this.#textDocument;
+		const selections = this.#selections;
+		if (textDocument === void 0 || selections === void 0) return;
+		const selectionLines = selections.map((selection) => getCaretPosition(selection).line);
+		const targetLines = Array.from(new Set(selectionLines)).sort((a, b) => a - b);
+		const targetIndex = /* @__PURE__ */ new Map();
+		const indents = /* @__PURE__ */ new Map();
+		const edits = [];
+		for (let index = 0; index < targetLines.length; index++) {
+			const line = targetLines[index];
+			const lineText = textDocument.getLineText(line);
+			const indent = /^\s*/.exec(lineText)?.[0] ?? "";
+			targetIndex.set(line, index);
+			indents.set(line, indent);
+			const position = {
+				line,
+				character: textDocument.getLineLength(line)
+			};
+			edits.push({
+				range: {
+					start: position,
+					end: position
+				},
+				newText: textDocument.eol + indent
+			});
+		}
+		const nextSelections = selections.map((_, index) => {
+			const line = selectionLines[index];
+			const position = {
+				line: line + 1 + targetIndex.get(line),
+				character: indents.get(line).length
+			};
+			return {
+				start: position,
+				end: position,
+				direction: 0
+			};
+		});
+		this.#applyCommandEdits(edits, () => nextSelections);
+	}
 	#moveSelectedLines(direction) {
 		const textDocument = this.#textDocument;
 		const selections = this.#selections;
@@ -943,15 +1527,15 @@ var Editor = class {
 		this.#lineElementsCache.clear();
 		this.#lastAccessedCharX = void 0;
 		this.#metrics.clearTextWidthCache();
-		if (contentWidthChanged && (this.#isWrap || lineAnnotations > 0)) {
-			this.#lineYCache.clear();
+		if (contentWidthChanged) {
 			this.#wrapLineOffsetsCache.clear();
+			if (this.#isWrap || lineAnnotations > 0) this.#lineYCache.clear();
 		}
 		if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) {
 			this.#updateSelections(this.#selections ?? []);
-			if (this.#selections !== void 0) this.focus();
+			if (this.#selections !== void 0 && this.#contentHasFocus) this.focus();
 		}
-		this.#markerRenderer?.removePopup();
+		this.#markerRenderer?.removePopover();
 		this.#computeContentOffset(this.#contentElement);
 	};
 	#remeasureMetricsOnFontLoad() {
@@ -964,8 +1548,9 @@ var Editor = class {
 			this.#gutterWidthCache = void 0;
 			this.#contentWidthCache = void 0;
 			this.#resetCache();
+			this.#wrapLineOffsetsCache.clear();
 			if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) this.#updateSelections(this.#selections ?? []);
-			this.#markerRenderer?.removePopup();
+			this.#markerRenderer?.removePopover();
 		});
 	}
 	#rerender(change, newLineAnnotations, renderRange = this.#renderRange, shouldUpdateBuffer) {
@@ -981,45 +1566,57 @@ var Editor = class {
 		const t2 = performance.now();
 		if (dirtyLines.size > 0) {
 			const children = contentEl.children;
-			const dirtyLineIndexes = new Set(dirtyLines.keys());
-			const startingLine = renderRange?.startingLine ?? 0;
-			for (let i = change.startLine - startingLine; i < children.length; i++) {
+			const dirtyLineIndexes = /* @__PURE__ */ new Set();
+			for (const lineIndex of dirtyLines.keys()) if (this.#isLineRenderable(lineIndex)) dirtyLineIndexes.add(lineIndex);
+			for (let i = 0; i < children.length; i++) {
 				const child = children[i];
 				if (child !== void 0) {
 					const lineNumber = getLineNumberAttr(child);
 					const lineType = child.dataset.lineType;
 					if (lineNumber === void 0 || lineType === "change-deletion") continue;
 					const lineIndex = lineNumber - 1;
-					if (dirtyLines.has(lineIndex)) {
+					if (dirtyLineIndexes.has(lineIndex)) {
 						const tokens = dirtyLines.get(lineIndex);
-						child.replaceChildren(...renderLineTokens(tokens, tokenizer.themeType));
+						child.replaceChildren(...renderLineTokens(tokens));
 						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);
-				h("div", {
-					dataset: {
-						line: lineNumber,
-						lineType: "context",
-						lineIndex: lineIndex.toString()
-					},
-					children: renderLineTokens(tokens, tokenizer.themeType)
-				}, contentEl);
-				if (gutterEl !== void 0) h("div", {
-					dataset: {
-						lineType: "context",
-						columnNumber: lineNumber,
-						lineIndex: lineIndex.toString()
-					},
-					children: [h("span", {
-						dataset: { lineNumberContent: "" },
-						textContent: lineNumber
-					})]
-				}, gutterEl);
+			if (dirtyLineIndexes.size > 0) {
+				let lastRenderedLineNumber = 0;
+				for (let i = children.length - 1; i >= 0; i--) {
+					const child = children[i];
+					const lineNumber = getLineNumberAttr(child);
+					if (lineNumber !== void 0 && child.dataset.lineType !== "change-deletion") {
+						lastRenderedLineNumber = lineNumber;
+						break;
+					}
+				}
+				for (const lineIndex of dirtyLineIndexes) {
+					if (lineIndex < lastRenderedLineNumber) continue;
+					const tokens = dirtyLines.get(lineIndex);
+					const lineNumber = String(lineIndex + 1);
+					h("div", {
+						dataset: {
+							line: lineNumber,
+							lineType: "context",
+							lineIndex: lineIndex.toString()
+						},
+						children: renderLineTokens(tokens)
+					}, contentEl);
+					if (gutterEl !== void 0) h("div", {
+						dataset: {
+							lineType: "context",
+							columnNumber: lineNumber,
+							lineIndex: lineIndex.toString()
+						},
+						children: [h("span", {
+							dataset: { lineNumberContent: "" },
+							textContent: lineNumber
+						})]
+					}, gutterEl);
+				}
 			}
 		}
 		if (change.lineDelta < 0) for (const children of [contentEl.children, gutterEl?.children ?? []]) for (let i = children.length - 1; i >= 0; i--) {
@@ -1040,9 +1637,9 @@ var Editor = class {
 			contentEl.style.gridRow = "span " + gridRow;
 			if (gutterEl !== void 0) gutterEl.style.gridRow = "span " + gridRow;
 		}
-		fileInstance.updateRenderCache(dirtyLines, tokenizer.themeType, !didLineCountChange);
+		fileInstance.updateRenderCache(dirtyLines, tokenizer.themeType, !didLineCountChange, didLineCountChange);
 		if (didLineCountChange) fileInstance.applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer);
-		if (this.#isDiff && (this.#diffSyle === "unified" || didLineCountChange)) this.#resetCache();
+		if (didLineCountChange || this.#isDiff && this.#diffSyle === "unified") this.#resetCache();
 		if (newLineAnnotations !== void 0) {
 			this.#lineAnnotations = newLineAnnotations;
 			renderLineAnnotations(newLineAnnotations, contentEl, gutterEl);
@@ -1062,7 +1659,7 @@ var Editor = class {
 			case "insertCompositionText": break;
 			case "insertLineBreak":
 			case "insertParagraph":
-				this.#replaceSelectionText("\n");
+				this.#replaceSelectionText(this.#textDocument?.eol ?? "\n");
 				break;
 			case "deleteContentBackward":
 				this.#deleteSelectionText();
@@ -1074,9 +1671,6 @@ var Editor = class {
 			case "deleteHardLineBackward":
 				this.#deleteSoftLineBackward();
 				break;
-			case "deleteHardLineForward":
-				this.#deleteHardLineForward();
-				break;
 			case "deleteWordBackward":
 				this.#deleteWordBackward();
 				break;
@@ -1088,7 +1682,7 @@ var Editor = class {
 				break;
 		}
 	}
-	#focus(position, preventScroll = true) {
+	#focus(position, preventScroll = true, shouldFocus) {
 		this.#contentHasFocus = true;
 		if (position !== void 0) {
 			this.#shouldIgnoreSelectionChange = true;
@@ -1097,13 +1691,115 @@ var Editor = class {
 				end: position,
 				direction: 0
 			});
-			requestAnimationFrame(() => {
+			queueRender(() => {
+				if (shouldFocus?.() === false) {
+					this.#shouldIgnoreSelectionChange = false;
+					return;
+				}
 				this.#contentElement?.focus({ preventScroll });
-				requestAnimationFrame(() => {
+				queueRender(() => {
 					this.#shouldIgnoreSelectionChange = false;
 				});
 			});
-		} else this.#contentElement?.focus({ preventScroll });
+		} else if (shouldFocus?.() !== false) this.#contentElement?.focus({ preventScroll });
+		else this.#contentHasFocus = false;
+	}
+	#restoreReplacementFocus(position) {
+		const request = this.#replacementFocusRequest;
+		if (request == null) return;
+		if (this.#retainSearchPanelFocus) {
+			this.#replacementFocusRequest = void 0;
+			this.#contentHasFocus = false;
+			this.#shouldIgnoreSelectionChange = false;
+			return;
+		}
+		const contentElement = this.#contentElement;
+		if (contentElement == null || !this.#replacementFocusIsAvailable(contentElement)) {
+			this.#replacementFocusRequest = void 0;
+			this.#contentHasFocus = false;
+			return;
+		}
+		const shouldFocus = () => {
+			if (this.#replacementFocusRequest !== request) return false;
+			const shouldRestore = this.#replacementFocusIsAvailable(contentElement);
+			this.#replacementFocusRequest = void 0;
+			return shouldRestore;
+		};
+		if (position != null) {
+			this.#focus(position, true, shouldFocus);
+			return;
+		}
+		const primarySelection = this.#selections?.at(-1);
+		if (primarySelection == null) {
+			this.#focus(void 0, true, shouldFocus);
+			return;
+		}
+		const primaryPosition = primarySelection.direction === -1 ? primarySelection.end : primarySelection.start;
+		this.#focus(primaryPosition, true, shouldFocus);
+	}
+	#replacementFocusIsAvailable(contentElement) {
+		const fileContainer = this.#fileContainer;
+		const shadowRoot = fileContainer?.shadowRoot;
+		if (fileContainer == null || shadowRoot == null || this.#contentElement !== contentElement || !shadowRoot.contains(contentElement)) return false;
+		const { activeElement: shadowActiveElement } = shadowRoot;
+		if (shadowActiveElement === contentElement || shadowActiveElement != null && contentElement.contains(shadowActiveElement)) return true;
+		if (shadowActiveElement != null) return false;
+		const { ownerDocument } = fileContainer;
+		const { activeElement } = ownerDocument;
+		return activeElement == null || activeElement === ownerDocument.body || activeElement === ownerDocument.documentElement || activeElement === fileContainer;
+	}
+	#getFirstVisibleLineNumber(offset = 0) {
+		const contentElement = this.#contentElement;
+		const fileContainer = this.#fileContainer;
+		if (this.#textDocument == null || contentElement == null || fileContainer == null) return;
+		const viewport = this.#fileInstance?.getEditorViewport?.() ?? this.#getDefaultEditorViewport(fileContainer);
+		let viewportTop;
+		let viewportBottom;
+		if (viewport instanceof HTMLElement) {
+			const viewportRect = viewport.getBoundingClientRect();
+			viewportTop = viewportRect.top;
+			viewportBottom = viewportRect.bottom;
+		} else {
+			const viewportWindow = viewport.defaultView;
+			if (viewportWindow == null) return;
+			viewportTop = 0;
+			viewportBottom = viewportWindow.innerHeight;
+		}
+		const stickyHeader = fileContainer.shadowRoot?.querySelector("[data-diffs-header][data-sticky]");
+		if (stickyHeader != null) viewportTop = Math.max(viewportTop, stickyHeader.getBoundingClientRect().bottom);
+		if (Number.isFinite(offset)) viewportTop += Math.max(0, offset);
+		if (viewportBottom <= viewportTop) return;
+		for (const child of contentElement.children) {
+			const row = child;
+			const lineNumber = getLineNumberAttr(row);
+			const lineType = row.dataset.lineType;
+			if (lineNumber == null || lineType == null || !isLineEditable(lineType)) continue;
+			const rowRect = row.getBoundingClientRect();
+			if (rowRect.bottom <= rowRect.top) continue;
+			if (rowRect.top >= viewportTop && rowRect.top < viewportBottom) return lineNumber;
+		}
+	}
+	#getDefaultEditorViewport(fileContainer) {
+		const ownerDocument = fileContainer.ownerDocument;
+		let element = fileContainer.parentElement;
+		while (element != null && element !== ownerDocument.body && element !== ownerDocument.documentElement) {
+			const overflowY = element.ownerDocument.defaultView?.getComputedStyle(element).overflowY;
+			if (overflowY === "auto" || overflowY === "scroll" || overflowY === "overlay") return element;
+			element = element.parentElement;
+		}
+		return ownerDocument;
+	}
+	#focusAtPosition(position, preventScroll) {
+		const selection = {
+			start: position,
+			end: position,
+			direction: 0
+		};
+		this.#canMountSelectionAction = false;
+		this.#updateSelections([selection]);
+		this.#revealLineIfCollapsed(position.line);
+		if (preventScroll) this.#focus(position, true);
+		else this.#scrollToPrimaryCaret();
 	}
 	#setWindowSelection(selection) {
 		const winSelection = window.getSelection();
@@ -1136,7 +1832,11 @@ var Editor = class {
 				block: scrollPosition,
 				inline: "nearest"
 			});
-			if (!noFocus) this.#focus(primarySelection.direction === -1 ? primarySelection.end : primarySelection.start);
+			if (!noFocus) {
+				const position = primarySelection.direction === -1 ? primarySelection.end : primarySelection.start;
+				if (this.#replacementFocusRequest !== void 0) this.#restoreReplacementFocus(position);
+				else this.#focus(position);
+			}
 		} else {
 			const pos = getCaretPosition(primarySelection);
 			this.#scrollToLine(pos.line, pos.character, noFocus);
@@ -1166,10 +1866,14 @@ var Editor = class {
 				block: "center",
 				inline: "nearest"
 			});
-			if (!noFocus) this.#focus({
-				line,
-				character: char
-			});
+			if (!noFocus) {
+				const position = {
+					line,
+					character: char
+				};
+				if (this.#replacementFocusRequest !== void 0) this.#restoreReplacementFocus(position);
+				else this.#focus(position);
+			}
 			this.#scrollingToLine = void 0;
 			this.#scrollingToLineChar = void 0;
 			this.#scrollingToLineFixed = false;
@@ -1183,7 +1887,7 @@ var Editor = class {
 					block: "center",
 					inline: "nearest"
 				});
-				if (modelLinePosition.height > 0) {
+				if (modelLinePosition.height > 0 && this.#isLineRenderable(line)) {
 					this.#scrollingToLine = line;
 					this.#scrollingToLineChar = char;
 					this.#scrollingToLineNoFocus = noFocus;
@@ -1210,7 +1914,7 @@ var Editor = class {
 					block: "center",
 					inline: "nearest"
 				});
-				if (this.#scrollingToLine === line && (yFix === 0 || this.#scrollingToLineFixed)) {
+				if (this.#scrollingToLine === line && (yFix === 0 || this.#scrollingToLineFixed) || !this.#isLineRenderable(line)) {
 					this.#scrollingToLine = void 0;
 					this.#scrollingToLineChar = void 0;
 					this.#scrollingToLineFixed = false;
@@ -1264,7 +1968,7 @@ var Editor = class {
 		}
 		this.#setDeletedTextSelectionActive(true);
 		this.#updateSelections([]);
-		[...deletionsCode.querySelectorAll("[data-gutter] > [data-column-number]")][focusIndex]?.setAttribute("data-selected-line", "single");
+		this.#setEditorActiveLineSafe(getLineNumberAttr(focusContent) ?? null, true, "deletions");
 		const lo = Math.min(anchorIndex, focusIndex);
 		const hi = Math.max(anchorIndex, focusIndex);
 		this.#deletedSelectionText = lo < 0 ? "" : rows.slice(lo, hi + 1).filter((row) => row.getAttribute("data-line-type") === "change-deletion").map((row) => row.textContent ?? "").join("\n");
@@ -1302,19 +2006,18 @@ var Editor = class {
 		if (pre == null) return;
 		if (active) {
 			pre.setAttribute("data-deleted-text-selection", "");
-			for (const highlighted of pre.querySelectorAll("[data-selected-line]")) highlighted.removeAttribute("data-selected-line");
+			this.#setEditorActiveLineSafe(null);
 			this.#deletedSelectionText = "";
 		} else {
 			pre.removeAttribute("data-deleted-text-selection");
 			this.#deletedSelectionText = "";
 		}
 	}
-	#setSelectedLinesSafe(range, lineNumberOnly = false) {
+	#setEditorActiveLineSafe(lineNumber, lineNumberOnly = false, side = "additions") {
 		try {
-			this.#fileInstance?.setSelectedLines(range, {
-				notify: false,
-				activeLineSide: "additions",
-				lineNumberOnly
+			this.#fileInstance?.setEditorActiveLine(lineNumber, {
+				lineNumberOnly,
+				side
 			});
 		} catch {}
 	}
@@ -1328,7 +2031,7 @@ var Editor = class {
 	#updateSelections(selections) {
 		this.__postponeBgTokenizeToNextFrame();
 		this.#primaryCaretElement = void 0;
-		this.#setSelectedLinesSafe(null);
+		this.#setEditorActiveLineSafe(null);
 		if (selections.length === 0 && this.#matches === void 0 && this.#markerRenderer === void 0) {
 			this.#selections = void 0;
 			this.#overlayElements?.forEach((el) => el.remove());
@@ -1348,10 +2051,7 @@ var Editor = class {
 			this.#selections = normalizedSelections;
 			const hasNonEmptySelection = normalizedSelections.some((selection) => !isCollapsedSelection(selection));
 			const caretLine = getCaretPosition(primarySelection).line + 1;
-			this.#setSelectedLinesSafe({
-				start: caretLine,
-				end: caretLine
-			}, hasNonEmptySelection);
+			this.#setEditorActiveLineSafe(caretLine, hasNonEmptySelection);
 			for (const selection of normalizedSelections) {
 				if (!isCollapsedSelection(selection)) this.#renderSelection(renderCtx, "selection", selection);
 				this.#renderCaret(renderCtx, selection, selection === primarySelection);
@@ -1361,16 +2061,50 @@ var Editor = class {
 		}
 		const textDocument = this.#textDocument;
 		if (this.#matches !== void 0 && textDocument !== void 0) {
+			const matches = this.#matches;
+			const renderRange = this.#renderRange;
+			const renderedLineRanges = renderRange !== void 0 && Number.isFinite(renderRange.totalLines) || this.#isDiff && this.#fileInstance?.options.expandUnchanged !== true ? this.#getRenderedEditableLineRanges() : 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);
+			let firstMatchIndex = 0;
+			const rangeCount = renderedLineRanges?.length ?? 1;
+			for (let rangeIndex = 0; rangeIndex < rangeCount; rangeIndex++) {
+				let visibleEndOffset = Infinity;
+				const lineRange = renderedLineRanges?.[rangeIndex];
+				if (lineRange !== void 0) {
+					const [firstLine, lastLine] = lineRange;
+					const visibleStartOffset = textDocument.offsetAt({
+						line: firstLine,
+						character: 0
+					});
+					const endLine = lastLine + 1;
+					visibleEndOffset = endLine < textDocument.lineCount ? textDocument.offsetAt({
+						line: endLine,
+						character: 0
+					}) : textDocument.offsetAt({
+						line: endLine - 1,
+						character: textDocument.getLineLength(endLine - 1)
+					});
+					let low = firstMatchIndex;
+					let high = matches.length;
+					while (low < high) {
+						const middle = low + Math.floor((high - low) / 2);
+						if (matches[middle][1] <= visibleStartOffset) low = middle + 1;
+						else high = middle;
+					}
+					firstMatchIndex = low;
+				}
+				for (; firstMatchIndex < matches.length; firstMatchIndex++) {
+					const [startOffset, endOffset] = matches[firstMatchIndex];
+					if (startOffset >= visibleEndOffset) break;
+					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.#markerRenderer !== void 0 && textDocument !== void 0) for (const marker of this.#markerRenderer.markers) this.#renderSelection(renderCtx, "marker", marker, markerSeverityDatasetKey(marker.severity));
@@ -1383,7 +2117,14 @@ var Editor = class {
 	#renderSelection(renderCtx, type, range, extraDataset) {
 		if (this.#textDocument === void 0) return;
 		const { start, end } = range;
-		for (let line = start.line; line <= end.line; line++) {
+		let firstLine = start.line;
+		let endLine = end.line + 1;
+		if (this.#renderRange !== void 0) {
+			const { startingLine, totalLines } = this.#renderRange;
+			firstLine = Math.max(firstLine, startingLine);
+			endLine = Math.min(endLine, startingLine + totalLines);
+		}
+		for (let line = firstLine; line < endLine; line++) {
 			if (!this.#isLineVisible(line)) continue;
 			const isLastLine = line === end.line;
 			const startChar = line === start.line ? start.character : 0;
@@ -1440,8 +2181,10 @@ var Editor = class {
 		const rounded = (this.#options.roundedSelection ?? true) && type === "selection";
 		const addRoundedCorner = (line, wrapLine, left, radius) => {
 			const top = this.#getLineY(line) + wrapLine * lineHeight;
-			const cornerBg = this.#lineBackgroundColor(line);
-			const css = `width:${ch}px;transform:translateX(${left}px) translateY(${top}px);` + (cornerBg !== void 0 ? `--diffs-selection-corner-bg:${cornerBg};` : "");
+			const lineElement = this.#getLineElement(line);
+			let cornerBg = "initial";
+			if (lineElement !== void 0 && (lineElement.dataset.lineType === "change-addition" || lineElement.dataset.selectedLine !== void 0)) cornerBg = getComputedStyle(lineElement).getPropertyValue("--diffs-line-bg");
+			const css = `width:${ch}px;transform:translateX(${left}px) translateY(${top}px);--diffs-selection-corner-bg:${cornerBg}`;
 			const dataset = {
 				selectionCorner: "",
 				[radius]: ""
@@ -1560,13 +2303,14 @@ var Editor = class {
 			return;
 		}
 		if (this.#selectionAction === void 0) {
+			if (!this.#canMountSelectionAction) return;
 			const getActiveSelection = () => this.#selections?.at(-1) ?? primarySelection;
 			const selectionActionElement = renderSelectionAction({
 				textDocument,
 				get selection() {
 					return getActiveSelection();
 				},
-				applyEdits: (edits) => this.applyEdits(edits, true),
+				applyEdits: (edits) => this.applyEdits(edits),
 				getSelectionText: () => this.#textDocument?.getText(getActiveSelection()) ?? "",
 				replaceSelectionText: (text) => {
 					this.#replaceSelectionText(text, [getActiveSelection()]);
@@ -1577,7 +2321,7 @@ var Editor = class {
 				}
 			});
 			this.#selectionAction = new SelectionActionWidget(selectionActionElement, overlayElement, () => this.#updateSelectionActionPopover());
-			this.#getPopoverManager().resetPlacement();
+			this.#getPopoverManager().resetPlacement(SELECTION_ACTION_POPOVER_PLACEMENT_KEY);
 		}
 		const lineHeight = this.#metrics.lineHeight;
 		const isBackward = primarySelection.direction === -1;
@@ -1611,17 +2355,19 @@ var Editor = class {
 		const atDocumentEdge = isBackward ? head.line < 3 : head.line >= lineCount - 3;
 		const canUseFallback = this.#isLineVisible(fallback.anchor.line);
 		const popoverManager = this.#getPopoverManager();
+		const viewport = popoverManager.getPlacementBounds();
 		const useFallback = canUseFallback && popoverManager.choosePlacement({
 			preferred: preferredGeometry,
 			fallback: fallbackGeometry,
-			viewport: popoverManager.getPlacementBounds(),
+			viewport,
 			popoverHeight,
-			atDocumentEdge
+			atDocumentEdge,
+			placementKey: SELECTION_ACTION_POPOVER_PLACEMENT_KEY
 		}) === "fallback";
-		if (!canUseFallback) popoverManager.setPlacement("preferred");
+		if (!canUseFallback) popoverManager.setPlacement("preferred", SELECTION_ACTION_POPOVER_PLACEMENT_KEY);
 		const { placeAbove } = useFallback ? fallback : preferred;
 		const { left, anchorTop } = useFallback ? fallbackGeometry : preferredGeometry;
-		this.#selectionAction.reposition(left, anchorTop, this.#getGutterWidth(), placeAbove);
+		this.#selectionAction.reposition(left, anchorTop, this.#getGutterWidth(), placeAbove, viewport);
 	}
 	#openSearchPanel(mode) {
 		if (this.#searchPanel !== void 0) {
@@ -1653,6 +2399,7 @@ var Editor = class {
 		const scrollToMatch = ([startOffset, endOffset], retainFocus) => {
 			const nextSelection = createSelectionFromAnchorAndFocusOffsets(textDocument, startOffset, endOffset);
 			this.#updateSelections([nextSelection]);
+			this.#revealLineIfCollapsed(getCaretPosition(nextSelection).line);
 			this.#scrollToPrimaryCaret(true);
 			this.#retainSearchPanelFocus = retainFocus;
 		};
@@ -1719,6 +2466,18 @@ var Editor = class {
 		if (textDocument === void 0 || selections === void 0) return "";
 		return getSelectionText(textDocument, selections);
 	}
+	#getSelectionClipboardTexts() {
+		const textDocument = this.#textDocument;
+		const selections = this.#selections;
+		if (textDocument === void 0 || selections === void 0) return [];
+		return getSelectionClipboardTexts(textDocument, selections);
+	}
+	/** Writes both the portable text and the selection pairing metadata. */
+	#writeSelectionClipboardData(clipboardData, text, selectionTexts) {
+		if (clipboardData === null) return;
+		clipboardData.setData("text", text);
+		if (selectionTexts.length > 1) clipboardData.setData(MULTI_SELECTION_CLIPBOARD_TYPE, JSON.stringify(selectionTexts));
+	}
 	#cutSelectionText() {
 		const textDocument = this.#textDocument;
 		const selections = this.#selections;
@@ -1749,15 +2508,15 @@ var Editor = class {
 		textDocument.setLastUndoSelectionsAfter(nextSelections);
 		this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
 	}
-	#replaceSelectionText(text, selections = this.#selections, undoBoundary = false) {
+	#replaceSelectionText(text, selections = this.#selections, undoBoundary = false, textOrder = "selection") {
 		if (selections === void 0) return;
 		const textDocument = this.#textDocument;
 		const primarySelection = selections.at(-1);
 		if (textDocument === void 0 || primarySelection === void 0) return;
-		const { nextSelections, change } = Array.isArray(text) && text.length === selections.length ? applyTextReplaceToSelections(textDocument, selections, text, this.#lineAnnotations, undoBoundary) : applyTextChangeToSelections(textDocument, selections, {
+		const { nextSelections, change } = Array.isArray(text) && text.length === selections.length ? applyTextReplaceToSelections(textDocument, selections, text, this.#lineAnnotations, undoBoundary, textOrder) : applyTextChangeToSelections(textDocument, selections, {
 			start: textDocument.offsetAt(primarySelection.start),
 			end: textDocument.offsetAt(primarySelection.end),
-			text: Array.isArray(text) ? text.join("\n") : text
+			text: Array.isArray(text) ? text.join(textDocument.eol) : text
 		}, this.#lineAnnotations, void 0, undoBoundary);
 		if (change !== void 0) this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
 	}
@@ -1804,26 +2563,16 @@ var Editor = class {
 		const { nextSelections, change } = applyTransposeToSelections(textDocument, selections, this.#lineAnnotations);
 		if (change !== void 0) this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
 	}
-	#getFileRef() {
-		const fileInfo = this.#fileInfo;
-		const textDocument = this.#textDocument;
-		if (fileInfo === void 0 || textDocument === void 0) return;
-		const file = { ...fileInfo };
-		Object.defineProperty(file, "contents", {
-			enumerable: true,
-			get: () => textDocument.getText()
-		});
-		return file;
-	}
 	#applyChange(change, newSelections, newLineAnnotations, options) {
-		const fileRef = this.#getFileRef();
+		const fileRef = this.getFile();
 		const onChange = this.#options.onChange;
 		if (fileRef !== void 0 && onChange !== void 0) onChange(fileRef, newLineAnnotations ?? this.#lineAnnotations);
 		if (change.lineDelta !== 0 || this.#isWrap) {
 			for (const line of this.#lineYCache.keys()) if (line >= change.startLine) this.#lineYCache.delete(line);
 		}
-		if (this.#isWrap) {
-			for (const line of this.#wrapLineOffsetsCache.keys()) if (line >= change.startLine) this.#wrapLineOffsetsCache.delete(line);
+		if (this.#wrapLineOffsetsCache.size > 0) {
+			if (change.lineDelta === 0 && (change.changedLineRanges.length === 1 || change.changedLineChanges?.every(([, , editLineDelta]) => editLineDelta === 0) === true)) for (const [rangeStart, rangeEnd] of change.changedLineRanges) for (let line = rangeStart; line <= rangeEnd; line++) this.#wrapLineOffsetsCache.delete(line);
+			else for (const line of this.#wrapLineOffsetsCache.keys()) if (line >= change.startLine) this.#wrapLineOffsetsCache.delete(line);
 		}
 		this.#lastAccessedCharX = void 0;
 		let renderRange = this.#renderRange;
@@ -1834,7 +2583,7 @@ var Editor = class {
 			if (primarySelection.end.line >= renderRangeEndLine) {
 				const widenedTotalLines = primarySelection.end.line - renderRange.startingLine + 1;
 				const maxWidenLines = this.#viewportWindowLines === void 0 || this.#viewportWindowLines === Infinity ? Infinity : this.#viewportWindowLines * MAX_EDIT_WIDEN_WINDOW_MULTIPLE;
-				if (change.startLine <= renderRangeEndLine && widenedTotalLines <= maxWidenLines) {
+				if (change.startLine <= renderRangeEndLine && widenedTotalLines <= maxWidenLines && this.#isLineRenderable(primarySelection.end.line)) {
 					if (primarySelection.end.line > renderRangeEndLine) shouldUpdateBuffer = true;
 					renderRange = {
 						...renderRange,
@@ -1849,6 +2598,8 @@ var Editor = class {
 		if (newSelections !== void 0) {
 			this.#updateSelections(newSelections);
 			if (options?.skipFocus !== true) {
+				const revealTarget = newSelections.at(-1);
+				if (revealTarget !== void 0) this.#revealLineIfCollapsed(getCaretPosition(revealTarget).line);
 				if (this.#primaryCaretElement !== void 0) requestAnimationFrame(() => {
 					this.#primaryCaretElement?.scrollIntoView({
 						block: "nearest",
@@ -1872,39 +2623,31 @@ var Editor = class {
 			}
 		}
 	}
-	#lineBackgroundColor(line) {
-		const lineElement = this.#getLineElement(line);
-		if (lineElement === void 0) return;
-		if (navigator.userAgent.includes("jsdom")) return;
-		const backgroundColor = getComputedStyle(lineElement, "::after").backgroundColor;
-		return backgroundColor === "" || backgroundColor === "transparent" || backgroundColor === "rgba(0, 0, 0, 0)" ? void 0 : backgroundColor;
-	}
-	#getRenderedEditableLineRange() {
+	#getRenderedEditableLineRanges() {
 		const contentElement = this.#contentElement;
-		if (contentElement === void 0) return;
-		let first;
-		let last;
+		if (contentElement === void 0) return [];
+		const ranges = [];
 		for (const child of contentElement.children) {
 			const el = child;
 			const lineType = el.dataset.lineType;
 			const lineNumber = getLineNumberAttr(el);
 			if (lineNumber === void 0 || lineType === void 0 || !isLineEditable(lineType)) continue;
 			const line = lineNumber - 1;
-			if (first === void 0 || line < first) first = line;
-			if (last === void 0 || line > last) last = line;
+			const current = ranges.at(-1);
+			if (current !== void 0 && line <= current[1] + 1) current[1] = Math.max(current[1], line);
+			else ranges.push([line, line]);
 		}
-		return first === void 0 || last === void 0 ? void 0 : {
-			first,
-			last
-		};
+		return ranges;
 	}
 	#getLineElement(line) {
 		let lineElement = this.#lineElementsCache.get(line);
 		if (lineElement !== void 0) return lineElement ?? void 0;
+		const renderRange = this.#renderRange;
+		if (renderRange !== void 0 && (line < renderRange.startingLine || line >= renderRange.startingLine + renderRange.totalLines)) return;
 		const contentElement = this.#contentElement;
 		if (contentElement === void 0) return;
-		if (this.#renderRange !== void 0) {
-			const { startingLine } = this.#renderRange;
+		if (renderRange !== void 0) {
+			const { startingLine } = renderRange;
 			const { children } = contentElement;
 			for (let i = line - startingLine; i <= children.length; i++) {
 				const child = children[i];
@@ -1995,6 +2738,7 @@ var Editor = class {
 	#wrapLineText(line) {
 		const cachedOffsets = this.#wrapLineOffsetsCache.get(line);
 		if (cachedOffsets !== void 0) return cachedOffsets;
+		if (this.#wrapLineOffsetsCache.size >= MAX_WRAP_OFFSETS_CACHE_LINES) this.#wrapLineOffsetsCache.clear();
 		const lineText = this.#textDocument?.getLineText(line);
 		if (lineText === void 0 || lineText.length === 0) {
 			const offsets = new Uint32Array([0]);
@@ -2024,21 +2768,30 @@ var Editor = class {
 		try {
 			const unicodeOffsets = getUnicodeMeasurementOffsets(lineText);
 			const wrapLineStartLeft = div.getBoundingClientRect().left + this.#metrics.ch;
-			let previousOffset = 0;
-			let lastTop = Number.NEGATIVE_INFINITY;
-			for (let i = 0, offsetIndex = 0; i < lineText.length;) {
-				const nextOffset = unicodeOffsets === void 0 ? i + 1 : unicodeOffsets[offsetIndex + 1];
-				range.setStart(textNode, i);
-				range.setEnd(textNode, nextOffset);
-				const { left, top } = range.getBoundingClientRect();
-				if (top > lastTop) {
-					const startsPastLineStart = isSafari() && starts.length > 0 && left - wrapLineStartLeft > this.#metrics.ch / 2;
-					starts.push(startsPastLineStart ? previousOffset : i);
-					lastTop = top;
+			const graphemeCount = unicodeOffsets === void 0 ? lineText.length : unicodeOffsets.length - 1;
+			const graphemeStart = (index) => unicodeOffsets === void 0 ? index : unicodeOffsets[index];
+			const measureGrapheme = (index) => {
+				range.setStart(textNode, graphemeStart(index));
+				range.setEnd(textNode, graphemeStart(index + 1));
+				return range.getBoundingClientRect();
+			};
+			starts.push(0);
+			let lastTop = measureGrapheme(0).top;
+			let searchStart = 1;
+			while (searchStart < graphemeCount) {
+				let low = searchStart;
+				let high = graphemeCount;
+				while (low < high) {
+					const mid = low + high >> 1;
+					if (measureGrapheme(mid).top > lastTop) high = mid;
+					else low = mid + 1;
 				}
-				previousOffset = i;
-				i = nextOffset;
-				offsetIndex++;
+				if (low >= graphemeCount) break;
+				const { left, top } = measureGrapheme(low);
+				const startsPastLineStart = isSafari() && left - wrapLineStartLeft > this.#metrics.ch / 2;
+				starts.push(graphemeStart(startsPastLineStart ? low - 1 : low));
+				lastTop = top;
+				searchStart = low + 1;
 			}
 			const offsets = new Uint32Array(starts.length + 1);
 			for (let i = 0; i < starts.length; i++) offsets[i] = starts[i];