@pierre/diffs 1.3.6 → 1.4.0

package/dist/editor/editor.js

@@ -1,23 +1,27 @@
 import { dequeueRender, queueRender } from "../managers/UniversalRenderingManager.js";
 import { isGutterUtilityPath } from "../utils/isGutterUtilityPath.js";
+import { computeLineOffsets } from "../utils/computeFileOffsets.js";
 import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { isSafari } from "../utils/platform.js";
+import { EditStack } from "./editStack.js";
+import { getTextDocumentChangeTransaction } from "./textDocumentChangeTransaction.js";
+import { TextDocument } from "./textDocument.js";
+import { EditStateManager, cloneEditorViewState, toManagedEditState } from "./EditStateManager.js";
 import { isMoveCursorShortcut, isPrimaryModifier } from "./platform.js";
 import { resolveEditorCommandFromKeyboardEvent, resolveFindAgainShortcut } from "./command.js";
+import { cloneRetainedDiffSessionSnapshot } from "./cloneRetainedDiffSessionSnapshot.js";
 import editor_default from "./editor2.js";
-import { EditStack } from "./editStack.js";
+import { buildEditPredictionRequest, matchesEditPredictionPattern, recordEditPrediction } from "./editPrediction.js";
 import { resolveBlockCommentEdits, resolveCommentConfig, resolveLineCommentEdits } from "./languages.js";
 import { addEventListener, clampDomOffset, extend, getLineNumberAttr, h, lookupScrollContainer, 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, findNextMatch, getAutoSurroundReplacementTexts, getCaretPosition, getDocumentBoundarySelection, getDocumentFullSelection, getSelectedLineBlocks, getSelectionAnchor, getSelectionClipboardTexts, getSelectionText, isCollapsedSelection, isLineEditable, mapCursorMove, mapSelectionShift, mergeOverlappingSelections, remapSelectionsAfterEdits, resolveIndentEdits, resolveSelectionCut, selectionIntersects, shiftSelectionLines, snapCharacterToGraphemeBoundary } 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, remapOffsetThroughEdits, remapSelectionsAfterEdits, resolveIndentEdits, resolveSelectionCut, selectionIntersects, shiftSelectionLines, snapCharacterToGraphemeBoundary } 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 "./tokenizer.js";
 //#region src/editor/editor.ts
@@ -33,29 +37,45 @@ function getShadowRootRange(shadowRoot) {
 		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;
+/** Describe replacing the complete document from its previous text. */
+function createFullDocumentChange(previousContents, contents) {
+	const lineOffsets = computeLineOffsets(previousContents);
+	const lastLineOffset = lineOffsets[lineOffsets.length - 1] ?? 0;
+	return {
+		start: 0,
+		end: previousContents.length,
+		text: contents,
+		range: {
+			start: {
+				line: 0,
+				character: 0
+			},
+			end: {
+				line: lineOffsets.length - 1,
+				character: previousContents.length - lastLineOffset
+			}
+		}
+	};
 }
-function isPromise(value) {
-	return typeof value === "object" && value !== null && "then" in value && typeof value.then === "function";
+function isVirtualizedEditorComponent(instance) {
+	return instance != null && "renderType" in instance && instance.renderType === "virtualized";
 }
 const MAX_EDIT_WIDEN_WINDOW_MULTIPLE = 2;
 const MAX_WRAP_OFFSETS_CACHE_LINES = 1e4;
+const EDIT_PREDICTION_DEBOUNCE_MS = 300;
+const MAX_EDIT_PREDICTION_RESPONSE_EDITS = 256;
+const MAX_EDIT_PREDICTION_RESPONSE_BYTES = 128 * 1024;
+const editPredictionTextEncoder = new TextEncoder();
 const SELECTION_ACTION_POPOVER_PLACEMENT_KEY = "selection-action";
 const MULTI_SELECTION_CLIPBOARD_TYPE = "application/vnd.pierre.diffs-selections+json";
 var Editor = class {
+	type;
 	#options;
+	#initialState;
+	#editSession;
 	#metrics = new Metrics();
 	#tokenizer;
 	#popoverManager;
-	#textDocumentCache = /* @__PURE__ */ new Map();
-	#stateStorage;
-	#stateStorageOption;
-	#pendingStateWrites = /* @__PURE__ */ new Map();
-	#pendingStateRestore;
-	#stateRestoreGeneration = 0;
-	#restoreStateOnNextSync = false;
 	#editorEventDisposes;
 	#globalEventDisposes;
 	#selectEventDisposes;
@@ -79,17 +99,25 @@ var Editor = class {
 	#fileContainer;
 	#gutterElement;
 	#contentElement;
+	#deletionsColumn;
 	#overlayElement;
 	#overlayElements;
+	#caretElements;
+	#caretHighlightElements;
 	#primaryCaretElement;
 	#resizeObserver;
 	#fileInstance;
-	#fileInfo;
+	#applyDocumentChange;
+	#publishChange;
+	#isRendering = false;
+	#restoreEditorStateOnSync = false;
 	#lineAnnotations;
-	#textDocument;
+	#editStateKey;
+	#ownsVerticalViewport;
 	#renderRange;
 	#viewportWindowLines;
 	#markerRenderer;
+	#carets;
 	#searchPanel;
 	#selectionAction;
 	#canMountSelectionAction = true;
@@ -115,53 +143,166 @@ var Editor = class {
 	#retainSearchPanelFocus = false;
 	#fontRemeasureScheduled = false;
 	#themeSelectionRefreshFrame;
+	#editPredictionTimer;
+	#editPredictionAbortController;
+	#editPredictionGeneration = 0;
+	#editPredictionRevealed = false;
+	#retryEditPredictionOnRender = false;
+	#editPrediction;
+	#editPredictionHistory = [];
+	#editPredictionSpacers = /* @__PURE__ */ new Map();
+	#ghostTextRows = /* @__PURE__ */ new Map();
 	#onDeferTokenize = (lines, themeType) => {
+		if (!this.#isRendering) return;
 		this.#fileInstance?.updateRenderCache(lines, themeType);
 		if (this.#renderRange !== void 0 && this.#renderRange.totalLines !== Infinity) {
+			const predictionLines = this.#editPrediction === void 0 ? void 0 : new Set(this.#editPrediction.response.edits.map((edit) => edit.range.start.line));
+			let refreshPrediction = false;
 			const { startingLine, totalLines } = this.#renderRange;
-			const endLine = Math.min(startingLine + totalLines, this.#textDocument?.lineCount ?? 0);
+			const endLine = Math.min(startingLine + totalLines, (this.#editSession ?? this.#initialState)?.document?.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));
+				if (lineElement !== void 0) {
+					lineElement.replaceChildren(...renderLineTokens(tokens));
+					refreshPrediction ||= predictionLines?.has(line) === true;
+				}
 			}
+			if (refreshPrediction && this.#selections !== void 0) this.#updateSelections(this.#selections);
 		}
 	};
-	constructor(options = {}) {
+	/**
+	* @param type The component surface this editor can attach to.
+	* @param options Configure editor behavior and lifecycle callbacks.
+	* @param editStateKey Retain this editable draft and its undo/redo history
+	* in memory so a later editor using the same type and key can resume them.
+	*/
+	constructor(type, options = {}, editStateKey) {
+		this.type = type;
 		this.#options = options;
+		this.#ownsVerticalViewport = options.ownsVerticalViewport === true;
+		this.#initialState = options.initialState;
+		this.#editStateKey = editStateKey;
+	}
+	get #getTypedEditor() {
+		return this.type === "file" ? this : this;
 	}
 	setOptions(options) {
-		const previousStorageOption = this.#options.persistStateStorage ?? "inMemory";
-		const nextOptions = {
+		const previousRenderCaret = this.#options.renderCaret;
+		const previousEditPrediction = this.#options.editPrediction;
+		this.#options = {
 			...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 (previousRenderCaret !== this.#options.renderCaret) {
+			this.#caretElements?.forEach((element) => element.remove());
+			this.#caretElements = void 0;
+			this.#renderCarets();
 		}
-		if ((this.#options.persistStateStorage ?? "inMemory") !== previousStorageOption) {
-			this.#stateRestoreGeneration++;
-			this.#stateStorage = void 0;
-			this.#stateStorageOption = void 0;
-			this.#pendingStateWrites.clear();
+		if (previousEditPrediction !== this.#options.editPrediction) {
+			this.#cancelEditPrediction(true);
+			this.#editPredictionHistory = [];
+			this.#scheduleEditPrediction();
 		}
 	}
+	__emitEditComplete(event) {
+		this.#options.onComplete?.(event);
+	}
+	/** @internal */
+	__getGhostTextRows() {
+		return this.#ghostTextRows;
+	}
+	setCarets(carets) {
+		const textDocument = this.#editSession?.document;
+		if (textDocument === void 0) return;
+		this.#caretElements?.forEach((element) => element.remove());
+		this.#caretElements = void 0;
+		this.#caretHighlightElements?.forEach((element) => element.remove());
+		this.#caretHighlightElements = void 0;
+		this.#carets = carets.length === 0 ? void 0 : carets.map((caret) => {
+			const anchor = textDocument.normalizePosition(caret.anchor);
+			const focus = textDocument.normalizePosition(caret.focus);
+			return {
+				caret: {
+					...caret,
+					anchor,
+					focus
+				},
+				anchorOffset: textDocument.offsetAt(anchor),
+				focusOffset: textDocument.offsetAt(focus)
+			};
+		});
+		this.#renderCarets();
+	}
 	edit(fileInstance) {
-		if (this.#options.persistState === true && fileInstance.type === "file") {
-			const file = fileInstance.__getCurrentFile?.();
-			if (file !== void 0) requirePersistedCacheKey(file);
-		}
-		this.#invalidateOnAttach();
+		const editor = this.#getTypedEditor;
+		const previousSession = this.#editSession;
+		if (this.#isRendering) throw new Error("Editor.edit: the editor is already rendering its component");
+		if (this.#fileInstance != null && this.#fileInstance !== fileInstance) throw new Error("Editor.edit: a recycled edit session cannot attach to a different component");
+		const initialState = this.#initialState;
+		const initialEditorState = initialState?.editor;
+		const editStateKey = this.#editStateKey;
+		const editSession = getEditSession({
+			type: this.type,
+			editStateKey,
+			owner: this,
+			initialState,
+			previousSession
+		});
+		const previousDiffSession = editSession.diffSession;
+		this.#initialState = void 0;
+		this.#editSession = editSession;
 		this.#fileInstance = fileInstance;
-		this.#initialize();
-		this.#detach = fileInstance.attachEditor(this);
-		return () => this.cleanUp();
+		this.#isRendering = true;
+		this.#restoreEditorStateOnSync = editSession.editor != null;
+		try {
+			this.#initialize();
+			if (fileInstance.type === "file" && editor.type === "file") {
+				editor.#applyDocumentChange = fileInstance.applyDocumentChange.bind(fileInstance);
+				editor.#publishChange = (changes, file, lineAnnotations) => {
+					const event = {
+						changes,
+						file,
+						editor,
+						lineAnnotations
+					};
+					editor.#options.onChange?.(event);
+					fileInstance.emitEditChange(event);
+				};
+				if (this.#detach == null) this.#detach = fileInstance.__attachEditor(editor);
+				else fileInstance.__resumeEditor(editor);
+			} else if (fileInstance.type === "file-diff" && editor.type === "file-diff") {
+				editor.#applyDocumentChange = fileInstance.applyDocumentChange.bind(fileInstance);
+				editor.#publishChange = (changes, file, lineAnnotations) => {
+					const event = {
+						changes,
+						file,
+						editor,
+						lineAnnotations
+					};
+					editor.#options.onChange?.(event);
+					fileInstance.emitEditChange(event);
+				};
+				if (this.#detach == null) this.#detach = fileInstance.__attachEditor(editor);
+				else fileInstance.__resumeEditor(editor);
+			} else throw new Error("Editor.edit: Impossible edit state");
+		} catch (error) {
+			this.cleanUp("recycle");
+			if (editSession.type === "file-diff" && editSession.diffSession == null) editSession.diffSession = previousDiffSession;
+			if (this.#detach == null && editStateKey != null) if (editor.type === "file") EditStateManager.releaseFile(editStateKey, editor);
+			else EditStateManager.releaseFileDiff(editStateKey, editor);
+			this.#editSession = previousSession;
+			if (this.#detach == null) {
+				this.#fileInstance = void 0;
+				this.#applyDocumentChange = void 0;
+				this.#publishChange = void 0;
+			}
+			if (initialState != null && initialEditorState != null) initialState.editor = initialEditorState;
+			this.#initialState = initialState;
+			throw error;
+		}
+		return () => {
+			this.cleanUp("complete");
+		};
 	}
 	/**
 	* Apply edits to current attached file. Every edit joins the undo timeline:
@@ -174,8 +315,8 @@ var Editor = class {
 	* are remapped during replay and the text edit still joins the undo timeline.
 	*/
 	applyEdits(edits, updateHistory = true) {
-		const textDocument = this.#textDocument;
-		if (textDocument == null) throw new Error("Editor is not attached");
+		const textDocument = this.#editSession?.document;
+		if (textDocument == null) throw new Error("Editor.applyEdits: 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)]);
@@ -191,11 +332,11 @@ var Editor = class {
 	}
 	/** Whether there is an edit to undo. */
 	get canUndo() {
-		return this.#textDocument?.canUndo ?? false;
+		return (this.#editSession ?? this.#initialState)?.document?.canUndo ?? false;
 	}
 	/** Whether there is an undone edit to redo. */
 	get canRedo() {
-		return this.#textDocument?.canRedo ?? false;
+		return (this.#editSession ?? this.#initialState)?.document?.canRedo ?? false;
 	}
 	/** Undo the last edit. Does nothing when there is nothing to undo. */
 	undo() {
@@ -206,8 +347,9 @@ var Editor = class {
 		this.#runCommand("redo");
 	}
 	getFile() {
-		const fileInfo = this.#fileInfo;
-		const textDocument = this.#textDocument;
+		const editSession = this.#editSession ?? this.#initialState;
+		const fileInfo = editSession?.fileInfo;
+		const textDocument = editSession?.document;
 		if (fileInfo === void 0 || textDocument === void 0) return;
 		const file = { ...fileInfo };
 		Object.defineProperty(file, "contents", {
@@ -217,32 +359,56 @@ var Editor = class {
 		return file;
 	}
 	getText() {
-		return this.#textDocument?.getText() ?? "";
-	}
-	getState() {
-		const fileInstance = this.#fileInstance;
+		return (this.#editSession ?? this.#initialState)?.document?.getText() ?? "";
+	}
+	/** Return an isolated copy of selections and restorable view state. */
+	getViewState() {
+		const fileInstance = this.#isRendering ? this.#fileInstance : void 0;
+		if (!this.#isRendering && this.#editSession?.editor != null) return cloneEditorViewState(this.#editSession.editor);
+		const selections = this.#selections?.map((selection) => ({
+			...selection,
+			start: { ...selection.start },
+			end: { ...selection.end }
+		}));
+		if (fileInstance == null) return { selections };
+		const viewport = this.#getOwnedVerticalViewport();
+		const scrollLeft = fileInstance.getCodeScrollLeft();
+		if (viewport == null) return {
+			selections,
+			view: { scrollLeft }
+		};
 		return {
-			selections: this.#selections,
-			view: fileInstance != null ? {
-				scrollLeft: fileInstance.getCodeScrollLeft(),
-				scrollTop: this.#getViewportScrollTop()
-			} : void 0
+			selections,
+			view: {
+				scrollLeft,
+				scrollTop: viewport.scrollTop
+			}
 		};
 	}
-	setState({ selections, view }) {
-		if (this.#fileInstance === void 0 || this.#textDocument === void 0) throw new Error("Editor is not attached");
+	/**
+	* Return the objects that make up the active edit session, or undefined when
+	* no complete session exists.
+	*/
+	getEditState() {
+		const editSession = this.#editSession;
+		if (editSession == null) return;
+		if (this.#fileInstance == null) throw new Error(`Editor.getEditState: active ${this.type} session has no component`);
+		return toManagedEditState(editSession);
+	}
+	setViewState({ selections, view }) {
+		if (!this.#isRendering || this.#fileInstance === void 0 || this.#editSession?.document === void 0) throw new Error("Editor.setViewState: Editor is not attached");
 		this.#canMountSelectionAction = false;
 		this.#updateSelections(selections ?? []);
 		if (view != null) {
 			this.#fileInstance.setCodeScrollLeft(view.scrollLeft);
-			if (view.scrollTop !== void 0) this.#setViewportScrollTop(view.scrollTop);
-			return;
-		}
-		this.#scrollToPrimaryCaret();
+			const viewport = this.#getOwnedVerticalViewport();
+			if (view.scrollTop !== void 0 && viewport != null) viewport.scrollTop = view.scrollTop;
+		} else if (this.#ownsVerticalViewport) this.#scrollToPrimaryCaret();
+		this.#checkpointEditSessionState();
 	}
 	setSelections(selections) {
-		const textDocument = this.#textDocument;
-		if (textDocument === void 0) throw new Error("Text document is not initialized");
+		const textDocument = this.#editSession?.document;
+		if (textDocument === void 0) throw new Error("Editor.setSelections: Text document is not initialized");
 		const resolvedSelections = selections.map((selection) => {
 			let start = textDocument.normalizePosition(selection.start);
 			let end = textDocument.normalizePosition(selection.end);
@@ -264,8 +430,8 @@ var Editor = class {
 		this.#scrollToPrimaryCaret();
 	}
 	setMarkers(markers) {
-		const textDocument = this.#textDocument;
-		if (textDocument === void 0) throw new Error("Text document is not initialized");
+		const textDocument = this.#editSession?.document;
+		if (textDocument === void 0) throw new Error("Editor.setMarkers: Text document is not initialized");
 		if (markers.length === 0) {
 			this.#markerRenderer?.cleanup();
 			this.#markerRenderer = void 0;
@@ -284,13 +450,14 @@ var Editor = class {
 		this.#markerRenderer.setMarkers(markers, textDocument);
 		if (this.#contentElement !== void 0) this.#markerRenderer.listenHover(this.#contentElement);
 		this.#updateSelections(this.#selections ?? []);
+		this.#renderCarets();
 	}
 	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 textDocument = this.#editSession?.document;
+			if (textDocument == null || !this.#isRendering || this.#fileInstance == null) return;
 			const targetLineNumber = lineNumber === "first-visible" ? this.#getFirstVisibleLineNumber(options?.offset) : lineNumber;
 			if (targetLineNumber == null) return;
 			const position = textDocument.normalizePosition({
@@ -312,27 +479,30 @@ var Editor = class {
 		this.#shouldIgnoreSelectionChange = false;
 		this.#contentElement?.blur();
 	}
-	cleanUp(recycle = false) {
+	cleanUp(reason = "discard") {
+		const fileInstance = this.#fileInstance;
+		const recycle = reason === "recycle";
+		this.#cancelEditPrediction(true, false);
+		if (!recycle) this.#editPredictionHistory = [];
+		const editSession = this.#editSession;
+		if (fileInstance != null && editSession != null) {
+			const discardDiffState = !this.#checkpointEditSessionState();
+			if (!recycle) this.#releaseEditSession(discardDiffState);
+		}
 		this.#invalidateOnAttach();
 		if (!recycle) this.#attachState.delivered = false;
-		const hadFileInstance = this.#fileInstance != null;
-		const shouldRestoreState = this.#options.persistState === true;
-		this.#stateRestoreGeneration++;
-		this.#persistCurrentState();
-		if (hadFileInstance) this.#restoreStateOnNextSync = shouldRestoreState;
+		this.#isRendering = false;
 		dequeueRender(this.#handleCustomPasteEvent);
 		this.#tokenizer?.cleanUp();
 		this.#tokenizer = void 0;
-		if (!recycle) {
-			this.#textDocument = void 0;
-			this.#fileInfo = void 0;
-		}
 		this.#globalEventDisposes?.forEach((dispose) => dispose());
 		this.#globalEventDisposes = void 0;
 		this.#editorEventDisposes?.forEach((dispose) => dispose());
 		this.#editorEventDisposes = void 0;
-		this.#detach?.(recycle);
-		this.#detach = void 0;
+		if (!recycle) {
+			this.#detach?.();
+			this.#detach = void 0;
+		}
 		this.#gutterWidthCache = void 0;
 		this.#contentWidthCache = void 0;
 		this.#lineYCache.clear();
@@ -351,6 +521,7 @@ var Editor = class {
 		this.#popoverManager?.cleanUp();
 		this.#popoverManager = void 0;
 		this.#gutterElement = void 0;
+		this.#deletionsColumn = void 0;
 		this.#contentElement?.removeAttribute("contentEditable");
 		this.#contentElement = void 0;
 		this.#replacementFocusRequest = void 0;
@@ -364,25 +535,44 @@ var Editor = class {
 			cancelAnimationFrame(this.#themeSelectionRefreshFrame);
 			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()
-		};
+		this.#resetState(recycle);
+		if (!recycle) try {
+			if (fileInstance != null && editSession != null) {
+				const editor = this.#getTypedEditor;
+				const mode = reason === "complete" ? "install" : "discard";
+				if (fileInstance.type === "file" && editor.type === "file") fileInstance.__completeEditSession(editor, mode);
+				else if (fileInstance.type === "file-diff" && editor.type === "file-diff") fileInstance.__completeEditSession(editor, mode);
+				else throw new Error("Editor.cleanUp: Impossible edit state");
+			}
+		} finally {
+			this.#editSession = void 0;
+			this.#fileInstance = void 0;
+			this.#applyDocumentChange = void 0;
+			this.#publishChange = void 0;
+		}
+	}
+	#checkpointEditSessionState() {
+		const fileInstance = this.#fileInstance;
+		const editSession = this.#editSession;
+		if (fileInstance == null || editSession == null) return false;
+		const editorState = this.#isRendering ? this.getViewState() : editSession.editor ?? {};
+		const { view } = editorState;
+		const hasNonDefaultView = view != null && (view.scrollLeft !== 0 || (view.scrollTop ?? 0) !== 0);
+		const hasEditorState = editorState.selections != null || hasNonDefaultView;
+		editSession.editor = cloneEditorViewState(editorState);
+		if (editSession.type === "file") return false;
+		const capturedDiffSession = fileInstance.__captureDocumentSessionState();
+		editSession.diffSession = capturedDiffSession?.diffSession;
+		if (capturedDiffSession == null) return false;
+		const document = editSession.document;
+		return capturedDiffSession.hasChanges || hasEditorState || document?.canUndo === true || document?.canRedo === true;
+	}
+	#releaseEditSession(discardDiffState = false) {
+		const editStateKey = this.#editStateKey;
+		if (editStateKey == null) return;
+		const editor = this.#getTypedEditor;
+		if (editor.type === "file") EditStateManager.releaseFile(editStateKey, editor);
+		else EditStateManager.releaseFileDiff(editStateKey, editor, discardDiffState);
 	}
 	/** @internal */
 	__postponeBgTokenizeToNextFrame() {
@@ -401,9 +591,40 @@ var Editor = class {
 		if (contentElement != null && (this.#contentHasFocus || shadowActiveElement === contentElement || shadowActiveElement != null && contentElement.contains(shadowActiveElement))) this.#replacementFocusRequest = {};
 	}
 	/** @internal */
-	__syncRenderView = (highlighter, fileContainer, fileOrDiff, lineAnnotations, renderRange) => {
+	__getDocumentContents(fallbackFile) {
+		const fileInfo = this.#editSession?.fileInfo;
+		const textDocument = this.#editSession?.document;
+		if (textDocument == null) return fileInfo == null || fallbackFile == null ? void 0 : {
+			...fileInfo,
+			contents: fallbackFile.contents
+		};
+		const resolvedFileInfo = fileInfo ?? fallbackFile;
+		if (resolvedFileInfo == null) return;
+		return {
+			name: resolvedFileInfo.name,
+			lang: resolvedFileInfo.lang,
+			contents: textDocument.getText()
+		};
+	}
+	/** @internal */
+	__getDocumentSessionState() {
+		const snapshot = this.#editSession?.diffSession;
+		return snapshot != null ? cloneRetainedDiffSessionSnapshot(snapshot) : void 0;
+	}
+	/** @internal */
+	__syncRenderView = (props) => {
+		const { highlighter, fileContainer, renderRange, resetHistory = false } = props;
+		const renderView = props;
+		let fileOrDiff;
+		if ("file" in renderView && this.type === "file") fileOrDiff = renderView.file;
+		else if ("fileDiff" in renderView && this.type === "file-diff") fileOrDiff = renderView.fileDiff;
+		else throw new Error("Editor.__syncRenderView: Impossible render state");
+		const lineAnnotations = renderView.lineAnnotations;
+		const editStateKey = this.#editStateKey;
+		const externalDocument = renderView.externalDocument === true;
 		const fileInstance = this.#fileInstance;
-		if (fileInstance == null) return;
+		const editSession = this.#editSession;
+		if (!this.#isRendering || fileInstance == null || editSession == null) return;
 		const shadowRoot = fileContainer.shadowRoot;
 		if (shadowRoot == null) {
 			console.error("[editor] Could not find the shadow root.");
@@ -412,16 +633,26 @@ var Editor = class {
 		let codeElement;
 		let gutterEl;
 		let contentEl;
-		for (const el of shadowRoot.querySelectorAll("[data-code]")) if (el.dataset.deletions === void 0) {
-			codeElement = el;
+		let deletionsGutterEl;
+		let deletionsContentEl;
+		for (const el of shadowRoot.querySelectorAll("[data-code]")) {
+			const isDeletions = el.dataset.deletions != null;
+			if (!isDeletions) codeElement = el;
 			for (const child of el.children) {
-				const el = child;
-				const { gutter, content } = el.dataset;
-				if (gutter !== void 0) gutterEl = el;
-				else if (content !== void 0) contentEl = el;
+				if (!(child instanceof HTMLElement)) continue;
+				const { gutter, content } = child.dataset;
+				if (gutter != null) if (isDeletions) deletionsGutterEl = child;
+				else gutterEl = child;
+				else if (content != null) if (isDeletions) deletionsContentEl = child;
+				else contentEl = child;
 			}
-			break;
 		}
+		if (deletionsContentEl == null) this.#deletionsColumn = void 0;
+		else if (deletionsGutterEl == null) throw new Error("Editor.__syncRenderView: the deletions column has no gutter");
+		else this.#deletionsColumn = {
+			content: deletionsContentEl,
+			gutter: deletionsGutterEl
+		};
 		if (codeElement === void 0 || contentEl === void 0) {
 			this.#replacementFocusRequest = void 0;
 			return;
@@ -434,45 +665,44 @@ var Editor = class {
 			if (this.#themeStyleElement !== void 0) shadowRoot.appendChild(this.#themeStyleElement);
 			if (this.#spriteElement !== void 0) shadowRoot.prepend(this.#spriteElement);
 		}
-		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.#options.persistState === true ? requirePersistedCacheKey(fileOrDiff) : void 0;
-		let persistedStateTarget;
-		if (shouldRebuildDocument) {
+		const languageId = fileOrDiff.lang ?? getFiletypeFromFileName(fileOrDiff.name);
+		const contents = "contents" in fileOrDiff ? fileOrDiff.contents : fileOrDiff.additionLines.join("");
+		const previousTextDocument = editSession.document;
+		const documentChanges = externalDocument && previousTextDocument !== void 0 && previousTextDocument.getText() !== contents ? [createFullDocumentChange(previousTextDocument.getText(), contents)] : void 0;
+		const resetForExternalDocument = externalDocument && resetHistory;
+		if (editSession.document == null || editSession.fileInfo == null || editStateKey == null && (editSession.fileInfo.name !== fileOrDiff.name || editSession.document.languageId !== languageId) || resetForExternalDocument) {
+			this.#cancelEditPrediction(true);
+			this.#editPredictionHistory = [];
 			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 { name, lang, cacheKey } = fileOrDiff;
-			const languageId = lang ?? getFiletypeFromFileName(fileOrDiff.name);
-			const cachedTextDocument = persistedCacheKey !== void 0 ? this.#getCachedTextDocument(fileOrDiff, persistedCacheKey) : void 0;
-			const reusableTextDocument = fileInstance.type === "file" || cachedTextDocument?.getText() === contents ? cachedTextDocument : void 0;
-			const textDocument = reusableTextDocument ?? new TextDocument(fileOrDiff.name, contents, languageId, 0, editStack);
-			this.#fileInfo = {
+			const { name, lang } = fileOrDiff;
+			let textDocument = resetForExternalDocument || editStateKey == null && editSession.fileInfo != null ? void 0 : editSession.document;
+			if (previousTextDocument != null && textDocument == null) editSession.editor = void 0;
+			if (textDocument == null) {
+				const editStack = new EditStack({ maxEntries: this.#options.historyMaxEntries });
+				textDocument = new TextDocument(fileOrDiff.name, contents, languageId, 0, editStack);
+			}
+			editSession.fileInfo = {
 				name,
-				lang,
-				cacheKey
+				lang
 			};
-			this.#textDocument = textDocument;
-			if (persistedCacheKey !== void 0) {
-				this.#textDocumentCache.set(persistedCacheKey, textDocument);
-				persistedStateTarget = {
-					cacheKey: persistedCacheKey,
-					textDocument
-				};
-			}
+			editSession.document = textDocument;
+			if (resetForExternalDocument) editSession.diffSession = void 0;
 			this.#tokenizer?.cleanUp();
 			this.#tokenizer = void 0;
 			this.#resetState();
 			this.#wrapLineOffsetsCache.clear();
 			this.#selections = this.#initSelections;
-			if (this.#options.__debug === true) console.log(reusableTextDocument !== void 0 ? "[diffs/editor] cached text document reused for" : "[diffs/editor] text document rebuilt from", fileOrDiff.name);
+			if (this.#options.__debug === true) console.log("[diffs/editor] text document initialized 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 (externalDocument && !resetForExternalDocument) {
+			this.#applyExternalDocumentReplacement(editSession, contents, lineAnnotations);
+			const { name, lang } = fileOrDiff;
+			editSession.fileInfo = {
+				name,
+				lang
+			};
+		}
+		const textDocument = editSession.document;
 		if (this.#tokenizer == null && textDocument != null) this.#tokenizer = new EditorTokenizer({
 			highlighter,
 			textDocument,
@@ -516,178 +746,86 @@ var Editor = class {
 		this.#renderRange = renderRange;
 		this.#viewportWindowLines = renderRange?.totalLines;
 		this.#tokenizer?.prebuildStateStack(renderRange);
-		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.#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);
+		const retainedEditorState = editSession.editor;
+		const restoreEditorStateOnSync = this.#restoreEditorStateOnSync;
+		try {
+			this.#markerRenderer?.removePopover();
+			if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) this.#updateSelections(this.#selections ?? []);
+			this.#renderCarets();
+			if (this.#retryEditPredictionOnRender) this.#scheduleEditPrediction();
+			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.#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 (restoreEditorStateOnSync) {
+				this.#restoreEditorStateOnSync = false;
+				if (retainedEditorState !== void 0) this.setViewState(retainedEditorState);
+			}
+			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", editSession.document?.lineCount, "lines");
+			}
+			this.#checkpointEditSessionState();
+		} catch (error) {
+			this.#restoreEditorStateOnSync = restoreEditorStateOnSync;
+			editSession.editor = retainedEditorState;
+			throw error;
 		}
+		if (documentChanges != null) this.#emitChange(documentChanges, lineAnnotations);
 		this.#scheduleOnAttach(fileInstance);
 	};
-	#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.#options.persistState !== true || this.#fileInstance === void 0 || 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 && state.view?.scrollTop === pendingRestore.view?.scrollTop) 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;
+	#applyExternalDocumentReplacement(editSession, contents, lineAnnotations) {
+		const textDocument = editSession.document;
+		if (textDocument == null || textDocument.getText() === contents) return;
 		const selections = this.#selections;
-		const view = this.getState().view;
-		let inputWatch;
-		const applyState = (state) => {
-			const currentView = this.getState().view;
-			if (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;
-			const userScrolled = inputWatch?.userScrolled() === true;
-			if (state === void 0) {
-				this.#fileInstance?.setCodeScrollLeft(0);
-				if (!userScrolled) this.#setViewportScrollTop(0);
-				return;
-			}
-			const restored = cloneEditorState(state);
-			if (userScrolled && restored.view !== void 0) restored.view = { scrollLeft: restored.view.scrollLeft };
-			this.setState(restored);
-		};
-		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 selectionOffsets = selections?.map((selection) => [textDocument.offsetAt(selection.start), textDocument.offsetAt(selection.end)]);
+		const replacement = {
+			start: 0,
+			end: textDocument.getText().length,
+			text: contents
 		};
-		const pendingWrite = this.#pendingStateWrites.get(cacheKey);
-		const result = pendingWrite === void 0 ? readState() : pendingWrite.then(readState);
-		if (isPromise(result)) {
-			inputWatch = this.#watchViewportUserInput();
-			const pendingRestore = {
-				cacheKey,
-				textDocument,
-				documentVersion,
-				selections,
-				view,
-				completion: result.catch(() => {})
-			};
-			this.#pendingStateRestore = pendingRestore;
-			pendingRestore.completion.finally(() => {
-				inputWatch?.dispose();
-				if (this.#pendingStateRestore === pendingRestore) this.#pendingStateRestore = void 0;
-			});
+		if (textDocument.applyResolvedEdits([replacement], true, selections, void 0, true) == null) return;
+		if (selections != null && selectionOffsets != null) {
+			const nextSelections = remapSelectionsAfterEdits(textDocument, selections, selectionOffsets, [replacement]);
+			textDocument.setLastUndoSelectionsAfter(nextSelections);
+			this.#selections = nextSelections;
 		}
+		if (this.#lineAnnotations != null || lineAnnotations != null) textDocument.setLastUndoLineAnnotations(this.#lineAnnotations ?? [], lineAnnotations ?? []);
+		this.#tokenizer?.cleanUp();
+		this.#tokenizer = void 0;
+		this.#resetCache();
+		this.#wrapLineOffsetsCache.clear();
+		this.#markerRenderer?.removePopover();
+		if (this.#searchPanel !== void 0 && this.#matches !== void 0) this.#searchPanel.updateMatches({ syncSelection: false });
 	}
-	#watchViewportUserInput() {
-		const viewport = this.#getScrollViewport();
-		if (!(viewport instanceof HTMLElement)) return;
-		let scrolled = false;
-		const eventTypes = [
-			"wheel",
-			"touchstart",
-			"mousedown"
-		];
-		const dispose = () => {
-			for (const type of eventTypes) viewport.removeEventListener(type, onInput, { capture: true });
-		};
-		const onInput = () => {
-			scrolled = true;
-			dispose();
-		};
-		for (const type of eventTypes) viewport.addEventListener(type, onInput, {
-			capture: true,
-			passive: true
-		});
-		return {
-			userScrolled: () => scrolled,
-			dispose
-		};
+	get #fileDiffInstance() {
+		return this.#fileInstance?.type === "file-diff" ? this.#fileInstance : void 0;
+	}
+	get #virtualizedInstance() {
+		return isVirtualizedEditorComponent(this.#fileInstance) ? this.#fileInstance : void 0;
 	}
 	#isLineRenderable(line) {
-		return this.#fileInstance?.isLineRenderable?.(line + 1) ?? true;
+		return this.#fileDiffInstance?.isLineRenderable?.(line + 1) ?? true;
 	}
 	get #resolveRenderableLine() {
-		const fileInstance = this.#fileInstance;
-		if (fileInstance?.getNearestRenderableLine == null) return;
+		const fileInstance = this.#fileDiffInstance;
+		if (fileInstance == 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);
+		if (!this.#isLineRenderable(line)) this.#fileDiffInstance?.revealLine?.(line + 1);
 	}
 	get #diffSyle() {
-		return this.#fileInstance?.options.diffStyle ?? "split";
+		return this.#fileDiffInstance?.options.diffStyle ?? "split";
 	}
 	get #isDiff() {
-		return this.#fileInstance?.type === "file-diff";
+		return this.type === "file-diff";
 	}
 	get #isWrap() {
 		return this.#fileInstance?.options.overflow === "wrap";
@@ -706,7 +844,7 @@ var Editor = class {
 		this.#lineElementsCache.clear();
 		this.#lastAccessedCharX = void 0;
 	}
-	#resetState() {
+	#resetState(preserveCarets = false) {
 		this.#setEditorActiveLineSafe(null);
 		this.#gutterWidthCache = void 0;
 		this.#contentWidthCache = void 0;
@@ -714,6 +852,11 @@ var Editor = class {
 		this.#suppressNativeSelectionSync = false;
 		this.#overlayElements?.forEach((el) => el.remove());
 		this.#overlayElements = void 0;
+		this.#caretElements?.forEach((element) => element.remove());
+		this.#caretElements = void 0;
+		this.#caretHighlightElements?.forEach((element) => element.remove());
+		this.#caretHighlightElements = void 0;
+		if (!preserveCarets) this.#carets = void 0;
 		this.#selections = void 0;
 		this.#scrollingToLine = void 0;
 		this.#markerRenderer?.cleanup();
@@ -734,13 +877,13 @@ var Editor = class {
 	}
 	#scheduleOnAttach(fileInstance) {
 		const attachState = this.#attachState;
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		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;
+			if (generation !== attachState.generation || this.#fileInstance !== fileInstance || this.#editSession?.document !== textDocument) return;
 			const contentElement = this.#contentElement;
 			const shadowRoot = this.#fileContainer?.shadowRoot;
 			if (contentElement == null || shadowRoot == null || !shadowRoot.contains(contentElement)) return;
@@ -751,21 +894,16 @@ var Editor = class {
 		queueRender(callback);
 	}
 	#getScrollViewport() {
-		const viewport = this.#fileInstance?.getEditorViewport?.();
-		if (viewport !== void 0) return viewport;
+		const viewport = this.#virtualizedInstance?.getEditorViewport?.();
+		if (viewport != null) return viewport;
 		const fileContainer = this.#fileContainer;
 		if (this.#fileInstance == null || fileContainer == null) return;
 		return lookupScrollContainer(fileContainer);
 	}
-	#getViewportScrollTop() {
-		const viewport = this.#getScrollViewport();
-		if (viewport instanceof HTMLElement) return viewport.scrollTop;
-		return viewport?.defaultView?.scrollY ?? 0;
-	}
-	#setViewportScrollTop(scrollTop) {
-		const viewport = this.#getScrollViewport();
-		if (viewport instanceof HTMLElement) viewport.scrollTop = scrollTop;
-		else if (viewport instanceof Document) viewport.defaultView?.scrollTo({ top: scrollTop });
+	#getOwnedVerticalViewport() {
+		if (!this.#ownsVerticalViewport) return;
+		const viewport = this.#virtualizedInstance?.getEditorViewport?.();
+		if (viewport instanceof HTMLElement) return viewport;
 	}
 	#initialize() {
 		this.#globalStyleElement = h("style", {
@@ -817,7 +955,9 @@ var Editor = class {
 				if (this.#selections !== void 0 && this.#selections.length > 1 && !this.#isContentMouseDown) return;
 				const selectionRaw = document.getSelection();
 				if (selectionRaw == null) return;
-				const composedRange = typeof selectionRaw.getComposedRanges === "function" ? selectionRaw.getComposedRanges({ shadowRoots: [shadowRoot] })?.[0] : getShadowRootRange(shadowRoot);
+				let composedRange;
+				if (typeof selectionRaw.getComposedRanges === "function") composedRange = selectionRaw.getComposedRanges({ shadowRoots: [shadowRoot] })?.[0];
+				else composedRange = getShadowRootRange(shadowRoot);
 				if (composedRange === void 0 || !this.#rangeBelongsToEditor(composedRange)) return;
 				let selection = convertSelection(composedRange, 0);
 				if (selection === void 0) return;
@@ -844,6 +984,10 @@ var Editor = class {
 			addEventListener(document, "pointercancel", finishMouseSelection, { passive: true }),
 			addEventListener(document, "keydown", (e) => {
 				if (e.key === "Shift") this.#selectionStart = this.#selections?.at(-1);
+				else if (e.key === "Alt" && !e.repeat && this.#contentHasFocus && this.#options.editPrediction?.mode === "subtle") {
+					this.#editPredictionRevealed = !this.#editPredictionRevealed;
+					this.#updateSelections(this.#selections ?? []);
+				}
 			}, { passive: true }),
 			addEventListener(document, "keyup", (e) => {
 				if (e.key === "Shift") this.#selectionStart = void 0;
@@ -955,6 +1099,16 @@ var Editor = class {
 				this.#canMountSelectionAction = true;
 				this.#suppressNativeSelectionSync = false;
 				if (e.isComposing || e.keyCode === 229) return;
+				if (e.key === "Tab" && !e.shiftKey && !e.ctrlKey && !e.metaKey && !e.isComposing && !this.#isComposing && (!e.altKey || this.#options.editPrediction?.mode === "subtle") && this.#editPrediction?.rendered === true) {
+					this.#acceptEditPrediction();
+					e.preventDefault();
+					return;
+				}
+				if (e.key === "Escape" && this.#editPrediction !== void 0) {
+					this.#cancelEditPrediction(true);
+					e.preventDefault();
+					return;
+				}
 				const command = resolveEditorCommandFromKeyboardEvent(e, this.#options.keymap);
 				if (command !== void 0) {
 					e.preventDefault();
@@ -969,7 +1123,7 @@ var Editor = class {
 					return;
 				}
 				const mvShortcut = isMoveCursorShortcut(e);
-				const textDocument = this.#textDocument;
+				const textDocument = this.#editSession?.document;
 				if (this.#selections !== void 0 && this.#selections.length > 0 && mvShortcut !== void 0 && textDocument !== void 0) {
 					const cursorMoveOptions = {
 						getSoftLineOffsets: this.#isWrap ? (line) => this.#wrapLineTextOrWholeLine(line) : void 0,
@@ -1020,7 +1174,7 @@ var Editor = class {
 				if (!targetIsContentElement(e)) return;
 				e.preventDefault();
 				const clipboardData = e.clipboardData;
-				const textDocument = this.#textDocument;
+				const textDocument = this.#editSession?.document;
 				if (clipboardData === null || textDocument === void 0) return;
 				let text = clipboardData.getData("text");
 				const selectionCount = this.#selections?.length ?? 0;
@@ -1035,7 +1189,10 @@ var Editor = class {
 			}),
 			addEventListener(contentEl, "beforeinput", (e) => {
 				if (!targetIsContentElement(e)) return;
-				if (e.inputType === "insertCompositionText") return;
+				if (e.inputType === "insertCompositionText") {
+					this.#cancelEditPrediction(true);
+					return;
+				}
 				e.preventDefault();
 				this.#handleInput(e.inputType, e.data);
 			}),
@@ -1045,6 +1202,7 @@ var Editor = class {
 			}),
 			addEventListener(contentEl, "compositionstart", (e) => {
 				if (!targetIsContentElement(e)) return;
+				this.#cancelEditPrediction(true);
 				this.#isComposing = true;
 				this.#shouldIgnoreSelectionChange = true;
 			}, { passive: true }),
@@ -1106,7 +1264,7 @@ var Editor = class {
 					return;
 				}
 				if (e.pointerType !== "mouse") return;
-				const textDocument = this.#textDocument;
+				const textDocument = this.#editSession?.document;
 				const lineIndex = resolveEditableLine(gutterRow);
 				if (lineIndex === void 0 || textDocument === void 0) return;
 				this.#canMountSelectionAction = true;
@@ -1119,7 +1277,7 @@ var Editor = class {
 				this.#focus();
 				this.#replaceSelectEventListeners([addEventListener(document, "mousemove", (e) => {
 					if (!this.#isGutterMouseDown) return;
-					const textDocument = this.#textDocument;
+					const textDocument = this.#editSession?.document;
 					const lineIndex = resolveEditableLine(resolveGutterTarget(e.composedPath()[0], true));
 					if (lineIndex === void 0 || textDocument === void 0) return;
 					const anchorLine = this.#selectionStart?.start.line ?? lineIndex;
@@ -1149,14 +1307,14 @@ var Editor = class {
 					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");
+			const textDocument = this.#editSession?.document;
+			if (textDocument != null) this.#replaceSelectionText(Array.isArray(text) ? text.map((t) => textDocument.normalizeEol(t)) : textDocument.normalizeEol(text), void 0, true, "document");
 		}
 	};
 	#computeContentOffset(contentEl) {
 		if (this.#isDiff && this.#diffSyle === "split" && this.#isWrap) {
 			this.#contentOffset = {
-				top: contentEl.offsetTop,
+				top: contentEl.offsetTop - this.#metrics.paddingTop,
 				left: contentEl.offsetLeft - this.#getGutterWidth()
 			};
 			if (this.#options.__debug === true) console.log("[diffs/editor] content offset:", this.#contentOffset);
@@ -1166,8 +1324,8 @@ var Editor = class {
 		if (this.#isDiff && this.#diffSyle === "split" && this.#isWrap) return this.#contentOffset;
 	}
 	#runCommand(command) {
-		const textDocument = this.#textDocument;
-		if (textDocument === void 0) return;
+		const textDocument = this.#editSession?.document;
+		if (textDocument == null) return;
 		switch (command) {
 			case "openSearchPanel":
 				this.#openSearchPanel("find");
@@ -1367,8 +1525,8 @@ var Editor = class {
 		}
 	}
 	#applyHistoryChange(command) {
-		const textDocument = this.#textDocument;
-		if (textDocument === void 0) return;
+		const textDocument = this.#editSession?.document;
+		if (textDocument == null) 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)]);
@@ -1376,11 +1534,12 @@ var Editor = class {
 		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);
+		const replayedLineAnnotations = lineAnnotations ?? (this.#lineAnnotations != null ? applyDocumentChangeToLineAnnotations(change, this.#lineAnnotations) : void 0);
+		this.#applyChange(change, nextSelections, replayedLineAnnotations);
 	}
 	/** Applies one undoable command batch and records its resulting selections. */
 	#applyCommandEdits(edits, resolveNextSelections) {
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		const selections = this.#selections;
 		if (textDocument === void 0 || selections === void 0) return;
 		const remapSelections = resolveNextSelections === void 0;
@@ -1405,7 +1564,7 @@ var Editor = class {
 	}
 	/** Copies selected line blocks and keeps the selection in the requested copy. */
 	#copySelectedLines(direction) {
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		const selections = this.#selections;
 		if (textDocument === void 0 || selections === void 0) return;
 		const blocks = getSelectedLineBlocks(selections);
@@ -1498,7 +1657,7 @@ var Editor = class {
 	}
 	/** Inserts an indented blank line after each selection's final line. */
 	#insertBlankLine() {
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		const selections = this.#selections;
 		if (textDocument === void 0 || selections === void 0) return;
 		const selectionLines = selections.map((selection) => getCaretPosition(selection).line);
@@ -1539,7 +1698,7 @@ var Editor = class {
 		this.#applyCommandEdits(edits, () => nextSelections);
 	}
 	#moveSelectedLines(direction) {
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		const selections = this.#selections;
 		if (textDocument === void 0 || selections === void 0) return;
 		const blocks = getSelectedLineBlocks(selections);
@@ -1616,6 +1775,7 @@ var Editor = class {
 		}
 		this.#markerRenderer?.removePopover();
 		this.#computeContentOffset(this.#contentElement);
+		this.#renderCarets();
 	};
 	#remeasureMetricsOnFontLoad() {
 		if (this.#fontRemeasureScheduled) return;
@@ -1629,19 +1789,21 @@ var Editor = class {
 			this.#resetCache();
 			this.#wrapLineOffsetsCache.clear();
 			if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) this.#updateSelections(this.#selections ?? []);
+			this.#renderCarets();
 			this.#markerRenderer?.removePopover();
 		});
 	}
 	#rerender(change, newLineAnnotations, renderRange = this.#renderRange, shouldUpdateBuffer) {
 		const tokenizer = this.#tokenizer;
 		const fileInstance = this.#fileInstance;
-		const textDocument = this.#textDocument;
+		const applyDocumentChange = this.#applyDocumentChange;
+		const textDocument = this.#editSession?.document;
 		const gutterEl = this.#gutterElement;
 		const contentEl = this.#contentElement;
-		if (tokenizer === void 0 || fileInstance === void 0 || textDocument === void 0 || contentEl === void 0) return;
+		if (tokenizer == null || fileInstance == null || applyDocumentChange == null || textDocument == null || contentEl == null) return;
 		tokenizer.stopBackgroundTokenize();
 		const t = performance.now();
-		const dirtyLines = tokenizer.tokenize(change, renderRange, !this.#isDiff && fileInstance.getLinePosition !== void 0);
+		const dirtyLines = tokenizer.tokenize(change, renderRange, !this.#isDiff && this.#virtualizedInstance != null);
 		const t2 = performance.now();
 		if (dirtyLines.size > 0) {
 			const children = contentEl.children;
@@ -1720,19 +1882,20 @@ var Editor = class {
 			shouldRefreshDiffsView: this.#isDiff && !didLineCountChange,
 			lineCountChangeInFlight: didLineCountChange
 		});
-		if (didLineCountChange) fileInstance.applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer);
+		if (didLineCountChange) applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer);
 		if (didLineCountChange || this.#isDiff && this.#diffSyle === "unified") this.#resetCache();
-		if (newLineAnnotations !== void 0) {
+		if (newLineAnnotations != null) {
 			this.#lineAnnotations = newLineAnnotations;
-			renderLineAnnotations(newLineAnnotations, contentEl, gutterEl);
+			if (!this.#isDiff || !didLineCountChange) renderLineAnnotations(newLineAnnotations, contentEl, gutterEl, fileInstance.getAnnotationSlotName);
 		}
+		this.#renderCarets();
 		if (this.#options.__debug === true) console.log(`[diffs/editor] re-render in: ${round(performance.now() - t2)}ms,`, `tokenize in: ${round(t2 - t)}ms (${dirtyLines.size} dirty lines)`);
 	}
 	#handleInput(inputType, data) {
 		switch (inputType) {
 			case "insertText": {
 				const text = data ?? "";
-				const textDocument = this.#textDocument;
+				const textDocument = this.#editSession?.document;
 				const selections = this.#selections;
 				const autoSurroundTexts = textDocument !== void 0 && selections !== void 0 ? getAutoSurroundReplacementTexts(textDocument, selections, text, this.#options.autoSurround) : void 0;
 				this.#replaceSelectionText(autoSurroundTexts ?? text);
@@ -1741,7 +1904,7 @@ var Editor = class {
 			case "insertCompositionText": break;
 			case "insertLineBreak":
 			case "insertParagraph":
-				this.#replaceSelectionText(this.#textDocument?.eol ?? "\n");
+				this.#replaceSelectionText(this.#editSession?.document?.eol ?? "\n");
 				break;
 			case "deleteContentBackward":
 				this.#deleteSelectionText();
@@ -1833,7 +1996,7 @@ var Editor = class {
 	#getFirstVisibleLineNumber(offset = 0) {
 		const contentElement = this.#contentElement;
 		const fileContainer = this.#fileContainer;
-		if (this.#textDocument == null || contentElement == null || fileContainer == null) return;
+		if (this.#editSession?.document == null || contentElement == null || fileContainer == null) return;
 		const viewport = this.#getScrollViewport();
 		if (viewport === void 0) return;
 		let viewportTop;
@@ -1950,7 +2113,7 @@ var Editor = class {
 			this.#scrollingToLineFixed = false;
 			this.#scrollingToLineNoFocus = false;
 		} else {
-			const modelLinePosition = this.#fileInstance?.getLinePosition?.(line + 1);
+			const modelLinePosition = this.#virtualizedInstance?.getLinePosition?.(line + 1);
 			if (modelLinePosition !== void 0) {
 				virtualCaret.style.top = modelLinePosition.top + "px";
 				this.#fileContainer?.shadowRoot?.appendChild(virtualCaret);
@@ -2102,7 +2265,7 @@ var Editor = class {
 	#updateAltColumnSelections() {
 		const drag = this.#altColumnDrag;
 		const selectionStart = this.#selectionStart;
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		if (drag === void 0 || drag.focusLine === void 0 || selectionStart === void 0 || textDocument === void 0) return false;
 		const anchor = selectionStart.direction === -1 ? selectionStart.end : selectionStart.start;
 		const scrollLeft = this.#contentElement?.parentElement?.scrollLeft ?? 0;
@@ -2141,8 +2304,451 @@ var Editor = class {
 		this.#updateSelections(selections);
 		return true;
 	}
+	#removeRenderedEditPrediction() {
+		for (const [key, element] of this.#overlayElements ?? []) if (key.startsWith("editPrediction")) {
+			element.remove();
+			this.#overlayElements?.delete(key);
+		}
+	}
+	#composeEditPredictionGroup(textDocument, edits, startIndex) {
+		const firstEdit = edits[startIndex];
+		let endIndex = startIndex;
+		let endLine = firstEdit.range.end.line;
+		while (endIndex + 1 < edits.length && edits[endIndex + 1].range.start.line <= endLine) {
+			endIndex++;
+			endLine = Math.max(endLine, edits[endIndex].range.end.line);
+		}
+		if (endIndex === startIndex && (firstEdit.newText.length === 0 || comparePosition(firstEdit.range.start, firstEdit.range.end) === 0)) return {
+			edit: firstEdit,
+			endIndex
+		};
+		const start = firstEdit.range.start;
+		const end = {
+			line: endLine,
+			character: textDocument.getLineLength(endLine)
+		};
+		const parts = [];
+		let consumed = textDocument.offsetAt(start);
+		for (let index = startIndex; index <= endIndex; index++) {
+			const edit = edits[index];
+			const editStart = textDocument.offsetAt(edit.range.start);
+			const editEnd = textDocument.offsetAt(edit.range.end);
+			parts.push(textDocument.getTextSlice(consumed, editStart), edit.newText);
+			consumed = editEnd;
+		}
+		parts.push(textDocument.getTextSlice(consumed, textDocument.offsetAt(end)));
+		return {
+			edit: {
+				range: {
+					start,
+					end
+				},
+				newText: parts.join("")
+			},
+			endIndex
+		};
+	}
+	#getEditPredictionGroups() {
+		const prediction = this.#editPrediction;
+		const textDocument = this.#editSession?.document;
+		if (prediction == null || textDocument == null || prediction.document !== textDocument || prediction.version !== textDocument.version || this.#options.editPrediction?.mode === "subtle" && !this.#editPredictionRevealed) return;
+		const { edits } = prediction.response;
+		const groups = [];
+		let allVisible = edits.length > 0;
+		for (let startIndex = 0; startIndex < edits.length;) {
+			const { edit, endIndex } = this.#composeEditPredictionGroup(textDocument, edits, startIndex);
+			for (let line = edit.range.start.line; allVisible && line <= edit.range.end.line; line++) allVisible = this.#isLineVisible(line);
+			groups.push({
+				edit,
+				startIndex,
+				endIndex
+			});
+			startIndex = endIndex + 1;
+		}
+		return {
+			groups,
+			allVisible
+		};
+	}
+	#fillGhostTextElement(element, newText, anchorLeft, lineLeft, insertionSuffix) {
+		if (this.#isWrap) {
+			element.dataset.wrap = "";
+			element.style.width = `calc(100cqw - ${lineLeft}px)`;
+		} else {
+			delete element.dataset.wrap;
+			element.style.width = "max-content";
+		}
+		const lines = newText.split(/\r\n|\r|\n/);
+		for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+			const lineText = lines[lineIndex];
+			const suffix = lineIndex === lines.length - 1 ? insertionSuffix : void 0;
+			const isEmpty = lineText.length === 0 && suffix === void 0;
+			const line = h("span", {
+				dataset: isEmpty ? ["editPredictionLine", "empty"] : "editPredictionLine",
+				textContent: isEmpty ? "​" : lineText
+			}, element);
+			if (suffix !== void 0) h("span", { dataset: "editPredictionSuffix" }, line).append(suffix);
+			if (lineIndex === 0 && anchorLeft !== lineLeft) line.style.textIndent = `${anchorLeft - lineLeft}px`;
+		}
+	}
+	#cloneInsertionSuffix(group) {
+		const prediction = this.#editPrediction;
+		const textDocument = this.#editSession?.document;
+		if (prediction == null || textDocument == null) return;
+		const { edit, startIndex, endIndex } = group;
+		const { start, end } = edit.range;
+		if (!(comparePosition(start, end) === 0 && start.character < textDocument.getLineLength(start.line)) || prediction.response.edits[startIndex - 1]?.range.end.line === start.line || prediction.response.edits[endIndex + 1]?.range.start.line === start.line) return;
+		const sourceLine = this.#getLineElement(start.line);
+		if (sourceLine === void 0) return document.createTextNode(textDocument.getLineText(start.line).slice(start.character));
+		const [suffixNode, suffixOffset] = getSelectionAnchor(sourceLine, start.character);
+		const suffixRange = document.createRange();
+		suffixRange.selectNodeContents(sourceLine);
+		suffixRange.setStart(suffixNode, clampDomOffset(suffixNode, suffixOffset));
+		const suffix = suffixRange.cloneContents();
+		if (suffix.firstChild?.textContent === "") suffix.firstChild.remove();
+		return suffix;
+	}
+	#measureGhostTextRows(group) {
+		const { edit } = group;
+		const { start } = edit.range;
+		const [anchorLeft, anchorWrapLine] = this.#getCharX(start.line, start.character);
+		let anchorVisualLines = 1;
+		let ghostVisualLines = edit.newText.split(/\r\n|\r|\n/).length;
+		const overlayElement = this.#overlayElement;
+		if (this.#isWrap && overlayElement != null) {
+			anchorVisualLines = Math.max(1, this.#wrapLineTextOrWholeLine(start.line).length - 1);
+			const probe = h("span", {
+				dataset: "editPrediction",
+				style: { visibility: "hidden" }
+			}, overlayElement);
+			this.#fillGhostTextElement(probe, edit.newText, anchorLeft, this.#getCharX(start.line, 0)[0], this.#cloneInsertionSuffix(group));
+			const { width, height } = probe.getBoundingClientRect();
+			probe.remove();
+			const { lineHeight } = this.#metrics;
+			if (width > 0 && height > 0 && lineHeight > 0) ghostVisualLines = Math.round(height / lineHeight);
+		}
+		return Math.max(0, ghostVisualLines - (anchorVisualLines - anchorWrapLine));
+	}
+	#syncEditPredictionSpacers(notifyComponent = true) {
+		const nextSpacers = /* @__PURE__ */ new Map();
+		const ghostTextRows = /* @__PURE__ */ new Map();
+		const previousRows = this.#ghostTextRows;
+		let rowsChanged = false;
+		const contentElement = this.#contentElement;
+		const composed = this.#getEditPredictionGroups();
+		if (contentElement != null && composed != null && composed.allVisible) {
+			for (const group of composed.groups) {
+				const { edit } = group;
+				if (edit.newText.length === 0) continue;
+				const count = this.#measureGhostTextRows(group);
+				if (count > (ghostTextRows.get(edit.range.start.line) ?? 0)) ghostTextRows.set(edit.range.start.line, count);
+			}
+			if (ghostTextRows.size > 0) {
+				let rowIndexes;
+				const startingLine = this.#renderRange?.startingLine ?? 0;
+				for (const [line, count] of ghostTextRows) {
+					rowsChanged ||= previousRows.get(line) !== count;
+					const lineElement = this.#getLineElement(line);
+					if (lineElement === void 0) continue;
+					let rowIndex = line - startingLine;
+					if (contentElement.children[rowIndex] !== lineElement) {
+						if (rowIndexes === void 0) {
+							rowIndexes = /* @__PURE__ */ new Map();
+							for (let index = 0; index < contentElement.children.length; index++) rowIndexes.set(contentElement.children[index], index);
+						}
+						rowIndex = rowIndexes.get(lineElement) ?? -1;
+					}
+					if (rowIndex < 0) continue;
+					nextSpacers.set(lineElement, count);
+					const gutterRow = this.#gutterElement?.children[rowIndex];
+					if (gutterRow instanceof HTMLElement) nextSpacers.set(gutterRow, count);
+					const partner = this.#deletionsColumnPartner(rowIndex);
+					if (partner != null) {
+						nextSpacers.set(partner.content, (nextSpacers.get(partner.content) ?? 0) + count);
+						nextSpacers.set(partner.gutter, (nextSpacers.get(partner.gutter) ?? 0) + count);
+					}
+				}
+			}
+		}
+		let changed = false;
+		for (const [element, count] of this.#editPredictionSpacers) {
+			if (nextSpacers.get(element) === count) continue;
+			delete element.dataset.editPredictionSpacer;
+			element.style.removeProperty("--diffs-edit-prediction-spacer-height");
+			changed = true;
+		}
+		for (const [element, count] of nextSpacers) {
+			if (this.#editPredictionSpacers.get(element) === count) continue;
+			element.dataset.editPredictionSpacer = "";
+			element.style.setProperty("--diffs-edit-prediction-spacer-height", `${count}lh`);
+			changed = true;
+		}
+		this.#editPredictionSpacers = nextSpacers;
+		if (rowsChanged || ghostTextRows.size !== previousRows.size) {
+			this.#ghostTextRows = ghostTextRows;
+			if (notifyComponent) this.#virtualizedInstance?.syncGhostTextRows();
+		}
+		if (changed) this.#resetCache();
+	}
+	#deletionsColumnPartner(rowIndex) {
+		const deletionsColumn = this.#deletionsColumn;
+		const contentElement = this.#contentElement;
+		if (deletionsColumn == null || contentElement == null || !this.#isDiff || this.#diffSyle !== "split" || this.#isWrap) return;
+		let track = 0;
+		for (let index = 0; index < rowIndex; index++) track += gridTrackSpan(contentElement.children[index]);
+		const { content, gutter } = deletionsColumn;
+		let covered = 0;
+		for (let index = 0; index < content.children.length; index++) {
+			const child = content.children[index];
+			covered += gridTrackSpan(child);
+			if (covered > track) {
+				const gutterChild = gutter.children[index];
+				if (!(child instanceof HTMLElement) || !(gutterChild instanceof HTMLElement)) throw new Error("Editor: deletions column rows and gutter cells are out of step");
+				return {
+					content: child,
+					gutter: gutterChild
+				};
+			}
+		}
+	}
+	#cancelEditPrediction(removeRendered, notifyComponent = true) {
+		if (this.#editPredictionTimer !== void 0) {
+			clearTimeout(this.#editPredictionTimer);
+			this.#editPredictionTimer = void 0;
+		}
+		this.#editPredictionAbortController?.abort();
+		this.#editPredictionAbortController = void 0;
+		this.#editPredictionGeneration++;
+		this.#editPredictionRevealed = false;
+		this.#retryEditPredictionOnRender = false;
+		this.#editPrediction = void 0;
+		this.#syncEditPredictionSpacers(notifyComponent);
+		if (removeRendered) this.#removeRenderedEditPrediction();
+	}
+	#includesEditPredictionPath(path) {
+		const options = this.#options.editPrediction;
+		if (options === void 0) return false;
+		const normalizedPath = path.replaceAll("\\", "/");
+		return (options.include === void 0 || options.include.some((pattern) => matchesEditPredictionPattern(normalizedPath, pattern))) && options.exclude?.some((pattern) => matchesEditPredictionPattern(normalizedPath, pattern)) !== true;
+	}
+	#scheduleEditPrediction() {
+		this.#cancelEditPrediction(true);
+		const selection = this.#selections?.[0];
+		if (this.#options.editPrediction === void 0 || this.#editSession?.document === void 0 || this.#editSession?.fileInfo === void 0 || this.#selections?.length !== 1 || selection === void 0 || !isCollapsedSelection(selection)) return;
+		const document = this.#editSession?.document;
+		const cursorOffset = document.offsetAt(getCaretPosition(selection));
+		this.#editPredictionTimer = setTimeout(() => {
+			this.#editPredictionTimer = void 0;
+			const options = this.#options.editPrediction;
+			const currentSelection = this.#selections?.[0];
+			const path = this.#editSession?.fileInfo?.name;
+			if (options === void 0 || path === void 0 || this.#editSession?.document !== document || this.#selections?.length !== 1 || currentSelection === void 0 || !isCollapsedSelection(currentSelection) || document.offsetAt(getCaretPosition(currentSelection)) !== cursorOffset) return;
+			if (!this.#includesEditPredictionPath(path)) return;
+			const isLineEditable = (line) => this.#isLineInRenderRange(line) && this.#isLineRenderable(line);
+			if (!isLineEditable(getCaretPosition(currentSelection).line)) {
+				this.#retryEditPredictionOnRender = true;
+				return;
+			}
+			const request = buildEditPredictionRequest(path, document, cursorOffset, this.#editPredictionHistory, isLineEditable);
+			if (request === void 0) return;
+			const excerptStartOffset = document.offsetAt({
+				line: request.excerptStartLine,
+				character: 0
+			});
+			const editableStart = excerptStartOffset + request.editableRange.start;
+			const editableEnd = excerptStartOffset + request.editableRange.end;
+			const controller = new AbortController();
+			const generation = ++this.#editPredictionGeneration;
+			this.#editPredictionAbortController = controller;
+			let prediction;
+			try {
+				prediction = options.provider.predict(request, { signal: controller.signal });
+			} catch {
+				this.#editPredictionAbortController = void 0;
+				return;
+			}
+			Promise.resolve(prediction).then((response) => {
+				const selection = this.#selections?.[0];
+				if (controller.signal.aborted || generation !== this.#editPredictionGeneration || this.#editPredictionAbortController !== controller || this.#editSession?.document !== document || document.version !== request.version || this.#selections?.length !== 1 || selection === void 0 || !isCollapsedSelection(selection) || document.offsetAt(getCaretPosition(selection)) !== cursorOffset) return;
+				if (response == null || !Array.isArray(response.edits) || response.edits.length === 0 || response.edits.length > MAX_EDIT_PREDICTION_RESPONSE_EDITS || response.newCursor == null) return;
+				const resolvedEdits = [];
+				let responseBytes = 0;
+				for (const edit of response.edits) {
+					if (edit == null || typeof edit.newText !== "string" || !isValidEditPredictionPosition(document, edit.range?.start) || !isValidEditPredictionPosition(document, edit.range?.end) || comparePosition(edit.range.start, edit.range.end) > 0) return;
+					responseBytes += editPredictionTextEncoder.encode(edit.newText).byteLength;
+					if (responseBytes > MAX_EDIT_PREDICTION_RESPONSE_BYTES) return;
+					const start = document.offsetAt(edit.range.start);
+					const end = document.offsetAt(edit.range.end);
+					const resolvedEdit = document.resolveEdits([edit])[0];
+					if (resolvedEdit.start !== start || resolvedEdit.end !== end) return;
+					resolvedEdits.push(resolvedEdit);
+				}
+				resolvedEdits.sort((left, right) => {
+					const startDelta = left.start - right.start;
+					return startDelta === 0 ? left.end - right.end : startDelta;
+				});
+				for (let index = 0; index < resolvedEdits.length; index++) {
+					const edit = resolvedEdits[index];
+					if (edit.start < editableStart || edit.end > editableEnd || index > 0 && resolvedEdits[index - 1].end > edit.start) return;
+				}
+				const edits = resolvedEdits.filter((edit) => edit.text !== document.getTextSlice(edit.start, edit.end));
+				if (edits.length === 0) return;
+				const firstEditPosition = document.positionAt(edits[0].start);
+				const lastEditPosition = document.positionAt(edits.at(-1).end);
+				const affectedStart = document.offsetAt({
+					line: firstEditPosition.line,
+					character: 0
+				});
+				const affectedEnd = document.offsetAt({
+					line: lastEditPosition.line,
+					character: document.getLineLength(lastEditPosition.line)
+				});
+				const predictedParts = [];
+				let consumed = affectedStart;
+				for (const edit of edits) {
+					predictedParts.push(document.getTextSlice(consumed, edit.start), edit.text);
+					consumed = edit.end;
+				}
+				predictedParts.push(document.getTextSlice(consumed, affectedEnd));
+				const predictedLines = predictedParts.join("").split(/\r\n|\r|\n/);
+				const affectedEndLine = firstEditPosition.line + predictedLines.length - 1;
+				const lineDelta = predictedLines.length - (lastEditPosition.line - firstEditPosition.line + 1);
+				const newCursor = response.newCursor;
+				if (!Number.isInteger(newCursor.line) || !Number.isInteger(newCursor.character) || newCursor.line < 0 || newCursor.character < 0) return;
+				if (newCursor.line >= firstEditPosition.line && newCursor.line <= affectedEndLine) {
+					const line = predictedLines[newCursor.line - firstEditPosition.line];
+					if (newCursor.character > line.length || splitsSurrogatePair(line, newCursor.character)) return;
+				} else {
+					const originalLine = newCursor.line < firstEditPosition.line ? newCursor.line : newCursor.line - lineDelta;
+					if (originalLine < 0 || originalLine >= document.lineCount || newCursor.character > document.getLineLength(originalLine)) return;
+					const originalOffset = document.offsetAt({
+						line: originalLine,
+						character: newCursor.character
+					});
+					if (splitsSurrogatePair(document.charAt(originalOffset - 1) + document.charAt(originalOffset), 1)) return;
+				}
+				this.#editPrediction = {
+					document,
+					version: request.version,
+					cursorOffset,
+					rendered: false,
+					response: {
+						edits: edits.map((edit) => ({
+							range: {
+								start: document.positionAt(edit.start),
+								end: document.positionAt(edit.end)
+							},
+							newText: edit.text
+						})),
+						newCursor: { ...newCursor }
+					}
+				};
+				this.#updateSelections(this.#selections);
+			}).catch(() => {}).finally(() => {
+				if (this.#editPredictionAbortController === controller) this.#editPredictionAbortController = void 0;
+			});
+		}, EDIT_PREDICTION_DEBOUNCE_MS);
+	}
+	#recordEditPredictionHistory(change, source) {
+		const textDocument = this.#editSession?.document;
+		const path = this.#editSession?.fileInfo?.name;
+		const transaction = getTextDocumentChangeTransaction(change);
+		if (textDocument === void 0 || path === void 0 || transaction === void 0 || !this.#includesEditPredictionPath(path)) return;
+		this.#editPredictionHistory = recordEditPrediction(this.#editPredictionHistory, path, textDocument, transaction, source);
+	}
+	#acceptEditPrediction() {
+		const prediction = this.#editPrediction;
+		const textDocument = this.#editSession?.document;
+		const selection = this.#selections?.[0];
+		if (prediction === void 0 || !prediction.rendered || textDocument === void 0 || prediction.document !== textDocument || prediction.version !== textDocument.version || this.#selections?.length !== 1 || selection === void 0 || !isCollapsedSelection(selection) || textDocument.offsetAt(getCaretPosition(selection)) !== prediction.cursorOffset) return;
+		const { edits, newCursor } = prediction.response;
+		this.#cancelEditPrediction(true);
+		const change = textDocument.applyEdits(edits.map((edit) => ({
+			range: {
+				start: { ...edit.range.start },
+				end: { ...edit.range.end }
+			},
+			newText: edit.newText
+		})), true, this.#selections, void 0, true);
+		if (change === void 0) {
+			this.#scheduleEditPrediction();
+			return;
+		}
+		const cursor = textDocument.normalizePosition(newCursor);
+		const nextSelections = [{
+			start: cursor,
+			end: cursor,
+			direction: 0
+		}];
+		textDocument.setLastUndoSelectionsAfter(nextSelections);
+		this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change), { editSource: "prediction" });
+	}
+	#renderEditPrediction(renderCtx) {
+		const prediction = this.#editPrediction;
+		const textDocument = this.#editSession?.document;
+		if (prediction !== void 0) prediction.rendered = false;
+		const composed = this.#getEditPredictionGroups();
+		if (prediction == null || textDocument == null || composed == null || !composed.allVisible) return;
+		for (const group of composed.groups) {
+			const { edit, endIndex } = group;
+			const { start, end } = edit.range;
+			const isDeletion = edit.newText.length === 0;
+			const isReplacement = comparePosition(start, end) !== 0;
+			const lineLength = textDocument.getLineLength(start.line);
+			const isMidLineInsertion = !isReplacement && start.character < lineLength;
+			if (isReplacement) this.#renderSelection(renderCtx, isDeletion ? "editPredictionDeletion" : "editPredictionReplacement", {
+				start,
+				end
+			});
+			else if (isMidLineInsertion) this.#renderSelection(renderCtx, "editPredictionInsertion", {
+				start,
+				end: {
+					line: start.line,
+					character: lineLength
+				}
+			});
+			if (isDeletion) continue;
+			const [anchorLeft, anchorWrapLine] = this.#getCharX(start.line, start.character);
+			const lineLeft = this.#getCharX(start.line, 0)[0];
+			const anchorTop = this.#getLineY(start.line) + anchorWrapLine * this.#metrics.lineHeight;
+			const key = `editPrediction-${endIndex}`;
+			let element = this.#overlayElements?.get(key);
+			if (element !== void 0) {
+				this.#overlayElements?.delete(key);
+				element.replaceChildren();
+			} else element = h("span", {
+				ariaHidden: "true",
+				contentEditable: "false",
+				dataset: "editPrediction"
+			}, renderCtx.fragment);
+			if (isReplacement) {
+				element.dataset.replacement = "";
+				const lineElement = this.#getLineElement(start.line);
+				if (lineElement !== void 0) element.style.setProperty("--diffs-edit-prediction-bg", getComputedStyle(lineElement).getPropertyValue("--diffs-line-bg"));
+			} else {
+				delete element.dataset.replacement;
+				element.style.removeProperty("--diffs-edit-prediction-bg");
+			}
+			this.#fillGhostTextElement(element, edit.newText, anchorLeft, lineLeft, this.#cloneInsertionSuffix(group));
+			element.style.transform = `translateX(${lineLeft}px) translateY(${anchorTop}px)`;
+			renderCtx.elements.set(key, element);
+		}
+		prediction.rendered = true;
+	}
 	#updateSelections(selections) {
 		this.__postponeBgTokenizeToNextFrame();
+		const previousSelections = this.#selections;
+		let selectionsChanged = previousSelections?.length !== selections.length;
+		if (!selectionsChanged && previousSelections !== void 0) for (let i = 0; i < selections.length; i++) {
+			const previous = previousSelections[i];
+			const next = selections[i];
+			if (previous.direction !== next.direction || comparePosition(previous.start, next.start) !== 0 || comparePosition(previous.end, next.end) !== 0) {
+				selectionsChanged = true;
+				break;
+			}
+		}
+		if (selectionsChanged) this.#cancelEditPrediction(true);
+		this.#syncEditPredictionSpacers();
 		this.#primaryCaretElement = void 0;
 		this.#setEditorActiveLineSafe(null);
 		if (selections.length === 0 && this.#matches === void 0 && this.#markerRenderer === void 0) {
@@ -2151,6 +2757,7 @@ var Editor = class {
 			this.#overlayElements?.clear();
 			this.#selectionAction?.cleanup();
 			this.#selectionAction = void 0;
+			if (selectionsChanged) this.#scheduleEditPrediction();
 			return;
 		}
 		const fragment = document.createDocumentFragment();
@@ -2169,14 +2776,14 @@ var Editor = class {
 				if (!isCollapsedSelection(selection)) this.#renderSelection(renderCtx, "selection", selection);
 				this.#renderCaret(renderCtx, selection, selection === primarySelection);
 			}
-			const bracketMatchRanges = this.#options.matchBrackets !== false && this.#textDocument !== void 0 && this.#tokenizer !== void 0 && isCollapsedSelection(primarySelection) ? findBracketMatchRanges(this.#textDocument, this.#tokenizer, primarySelection.start) : void 0;
+			const bracketMatchRanges = this.#options.matchBrackets !== false && this.#editSession?.document != null && this.#tokenizer !== void 0 && isCollapsedSelection(primarySelection) ? findBracketMatchRanges(this.#editSession?.document, this.#tokenizer, primarySelection.start) : void 0;
 			if (bracketMatchRanges !== void 0) for (const range of bracketMatchRanges) this.#renderSelection(renderCtx, "bracketMatch", range);
 		}
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		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 renderedLineRanges = renderRange != null && Number.isFinite(renderRange.totalLines) || this.#isDiff && this.#fileDiffInstance?.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;
@@ -2221,14 +2828,70 @@ var Editor = class {
 			}
 		}
 		if (this.#markerRenderer !== void 0 && textDocument !== void 0) for (const marker of this.#markerRenderer.markers) this.#renderSelection(renderCtx, "marker", marker, markerSeverityDatasetKey(marker.severity));
+		this.#renderEditPrediction(renderCtx);
 		this.#overlayElement?.appendChild(fragment);
 		this.#overlayElements?.forEach((el) => el.remove());
 		this.#overlayElements?.clear();
 		this.#overlayElements = renderCtx.elements;
 		this.#updateSelectionActionPopover();
+		if (selectionsChanged) this.#scheduleEditPrediction();
 	}
-	#renderSelection(renderCtx, type, range, extraDataset) {
-		if (this.#textDocument === void 0) return;
+	#renderCarets() {
+		const carets = this.#carets;
+		const renderCaret = this.#options.renderCaret;
+		const overlayElement = this.#overlayElement;
+		this.#caretHighlightElements?.forEach((element) => element.remove());
+		this.#caretHighlightElements = void 0;
+		if (carets === void 0 || renderCaret === void 0 || overlayElement === void 0) {
+			this.#caretElements?.forEach((element) => element.remove());
+			this.#caretElements = void 0;
+			return;
+		}
+		const elements = this.#caretElements ??= /* @__PURE__ */ new Map();
+		for (const [trackedCaret, element] of elements) if (!this.#isLineVisible(trackedCaret.caret.focus.line)) {
+			element.remove();
+			elements.delete(trackedCaret);
+		}
+		const fragment = document.createDocumentFragment();
+		const highlightElements = [];
+		for (const trackedCaret of carets) {
+			const { caret } = trackedCaret;
+			const { line, character } = caret.focus;
+			if (trackedCaret.anchorOffset !== trackedCaret.focusOffset) {
+				const highlightContext = {
+					fragment,
+					elements: /* @__PURE__ */ new Map()
+				};
+				this.#renderSelection(highlightContext, "caretHighlight", trackedCaret.anchorOffset < trackedCaret.focusOffset ? {
+					start: caret.anchor,
+					end: caret.focus
+				} : {
+					start: caret.focus,
+					end: caret.anchor
+				}, void 0, caret.focus);
+				for (const highlightElement of highlightContext.elements.values()) {
+					highlightElement.style.setProperty("--diffs-caret-highlight-bg", `color-mix(in srgb, ${caret.metadata.color} 32%, transparent)`);
+					highlightElements.push(highlightElement);
+				}
+			}
+			if (!this.#isLineVisible(line)) continue;
+			let element = elements.get(trackedCaret);
+			if (element === void 0) {
+				element = h("div", {
+					dataset: "remoteCaret",
+					children: [renderCaret(caret)]
+				}, fragment);
+				elements.set(trackedCaret, element);
+			}
+			const [left, wrapLine] = this.#getCharX(line, character);
+			const top = this.#getLineY(line) + wrapLine * this.#metrics.lineHeight;
+			element.style.transform = `translateX(${left}px) translateY(${top}px)`;
+		}
+		this.#caretHighlightElements = highlightElements;
+		overlayElement.appendChild(fragment);
+	}
+	#renderSelection(renderCtx, type, range, extraDataset, connectedCaret) {
+		if (this.#editSession?.document == null) return;
 		const { start, end } = range;
 		let firstLine = start.line;
 		let endLine = end.line + 1;
@@ -2241,12 +2904,18 @@ var Editor = class {
 			if (!this.#isLineVisible(line)) continue;
 			const isLastLine = line === end.line;
 			const startChar = line === start.line ? start.character : 0;
-			const endChar = isLastLine ? end.character : this.#textDocument.getLineLength(line);
+			const endChar = isLastLine ? end.character : this.#editSession?.document.getLineLength(line);
+			if (startChar === endChar && (type === "editPredictionDeletion" || type === "editPredictionReplacement")) {
+				if (isLastLine && line !== start.line) continue;
+				const [left, wrapLine] = this.#getCharX(line, startChar);
+				this.#renderSelectionBlock(renderCtx, type, line, wrapLine, left, this.#metrics.ch, extraDataset);
+				continue;
+			}
 			if (this.#isWrap) {
 				const contentWidth = this.#getContentWidth();
-				const lineText = this.#textDocument.getLineText(line);
+				const lineText = this.#editSession?.document.getLineText(line);
 				if (2 * this.#metrics.ch + this.#metrics.measureTextWidth(lineText) > contentWidth) {
-					this.#renderWrappedSelection(renderCtx, line, lineText, startChar, endChar, isLastLine, type, extraDataset);
+					this.#renderWrappedSelection(renderCtx, line, lineText, startChar, endChar, isLastLine, type, extraDataset, connectedCaret);
 					continue;
 				}
 			}
@@ -2258,10 +2927,13 @@ var Editor = class {
 			if (!isLastLine && type === "selection") paddingEnd = this.#metrics.ch;
 			if (startChar === endChar) width = paddingEnd;
 			else width = this.#getCharX(line, endChar)[0] - left + paddingEnd;
-			this.#renderSelectionBlock(renderCtx, type, line, 0, left, width, extraDataset);
+			this.#renderSelectionBlock(renderCtx, type, line, 0, left, width, extraDataset, {
+				start: connectedCaret?.line === start.line && connectedCaret.character === start.character && line === start.line,
+				end: connectedCaret?.line === end.line && connectedCaret.character === end.character && line === end.line
+			});
 		}
 	}
-	#renderWrappedSelection(renderCtx, line, lineText, startChar, endChar, isLastLine, type, extraDataset) {
+	#renderWrappedSelection(renderCtx, line, lineText, startChar, endChar, isLastLine, type, extraDataset, connectedCaret) {
 		const wrapOffsets = this.#wrapLineTextOrWholeLine(line);
 		const segmentCount = wrapOffsets.length - 1;
 		const offsetLeft = this.#getGutterWidth() + this.#metrics.ch + (this.#activeContentOffset?.left ?? 0);
@@ -2276,7 +2948,10 @@ var Editor = class {
 			let paddingEnd = 0;
 			if (!isLastLine && wrapLine === segmentCount - 1 && type === "selection") paddingEnd = this.#metrics.ch;
 			const segmentWidth = wrapStartChar === wrapEndChar ? paddingEnd : this.#segmentTextWidth(lineText, segmentStart, wrapEndChar) - segmentStartWidth + paddingEnd;
-			this.#renderSelectionBlock(renderCtx, type, line, wrapLine, segmentLeft, segmentWidth, extraDataset);
+			this.#renderSelectionBlock(renderCtx, type, line, wrapLine, segmentLeft, segmentWidth, extraDataset, {
+				start: connectedCaret?.line === line && connectedCaret.character === startChar && wrapStartChar === startChar,
+				end: connectedCaret?.line === line && connectedCaret.character === endChar && wrapEndChar === endChar
+			});
 		}
 	}
 	#segmentTextWidth(lineText, segmentStart, character) {
@@ -2285,13 +2960,13 @@ var Editor = class {
 		const asciiColumns = getExpandedAsciiTextColumns(segmentText, this.#metrics.tabSize);
 		return asciiColumns !== -1 ? asciiColumns * this.#metrics.ch : this.#metrics.measureTextWidth(segmentText);
 	}
-	#renderSelectionBlock(renderCtx, type, line, wrapLine, left, width, extraDataset) {
+	#renderSelectionBlock(renderCtx, type, line, wrapLine, left, width, extraDataset, connectedCaretEdge) {
 		if (width === 0) return;
 		const { ch, lineHeight } = this.#metrics;
 		const y = this.#getLineY(line) + wrapLine * lineHeight;
 		const cacheKey = `${type}-${line}/${wrapLine}-${left}-${width} ${extraDataset ?? ""}`;
 		const overlayEls = this.#overlayElements;
-		const rounded = (this.#options.roundedSelection ?? true) && type === "selection";
+		const rounded = (this.#options.roundedSelection ?? true) && (type === "selection" || type === "caretHighlight");
 		const addRoundedCorner = (line, wrapLine, left, radius) => {
 			const top = this.#getLineY(line) + wrapLine * lineHeight;
 			const lineElement = this.#getLineElement(line);
@@ -2321,7 +2996,7 @@ var Editor = class {
 				cornerEl.style.cssText = css;
 				overlayEls.delete(cacheKey);
 			} else cornerEl = h("div", {
-				dataset: "selectionRange",
+				dataset: type === "caretHighlight" ? "caretHighlightRange" : "selectionRange",
 				style: { cssText: css },
 				children: [h("div", { dataset })]
 			}, renderCtx.fragment);
@@ -2366,6 +3041,14 @@ var Editor = class {
 				dataset.rbl = "";
 				dataset.rbr = "";
 			}
+			if (connectedCaretEdge?.start === true) {
+				delete dataset.rtl;
+				delete dataset.rbl;
+			}
+			if (connectedCaretEdge?.end === true) {
+				delete dataset.rtr;
+				delete dataset.rbr;
+			}
 		};
 		let rangeEl = renderCtx.elements.get(cacheKey);
 		if (rangeEl !== void 0) {
@@ -2378,6 +3061,10 @@ var Editor = class {
 		} else rangeEl = h("div", { dataset: extraDataset ? [type + "Range", extraDataset] : type + "Range" }, renderCtx.fragment);
 		rangeEl.style.width = `${width}px`;
 		rangeEl.style.transform = `translateX(${left}px) translateY(${y}px)`;
+		if (type === "editPredictionInsertion" || type === "editPredictionReplacement") {
+			const lineElement = this.#getLineElement(line);
+			if (lineElement !== void 0) rangeEl.style.setProperty("--diffs-edit-prediction-bg", getComputedStyle(lineElement).getPropertyValue("--diffs-line-bg"));
+		} else rangeEl.style.removeProperty("--diffs-edit-prediction-bg");
 		if (rounded) addRadiusStyle(rangeEl);
 		renderCtx.elements.set(cacheKey, rangeEl);
 	}
@@ -2400,7 +3087,7 @@ var Editor = class {
 	#updateSelectionActionPopover() {
 		const primarySelection = this.#selections?.at(-1);
 		const overlayElement = this.#overlayElement;
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		const renderSelectionAction = this.#options.renderSelectionAction;
 		const cleanup = () => {
 			this.#selectionAction?.cleanup();
@@ -2424,7 +3111,7 @@ var Editor = class {
 					return getActiveSelection();
 				},
 				applyEdits: (edits) => this.applyEdits(edits),
-				getSelectionText: () => this.#textDocument?.getText(getActiveSelection()) ?? "",
+				getSelectionText: () => this.#editSession?.document?.getText(getActiveSelection()) ?? "",
 				replaceSelectionText: (text) => {
 					this.#replaceSelectionText(text, [getActiveSelection()]);
 				},
@@ -2494,7 +3181,7 @@ var Editor = class {
 	}
 	#renderSearchPanel(mode) {
 		this.#searchPanel?.cleanup();
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		const preElement = this.#fileContainer?.shadowRoot?.querySelector("pre");
 		const selections = this.#selections;
 		if (textDocument === void 0 || preElement == null) return;
@@ -2577,13 +3264,13 @@ var Editor = class {
 		this.#retainSearchPanelFocus = false;
 	}
 	#getSelectionText() {
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		const selections = this.#selections;
 		if (textDocument === void 0 || selections === void 0) return "";
 		return getSelectionText(textDocument, selections);
 	}
 	#getSelectionClipboardTexts() {
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		const selections = this.#selections;
 		if (textDocument === void 0 || selections === void 0) return [];
 		return getSelectionClipboardTexts(textDocument, selections);
@@ -2595,7 +3282,7 @@ var Editor = class {
 		if (selectionTexts.length > 1) clipboardData.setData(MULTI_SELECTION_CLIPBOARD_TYPE, JSON.stringify(selectionTexts));
 	}
 	#cutSelectionText() {
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		const selections = this.#selections;
 		if (textDocument === void 0 || selections === void 0 || selections.length === 0) return "";
 		if (selections.some((selection) => isCollapsedSelection(selection))) {
@@ -2608,7 +3295,7 @@ var Editor = class {
 		return text;
 	}
 	#applySelectionCutEdits(edits, nextSelectionOffsets) {
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		const selections = this.#selections;
 		if (textDocument === void 0 || selections === void 0 || edits.length === 0) return;
 		const change = textDocument.applyResolvedEdits(edits, true, selections, void 0, true);
@@ -2626,7 +3313,7 @@ var Editor = class {
 	}
 	#replaceSelectionText(text, selections = this.#selections, undoBoundary = false, textOrder = "selection") {
 		if (selections === void 0) return;
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		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, textOrder) : applyTextChangeToSelections(textDocument, selections, {
@@ -2638,14 +3325,14 @@ var Editor = class {
 	}
 	#deleteSelectionText(forward = false) {
 		const selections = this.#selections;
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		if (selections === void 0 || textDocument === void 0) return;
 		const { nextSelections, change } = applyDeleteCharacterToSelections(textDocument, selections, forward, this.#lineAnnotations, this.#metrics.tabSize);
 		if (change !== void 0) this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
 	}
 	#deleteSoftLineBackward() {
 		const selections = this.#selections;
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		if (selections === void 0 || textDocument === void 0) return;
 		const { nextSelections, change } = applyDeleteSoftLineBackwardToSelections(textDocument, selections, this.#isWrap ? (line, character) => {
 			const wrapOffsets = this.#wrapLineTextOrWholeLine(line);
@@ -2660,35 +3347,33 @@ var Editor = class {
 	}
 	#deleteWordBackward() {
 		const selections = this.#selections;
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		if (selections === void 0 || textDocument === void 0) return;
 		const { nextSelections, change } = applyDeleteWordBackwardToSelections(textDocument, selections, this.#lineAnnotations);
 		if (change !== void 0) this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
 	}
 	#deleteHardLineForward() {
 		const selections = this.#selections;
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		if (selections === void 0 || textDocument === void 0) return;
 		const { nextSelections, change } = applyDeleteHardLineForwardToSelections(textDocument, selections, this.#lineAnnotations);
 		if (change !== void 0) this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
 	}
 	#insertTranspose() {
 		const selections = this.#selections;
-		const textDocument = this.#textDocument;
+		const textDocument = this.#editSession?.document;
 		if (selections === void 0 || textDocument === void 0) return;
 		const { nextSelections, change } = applyTransposeToSelections(textDocument, selections, this.#lineAnnotations);
 		if (change !== void 0) this.#applyChange(change, nextSelections, this.#applyChangeToLineAnnotations(change));
 	}
 	#applyChange(change, newSelections, newLineAnnotations, options) {
-		const fileRef = this.getFile();
-		const onChange = this.#options.onChange;
-		if (fileRef !== void 0 && onChange !== void 0) {
-			const lineAnnotations = newLineAnnotations ?? this.#lineAnnotations;
-			onChange(fileRef, lineAnnotations, {
-				changes: change.changes,
-				file: fileRef,
-				lineAnnotations
-			});
+		if (this.#editPrediction != null) this.#cancelEditPrediction(true);
+		const textDocument = this.#editSession?.document;
+		if (textDocument !== void 0 && this.#carets !== void 0) for (const trackedCaret of this.#carets) {
+			trackedCaret.anchorOffset = remapOffsetThroughEdits(trackedCaret.anchorOffset, change.changes);
+			trackedCaret.focusOffset = remapOffsetThroughEdits(trackedCaret.focusOffset, change.changes);
+			trackedCaret.caret.anchor = textDocument.positionAt(trackedCaret.anchorOffset);
+			trackedCaret.caret.focus = textDocument.positionAt(trackedCaret.focusOffset);
 		}
 		if (change.lineDelta !== 0 || this.#isWrap) {
 			for (const line of this.#lineYCache.keys()) if (line >= change.startLine) this.#lineYCache.delete(line);
@@ -2717,9 +3402,13 @@ var Editor = class {
 			}
 		}
 		this.#rerender(change, newLineAnnotations, renderRange, shouldUpdateBuffer);
+		if (newSelections != null) this.#updateSelections(newSelections);
+		this.#checkpointEditSessionState();
+		this.#recordEditPredictionHistory(change, options?.editSource ?? "user");
+		this.#scheduleEditPrediction();
+		this.#emitChange(change.changes, newLineAnnotations ?? this.#lineAnnotations);
 		if (options?.skipSearchRefresh !== true && this.#searchPanel !== void 0 && this.#matches !== void 0) this.#searchPanel.updateMatches({ syncSelection: false });
-		if (newSelections !== void 0) {
-			this.#updateSelections(newSelections);
+		if (newSelections != null) {
 			if (options?.skipFocus !== true) {
 				const revealTarget = newSelections.at(-1);
 				if (revealTarget !== void 0) this.#revealLineIfCollapsed(getCaretPosition(revealTarget).line);
@@ -2737,11 +3426,17 @@ var Editor = class {
 			}
 		}
 	}
+	#emitChange(changes, lineAnnotations) {
+		const file = this.getFile();
+		const publishChange = this.#publishChange;
+		if (file == null || publishChange == null) return;
+		publishChange(changes, file, lineAnnotations);
+	}
 	#applyChangeToLineAnnotations(change) {
-		if (this.#lineAnnotations !== void 0) {
+		if (this.#lineAnnotations != null) {
 			const nextLineAnnotations = applyDocumentChangeToLineAnnotations(change, this.#lineAnnotations);
-			if (nextLineAnnotations !== void 0) {
-				this.#textDocument?.setLastUndoLineAnnotations(this.#lineAnnotations, nextLineAnnotations);
+			if (nextLineAnnotations != null) {
+				this.#editSession?.document?.setLastUndoLineAnnotations(this.#lineAnnotations, nextLineAnnotations);
 				return nextLineAnnotations;
 			}
 		}
@@ -2762,11 +3457,15 @@ var Editor = class {
 		}
 		return ranges;
 	}
+	#isLineInRenderRange(line) {
+		const renderRange = this.#renderRange;
+		return renderRange == null || line >= renderRange.startingLine && line < renderRange.startingLine + renderRange.totalLines;
+	}
 	#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;
+		if (!this.#isLineInRenderRange(line)) return;
 		const contentElement = this.#contentElement;
 		if (contentElement === void 0) return;
 		if (renderRange !== void 0) {
@@ -2817,7 +3516,7 @@ var Editor = class {
 	}
 	#getCharX(line, char) {
 		if (this.#lastAccessedCharX !== void 0 && this.#lastAccessedCharX[0] === line && this.#lastAccessedCharX[1] === char) return [this.#lastAccessedCharX[2], this.#lastAccessedCharX[3]];
-		const lineText = this.#textDocument?.getLineText(line);
+		const lineText = this.#editSession?.document?.getLineText(line);
 		const offsetLeft = this.#getGutterWidth() + this.#metrics.ch;
 		if (lineText === void 0 || lineText.length === 0 || char <= 0) return [offsetLeft + (this.#activeContentOffset?.left ?? 0), 0];
 		const boundedCharacter = snapTextOffsetToUnicodeBoundary(lineText, Math.min(char, lineText.length));
@@ -2863,7 +3562,7 @@ var Editor = class {
 		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);
+		const lineText = this.#editSession?.document?.getLineText(line);
 		if (lineText === void 0 || lineText.length === 0) {
 			const offsets = new Uint32Array([0]);
 			this.#wrapLineOffsetsCache.set(line, offsets);
@@ -2901,7 +3600,8 @@ var Editor = class {
 			const measureGrapheme = (index) => {
 				range.setStart(textNode, graphemeStart(index));
 				range.setEnd(textNode, graphemeStart(index + 1));
-				return range.getBoundingClientRect();
+				const clientRects = range.getClientRects();
+				return clientRects.item(clientRects.length - 1) ?? range.getBoundingClientRect();
 			};
 			starts.push(0);
 			let lastTop = measureGrapheme(0).top;
@@ -2933,7 +3633,7 @@ var Editor = class {
 	#wrapLineTextOrWholeLine(line) {
 		const offsets = this.#wrapLineText(line);
 		if (offsets !== void 0) return offsets;
-		const length = this.#textDocument?.getLineText(line)?.length ?? 0;
+		const length = this.#editSession?.document?.getLineText(line)?.length ?? 0;
 		return Uint32Array.of(0, length);
 	}
 	#rangeBelongsToEditor({ startContainer, endContainer }) {
@@ -2942,11 +3642,31 @@ var Editor = class {
 		return contentEl.contains(startContainer) && contentEl.contains(endContainer);
 	}
 	#isLineVisible(line) {
-		const lineCount = this.#textDocument?.lineCount ?? 0;
+		const lineCount = this.#editSession?.document?.lineCount ?? 0;
 		if (line < 0 || line >= lineCount) return false;
 		return this.#getLineElement(line) !== void 0;
 	}
 };
+function getEditSession({ type, editStateKey, owner, initialState, previousSession }) {
+	if (initialState != null && initialState.type !== type) throw new TypeError(`Editor: initialState: a ${initialState.type} state cannot initialize a ${type} editor`);
+	const initialSession = initialState;
+	if (editStateKey != null) return EditStateManager.activate(type, editStateKey, owner, initialSession);
+	if (initialSession != null) return initialSession;
+	if (previousSession != null) return previousSession;
+	return type === "file" ? { type: "file" } : { type: "file-diff" };
+}
+function gridTrackSpan(child) {
+	if (!(child instanceof HTMLElement)) return 1;
+	return Number(child.dataset.bufferSize ?? 1);
+}
+function isValidEditPredictionPosition(document, position) {
+	return position !== void 0 && Number.isInteger(position.line) && Number.isInteger(position.character) && position.line >= 0 && position.line < document.lineCount && position.character >= 0 && position.character <= document.getLineLength(position.line);
+}
+function splitsSurrogatePair(text, offset) {
+	const previous = text.charCodeAt(offset - 1);
+	const next = text.charCodeAt(offset);
+	return offset > 0 && offset < text.length && previous >= 55296 && previous <= 56319 && next >= 56320 && next <= 57343;
+}
 //#endregion
 export { Editor };