@pierre/diffs 1.3.0-beta.10 → 1.3.0-beta.11

package/dist/editor/editStack.js

@@ -1,11 +1,15 @@
 //#region src/editor/editStack.ts
 /** Largest number of undo or redo entries kept; oldest entries drop first once exceeded. */
 const DEFAULT_EDIT_STACK_MAX_ENTRIES = 100;
+const COALESCING_MODE_INSERT = 1;
+const COALESCING_MODE_BACKSPACE = 2;
+const COALESCING_MODE_DELETE = 3;
 /** A stack of edit entries. */
 var EditStack = class {
 	#undoStack = [];
 	#redoStack = [];
 	#maxEntries;
+	#canCoalesce = false;
 	constructor(options) {
 		this.#maxEntries = Math.max(1, options?.maxEntries ?? DEFAULT_EDIT_STACK_MAX_ENTRIES);
 	}
@@ -19,6 +23,7 @@ var EditStack = class {
 	clear() {
 		this.#undoStack.length = 0;
 		this.#redoStack.length = 0;
+		this.#canCoalesce = false;
 	}
 	/** Clears the redo stack. */
 	clearRedo() {
@@ -28,6 +33,7 @@ var EditStack = class {
 	push(entry) {
 		this.#undoStack.push(entry);
 		this.clearRedo();
+		this.#canCoalesce = true;
 		if (this.#undoStack.length > this.#maxEntries) this.#undoStack.shift();
 	}
 	/** Sets the selections after the last undo entry. */
@@ -47,6 +53,10 @@ var EditStack = class {
 	peekUndo() {
 		return this.#undoStack[this.#undoStack.length - 1];
 	}
+	/** Returns the last undo entry only while its coalescing group is open. */
+	peekUndoForCoalescing() {
+		return this.#canCoalesce ? this.peekUndo() : void 0;
+	}
 	/** Replaces the last undo entry with the given entry. */
 	replaceLastUndo(entry) {
 		if (this.#undoStack.length === 0) {
@@ -55,12 +65,14 @@ var EditStack = class {
 		}
 		this.#undoStack[this.#undoStack.length - 1] = entry;
 		this.clearRedo();
+		this.#canCoalesce = true;
 	}
 	/** Moves the latest undo entry to the redo stack and returns it, or `undefined` if empty. */
 	popUndoToRedo() {
 		const entry = this.#undoStack.pop();
 		if (entry !== void 0) {
 			this.#redoStack.push(entry);
+			this.#canCoalesce = false;
 			return entry;
 		}
 	}
@@ -69,6 +81,7 @@ var EditStack = class {
 		const entry = this.#redoStack.pop();
 		if (entry !== void 0) {
 			this.#undoStack.push(entry);
+			this.#canCoalesce = false;
 			return entry;
 		}
 	}
@@ -76,6 +89,30 @@ var EditStack = class {
 function createEditStackEntry(textDocument, resolvedEdits, versionBefore, versionAfter, selectionsBefore, selectionsAfter, lineAnnotationsBefore, lineAnnotationsAfter) {
 	const forwardEdits = [...resolvedEdits].sort((a, b) => a.start - b.start);
 	const inverseEdits = [];
+	let coalescingMode;
+	if (selectionsBefore?.length === forwardEdits.length) {
+		const caretOffsets = [];
+		for (const selection of selectionsBefore) {
+			if (selection.start.line !== selection.end.line || selection.start.character !== selection.end.character) break;
+			caretOffsets.push(textDocument.offsetAt(selection.start));
+		}
+		if (caretOffsets.length === forwardEdits.length) {
+			caretOffsets.sort((a, b) => a - b);
+			let isBackspace = true;
+			let isDelete = true;
+			for (let i = 0; i < forwardEdits.length; i++) {
+				const edit = forwardEdits[i];
+				if (edit.text.length > 0 || edit.start === edit.end) {
+					isBackspace = false;
+					isDelete = false;
+					break;
+				}
+				isBackspace &&= caretOffsets[i] === edit.end;
+				isDelete &&= caretOffsets[i] === edit.start;
+			}
+			coalescingMode = isBackspace ? COALESCING_MODE_BACKSPACE : isDelete ? COALESCING_MODE_DELETE : void 0;
+		}
+	}
 	for (let i = 0, offsetDelta = 0; i < forwardEdits.length; i++) {
 		const edit = forwardEdits[i];
 		const replacedText = textDocument.getTextSlice(edit.start, edit.end);
@@ -95,7 +132,8 @@ function createEditStackEntry(textDocument, resolvedEdits, versionBefore, versio
 		selectionsBefore: selectionsBefore?.map((selection) => ({ ...selection })),
 		selectionsAfter: selectionsAfter?.map((selection) => ({ ...selection })),
 		lineAnnotationsBefore: lineAnnotationsBefore?.slice(),
-		lineAnnotationsAfter: lineAnnotationsAfter?.slice()
+		lineAnnotationsAfter: lineAnnotationsAfter?.slice(),
+		coalescingMode
 	};
 }
 /** Determines if the change matches following modes:
@@ -116,21 +154,19 @@ function shouldCoalesceEditStackEntry(previousEntry, nextEntry) {
 		const nextIsInsert = nextForward.start === nextForward.end && nextForward.text.length > 0 && !nextForward.text.includes("\n") && nextInverse.text.length === 0;
 		if (previousWasInsert && nextIsInsert) {
 			if (nextForward.start !== previousInverse.end) return false;
-			mode ??= "insert";
-			if (mode !== "insert") return false;
+			mode ??= COALESCING_MODE_INSERT;
+			if (mode !== COALESCING_MODE_INSERT || previousEntry.coalescingMode !== void 0 && previousEntry.coalescingMode !== COALESCING_MODE_INSERT || nextEntry.coalescingMode !== void 0 && nextEntry.coalescingMode !== COALESCING_MODE_INSERT) return false;
 			continue;
 		}
 		const previousWasDelete = previousForward.text.length === 0 && previousForward.end > previousForward.start && previousInverse.text.length > 0;
 		const nextIsDelete = nextForward.text.length === 0 && nextForward.end > nextForward.start && nextInverse.text.length > 0;
 		if (previousWasDelete && nextIsDelete) {
-			if (mappedNextStart === previousForward.end) {
-				mode ??= "delete";
-				if (mode !== "delete") return false;
-				continue;
-			}
-			if (mappedNextStart + (nextForward.end - nextForward.start) !== previousForward.start) return false;
-			mode ??= "backspace";
-			if (mode !== "backspace") return false;
+			let nextMode;
+			if (mappedNextStart === previousForward.end) nextMode = COALESCING_MODE_DELETE;
+			else if (mappedNextStart + (nextForward.end - nextForward.start) !== previousForward.start) return false;
+			else nextMode = COALESCING_MODE_BACKSPACE;
+			mode ??= nextMode;
+			if (mode !== nextMode || previousEntry.coalescingMode !== void 0 && previousEntry.coalescingMode !== nextMode || nextEntry.coalescingMode !== void 0 && nextEntry.coalescingMode !== nextMode) return false;
 			continue;
 		}
 		return false;
@@ -141,6 +177,7 @@ function shouldCoalesceEditStackEntry(previousEntry, nextEntry) {
 function coalesceEditStackEntries(previousEntry, nextEntry) {
 	const forwardEdits = [];
 	const replacedTexts = [];
+	let coalescingMode;
 	for (let i = 0; i < previousEntry.forwardEdits.length; i++) {
 		const previousForward = previousEntry.forwardEdits[i];
 		const previousInverse = previousEntry.inverseEdits[i];
@@ -148,6 +185,7 @@ function coalesceEditStackEntries(previousEntry, nextEntry) {
 		const nextInverse = nextEntry.inverseEdits[i];
 		const mappedNextStart = mapOffsetAfterForwardBatchToBefore(nextForward.start, previousEntry.forwardEdits);
 		if (previousForward.text.length > 0) {
+			coalescingMode ??= COALESCING_MODE_INSERT;
 			forwardEdits.push({
 				start: previousForward.start,
 				end: previousForward.end,
@@ -157,6 +195,7 @@ function coalesceEditStackEntries(previousEntry, nextEntry) {
 			continue;
 		}
 		if (mappedNextStart === previousForward.end) {
+			coalescingMode ??= COALESCING_MODE_DELETE;
 			forwardEdits.push({
 				start: previousForward.start,
 				end: mappedNextStart + (nextForward.end - nextForward.start),
@@ -165,6 +204,7 @@ function coalesceEditStackEntries(previousEntry, nextEntry) {
 			replacedTexts.push(previousInverse.text + nextInverse.text);
 			continue;
 		}
+		coalescingMode ??= COALESCING_MODE_BACKSPACE;
 		forwardEdits.push({
 			start: Math.min(previousForward.start, mappedNextStart),
 			end: previousForward.end,
@@ -180,7 +220,8 @@ function coalesceEditStackEntries(previousEntry, nextEntry) {
 		selectionsBefore: previousEntry.selectionsBefore?.slice(),
 		selectionsAfter: nextEntry.selectionsAfter?.slice(),
 		lineAnnotationsBefore: previousEntry.lineAnnotationsBefore?.slice(),
-		lineAnnotationsAfter: nextEntry.lineAnnotationsAfter?.slice()
+		lineAnnotationsAfter: nextEntry.lineAnnotationsAfter?.slice(),
+		coalescingMode
 	};
 }
 function buildInverseEditsFromReplacedTexts(forwardEdits, replacedTexts) {

package/dist/editor/editStack.js.map

@@ -1 +1 @@
-{"version":3,"file":"editStack.js","names":["#maxEntries","#undoStack","#redoStack"],"sources":["../../src/editor/editStack.ts"],"sourcesContent":["import type { DiffLineAnnotation, EditorSelection } from '../types';\nimport type { ResolvedTextEdit, TextDocument } from './textDocument';\n\n/** Largest number of undo or redo entries kept; oldest entries drop first once exceeded. */\nconst DEFAULT_EDIT_STACK_MAX_ENTRIES = 100;\n\n/** An entry in the edit stack. */\nexport interface EditStackEntry<LAnnotation> {\n  /** Forward offset edits from the entry's base text to its final text. */\n  forwardEdits: ResolvedTextEdit[];\n  /** Inverse offset edits from the entry's final text back to its base text. */\n  inverseEdits: ResolvedTextEdit[];\n  /** Document version before the entry is applied. */\n  versionBefore: number;\n  /** Document version after the entry is applied. */\n  versionAfter: number;\n  /** Selection before the transaction. */\n  selectionsBefore?: EditorSelection[];\n  /** Selection after the transaction. */\n  selectionsAfter?: EditorSelection[];\n  /** Line annotations before the transaction. */\n  lineAnnotationsBefore?: DiffLineAnnotation<LAnnotation>[];\n  /** Line annotations after the transaction. */\n  lineAnnotationsAfter?: DiffLineAnnotation<LAnnotation>[];\n  /**\n   * When `true`, this entry is its own undo step and never merges with the\n   * entry before or after it. Set for paste and cut, which otherwise look like\n   * typing and would merge into the previous keystroke.\n   */\n  undoBoundary?: boolean;\n}\n\n/** Options for the edit stack. */\nexport interface EditStackOptions {\n  /** The maximum number of entries to keep in the undo stack. */\n  maxEntries?: number;\n}\n\n/** A stack of edit entries. */\nexport class EditStack<LAnnotation> {\n  #undoStack: EditStackEntry<LAnnotation>[] = [];\n  #redoStack: EditStackEntry<LAnnotation>[] = [];\n  #maxEntries: number;\n\n  constructor(options?: EditStackOptions) {\n    this.#maxEntries = Math.max(\n      1,\n      options?.maxEntries ?? DEFAULT_EDIT_STACK_MAX_ENTRIES\n    );\n  }\n\n  get canUndo(): boolean {\n    return this.#undoStack.length > 0;\n  }\n\n  get canRedo(): boolean {\n    return this.#redoStack.length > 0;\n  }\n\n  /** Clears both the undo and redo stacks. */\n  clear(): void {\n    this.#undoStack.length = 0;\n    this.#redoStack.length = 0;\n  }\n\n  /** Clears the redo stack. */\n  clearRedo(): void {\n    this.#redoStack.length = 0;\n  }\n\n  /** Pushes a new entry onto the undo stack. */\n  push(entry: EditStackEntry<LAnnotation>): void {\n    this.#undoStack.push(entry);\n    this.clearRedo();\n    if (this.#undoStack.length > this.#maxEntries) {\n      this.#undoStack.shift();\n    }\n  }\n\n  /** Sets the selections after the last undo entry. */\n  setLastUndoSelectionsAfter(selections: EditorSelection[]): void {\n    const lastEntry = this.#undoStack[this.#undoStack.length - 1];\n    if (lastEntry !== undefined) {\n      lastEntry.selectionsAfter = selections.map((selection) => ({\n        ...selection,\n      }));\n    }\n  }\n\n  /** Sets the line annotations after the last undo entry. */\n  setLastUndoLineAnnotations(\n    lineAnnotationsBefore: DiffLineAnnotation<LAnnotation>[],\n    lineAnnotationsAfter: DiffLineAnnotation<LAnnotation>[]\n  ): void {\n    const lastEntry = this.#undoStack[this.#undoStack.length - 1];\n    if (lastEntry !== undefined) {\n      lastEntry.lineAnnotationsBefore = lineAnnotationsBefore.slice();\n      lastEntry.lineAnnotationsAfter = lineAnnotationsAfter.slice();\n    }\n  }\n\n  /** Returns the last undo entry, or `undefined` if empty. */\n  peekUndo(): EditStackEntry<LAnnotation> | undefined {\n    return this.#undoStack[this.#undoStack.length - 1];\n  }\n\n  /** Replaces the last undo entry with the given entry. */\n  replaceLastUndo(entry: EditStackEntry<LAnnotation>): void {\n    if (this.#undoStack.length === 0) {\n      this.push(entry);\n      return;\n    }\n    this.#undoStack[this.#undoStack.length - 1] = entry;\n    this.clearRedo();\n  }\n\n  /** Moves the latest undo entry to the redo stack and returns it, or `undefined` if empty. */\n  popUndoToRedo(): EditStackEntry<LAnnotation> | void {\n    const entry = this.#undoStack.pop();\n    if (entry !== undefined) {\n      this.#redoStack.push(entry);\n      return entry;\n    }\n  }\n\n  /** Moves the latest redo entry back to the undo stack and returns it, or `undefined` if empty. */\n  popRedoToUndo(): EditStackEntry<LAnnotation> | void {\n    const entry = this.#redoStack.pop();\n    if (entry !== undefined) {\n      this.#undoStack.push(entry);\n      return entry;\n    }\n  }\n}\n\nexport function createEditStackEntry<LAnnotation>(\n  textDocument: TextDocument<LAnnotation>,\n  resolvedEdits: ResolvedTextEdit[],\n  versionBefore: number,\n  versionAfter: number,\n  selectionsBefore?: EditorSelection[],\n  selectionsAfter?: EditorSelection[],\n  lineAnnotationsBefore?: DiffLineAnnotation<LAnnotation>[],\n  lineAnnotationsAfter?: DiffLineAnnotation<LAnnotation>[]\n): EditStackEntry<LAnnotation> {\n  const forwardEdits = [...resolvedEdits].sort((a, b) => a.start - b.start);\n  const inverseEdits: ResolvedTextEdit[] = [];\n  for (let i = 0, offsetDelta = 0; i < forwardEdits.length; i++) {\n    const edit = forwardEdits[i];\n    const replacedText = textDocument.getTextSlice(edit.start, edit.end);\n    const startAfterEdit = edit.start + offsetDelta;\n    inverseEdits.push({\n      start: startAfterEdit,\n      end: startAfterEdit + edit.text.length,\n      text: replacedText,\n    });\n    offsetDelta += edit.text.length - (edit.end - edit.start);\n  }\n  return {\n    forwardEdits: forwardEdits.map((edit) => ({ ...edit })),\n    inverseEdits: inverseEdits,\n    versionBefore,\n    versionAfter,\n    selectionsBefore: selectionsBefore?.map((selection) => ({\n      ...selection,\n    })),\n    selectionsAfter: selectionsAfter?.map((selection) => ({ ...selection })),\n    lineAnnotationsBefore: lineAnnotationsBefore?.slice(),\n    lineAnnotationsAfter: lineAnnotationsAfter?.slice(),\n  };\n}\n\n/** Determines if the change matches following modes:\n * - 'insert': simple typing\n * - 'backspace': backward delete\n * - 'delete': forward delete\n */\nexport function shouldCoalesceEditStackEntry<LAnnotation>(\n  previousEntry: EditStackEntry<LAnnotation> | undefined,\n  nextEntry: EditStackEntry<LAnnotation>\n): boolean {\n  if (\n    previousEntry === undefined ||\n    previousEntry.undoBoundary === true ||\n    nextEntry.undoBoundary === true ||\n    previousEntry.forwardEdits.length === 0 ||\n    previousEntry.forwardEdits.length !== previousEntry.inverseEdits.length ||\n    previousEntry.forwardEdits.length !== nextEntry.forwardEdits.length ||\n    nextEntry.forwardEdits.length !== nextEntry.inverseEdits.length\n  ) {\n    return false;\n  }\n  let mode: 'insert' | 'backspace' | 'delete' | undefined;\n  for (let i = 0; i < previousEntry.forwardEdits.length; i++) {\n    const previousForward = previousEntry.forwardEdits[i];\n    const previousInverse = previousEntry.inverseEdits[i];\n    const nextForward = nextEntry.forwardEdits[i];\n    const nextInverse = nextEntry.inverseEdits[i];\n    const mappedNextStart = mapOffsetAfterForwardBatchToBefore(\n      nextForward.start,\n      previousEntry.forwardEdits\n    );\n    const previousWasInsert =\n      previousForward.start <= previousForward.end &&\n      previousForward.text.length > 0 &&\n      !previousForward.text.includes('\\n') &&\n      !previousInverse.text.includes('\\n');\n    const nextIsInsert =\n      nextForward.start === nextForward.end &&\n      nextForward.text.length > 0 &&\n      !nextForward.text.includes('\\n') &&\n      nextInverse.text.length === 0;\n    if (previousWasInsert && nextIsInsert) {\n      // Merge only when the next insert starts exactly where the previous\n      // inserted text ends, in after-edit offsets. `previousInverse.end` marks\n      // that point, since undo replaces exactly the inserted range. A\n      // base-offset check can't tell this apart from a caret that jumped to the\n      // left edge: both edges of a pure insert map back to the same base offset,\n      // so typing \"a\" then \"b\" at the left edge would merge as \"ab\" while the\n      // buffer holds \"ba\", corrupting redo.\n      if (nextForward.start !== previousInverse.end) {\n        return false;\n      }\n      mode ??= 'insert';\n      if (mode !== 'insert') {\n        return false;\n      }\n      continue;\n    }\n    const previousWasDelete =\n      previousForward.text.length === 0 &&\n      previousForward.end > previousForward.start &&\n      previousInverse.text.length > 0;\n    const nextIsDelete =\n      nextForward.text.length === 0 &&\n      nextForward.end > nextForward.start &&\n      nextInverse.text.length > 0;\n    if (previousWasDelete && nextIsDelete) {\n      if (mappedNextStart === previousForward.end) {\n        mode ??= 'delete';\n        if (mode !== 'delete') {\n          return false;\n        }\n        continue;\n      }\n      if (\n        mappedNextStart + (nextForward.end - nextForward.start) !==\n        previousForward.start\n      ) {\n        return false;\n      }\n      mode ??= 'backspace';\n      if (mode !== 'backspace') {\n        return false;\n      }\n      continue;\n    }\n    return false;\n  }\n  return mode !== undefined;\n}\n\n/** Coalesce edit stack entries for simple typing and single-character deletes. */\nexport function coalesceEditStackEntries<LAnnotation>(\n  previousEntry: EditStackEntry<LAnnotation>,\n  nextEntry: EditStackEntry<LAnnotation>\n): EditStackEntry<LAnnotation> {\n  const forwardEdits: ResolvedTextEdit[] = [];\n  const replacedTexts: string[] = [];\n  for (let i = 0; i < previousEntry.forwardEdits.length; i++) {\n    const previousForward = previousEntry.forwardEdits[i];\n    const previousInverse = previousEntry.inverseEdits[i];\n    const nextForward = nextEntry.forwardEdits[i];\n    const nextInverse = nextEntry.inverseEdits[i];\n    const mappedNextStart = mapOffsetAfterForwardBatchToBefore(\n      nextForward.start,\n      previousEntry.forwardEdits\n    );\n\n    if (previousForward.text.length > 0) {\n      forwardEdits.push({\n        start: previousForward.start,\n        end: previousForward.end,\n        text: previousForward.text + nextForward.text,\n      });\n      replacedTexts.push(previousInverse.text);\n      continue;\n    }\n\n    if (mappedNextStart === previousForward.end) {\n      forwardEdits.push({\n        start: previousForward.start,\n        end: mappedNextStart + (nextForward.end - nextForward.start),\n        text: '',\n      });\n      replacedTexts.push(previousInverse.text + nextInverse.text);\n      continue;\n    }\n\n    forwardEdits.push({\n      start: Math.min(previousForward.start, mappedNextStart),\n      end: previousForward.end,\n      text: '',\n    });\n    replacedTexts.push(nextInverse.text + previousInverse.text);\n  }\n\n  return {\n    forwardEdits,\n    inverseEdits: buildInverseEditsFromReplacedTexts(\n      forwardEdits,\n      replacedTexts\n    ),\n    versionBefore: previousEntry.versionBefore,\n    versionAfter: nextEntry.versionAfter,\n    selectionsBefore: previousEntry.selectionsBefore?.slice(),\n    selectionsAfter: nextEntry.selectionsAfter?.slice(),\n    lineAnnotationsBefore: previousEntry.lineAnnotationsBefore?.slice(),\n    lineAnnotationsAfter: nextEntry.lineAnnotationsAfter?.slice(),\n  };\n}\n\nfunction buildInverseEditsFromReplacedTexts(\n  forwardEdits: readonly ResolvedTextEdit[],\n  replacedTexts: readonly string[]\n): ResolvedTextEdit[] {\n  const inverseEdits: ResolvedTextEdit[] = [];\n  for (let i = 0, offsetDelta = 0; i < forwardEdits.length; i++) {\n    const edit = forwardEdits[i];\n    const startAfterEdit = edit.start + offsetDelta;\n    inverseEdits.push({\n      start: startAfterEdit,\n      end: startAfterEdit + edit.text.length,\n      text: replacedTexts[i],\n    });\n    offsetDelta += edit.text.length - (edit.end - edit.start);\n  }\n  return inverseEdits;\n}\n\nfunction mapOffsetAfterForwardBatchToBefore(\n  offsetAfter: number,\n  forwardEdits: readonly ResolvedTextEdit[]\n): number {\n  let offset = offsetAfter;\n  for (const edit of forwardEdits) {\n    const oldLength = edit.end - edit.start;\n    const newLength = edit.text.length;\n    const delta = newLength - oldLength;\n    if (offset < edit.start) {\n      continue;\n    }\n    if (offset >= edit.start + newLength) {\n      offset -= delta;\n      continue;\n    }\n    offset = edit.start + Math.min(offset - edit.start, oldLength);\n  }\n  return offset;\n}\n"],"mappings":"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"}
+{"version":3,"file":"editStack.js","names":["#maxEntries","#undoStack","#redoStack","#canCoalesce"],"sources":["../../src/editor/editStack.ts"],"sourcesContent":["import type { DiffLineAnnotation, EditorSelection } from '../types';\nimport type { ResolvedTextEdit, TextDocument } from './textDocument';\n\n/** Largest number of undo or redo entries kept; oldest entries drop first once exceeded. */\nconst DEFAULT_EDIT_STACK_MAX_ENTRIES = 100;\n\nconst COALESCING_MODE_INSERT = 1;\nconst COALESCING_MODE_BACKSPACE = 2;\nconst COALESCING_MODE_DELETE = 3;\ntype EditStackCoalescingMode = 1 | 2 | 3;\n\n/** An entry in the edit stack. */\nexport interface EditStackEntry<LAnnotation> {\n  /** Forward offset edits from the entry's base text to its final text. */\n  forwardEdits: ResolvedTextEdit[];\n  /** Inverse offset edits from the entry's final text back to its base text. */\n  inverseEdits: ResolvedTextEdit[];\n  /** Document version before the entry is applied. */\n  versionBefore: number;\n  /** Document version after the entry is applied. */\n  versionAfter: number;\n  /** Selection before the transaction. */\n  selectionsBefore?: EditorSelection[];\n  /** Selection after the transaction. */\n  selectionsAfter?: EditorSelection[];\n  /** Line annotations before the transaction. */\n  lineAnnotationsBefore?: DiffLineAnnotation<LAnnotation>[];\n  /** Line annotations after the transaction. */\n  lineAnnotationsAfter?: DiffLineAnnotation<LAnnotation>[];\n  /** Input mode inferred from the edit or retained by a coalesced run. */\n  coalescingMode?: EditStackCoalescingMode;\n  /**\n   * When `true`, this entry is its own undo step and never merges with the\n   * entry before or after it. Set for paste and cut, which otherwise look like\n   * typing and would merge into the previous keystroke.\n   */\n  undoBoundary?: boolean;\n}\n\n/** Options for the edit stack. */\nexport interface EditStackOptions {\n  /** The maximum number of entries to keep in the undo stack. */\n  maxEntries?: number;\n}\n\n/** A stack of edit entries. */\nexport class EditStack<LAnnotation> {\n  #undoStack: EditStackEntry<LAnnotation>[] = [];\n  #redoStack: EditStackEntry<LAnnotation>[] = [];\n  #maxEntries: number;\n  #canCoalesce = false;\n\n  constructor(options?: EditStackOptions) {\n    this.#maxEntries = Math.max(\n      1,\n      options?.maxEntries ?? DEFAULT_EDIT_STACK_MAX_ENTRIES\n    );\n  }\n\n  get canUndo(): boolean {\n    return this.#undoStack.length > 0;\n  }\n\n  get canRedo(): boolean {\n    return this.#redoStack.length > 0;\n  }\n\n  /** Clears both the undo and redo stacks. */\n  clear(): void {\n    this.#undoStack.length = 0;\n    this.#redoStack.length = 0;\n    this.#canCoalesce = false;\n  }\n\n  /** Clears the redo stack. */\n  clearRedo(): void {\n    this.#redoStack.length = 0;\n  }\n\n  /** Pushes a new entry onto the undo stack. */\n  push(entry: EditStackEntry<LAnnotation>): void {\n    this.#undoStack.push(entry);\n    this.clearRedo();\n    this.#canCoalesce = true;\n    if (this.#undoStack.length > this.#maxEntries) {\n      this.#undoStack.shift();\n    }\n  }\n\n  /** Sets the selections after the last undo entry. */\n  setLastUndoSelectionsAfter(selections: EditorSelection[]): void {\n    const lastEntry = this.#undoStack[this.#undoStack.length - 1];\n    if (lastEntry !== undefined) {\n      lastEntry.selectionsAfter = selections.map((selection) => ({\n        ...selection,\n      }));\n    }\n  }\n\n  /** Sets the line annotations after the last undo entry. */\n  setLastUndoLineAnnotations(\n    lineAnnotationsBefore: DiffLineAnnotation<LAnnotation>[],\n    lineAnnotationsAfter: DiffLineAnnotation<LAnnotation>[]\n  ): void {\n    const lastEntry = this.#undoStack[this.#undoStack.length - 1];\n    if (lastEntry !== undefined) {\n      lastEntry.lineAnnotationsBefore = lineAnnotationsBefore.slice();\n      lastEntry.lineAnnotationsAfter = lineAnnotationsAfter.slice();\n    }\n  }\n\n  /** Returns the last undo entry, or `undefined` if empty. */\n  peekUndo(): EditStackEntry<LAnnotation> | undefined {\n    return this.#undoStack[this.#undoStack.length - 1];\n  }\n\n  /** Returns the last undo entry only while its coalescing group is open. */\n  peekUndoForCoalescing(): EditStackEntry<LAnnotation> | undefined {\n    return this.#canCoalesce ? this.peekUndo() : undefined;\n  }\n\n  /** Replaces the last undo entry with the given entry. */\n  replaceLastUndo(entry: EditStackEntry<LAnnotation>): void {\n    if (this.#undoStack.length === 0) {\n      this.push(entry);\n      return;\n    }\n    this.#undoStack[this.#undoStack.length - 1] = entry;\n    this.clearRedo();\n    this.#canCoalesce = true;\n  }\n\n  /** Moves the latest undo entry to the redo stack and returns it, or `undefined` if empty. */\n  popUndoToRedo(): EditStackEntry<LAnnotation> | void {\n    const entry = this.#undoStack.pop();\n    if (entry !== undefined) {\n      this.#redoStack.push(entry);\n      this.#canCoalesce = false;\n      return entry;\n    }\n  }\n\n  /** Moves the latest redo entry back to the undo stack and returns it, or `undefined` if empty. */\n  popRedoToUndo(): EditStackEntry<LAnnotation> | void {\n    const entry = this.#redoStack.pop();\n    if (entry !== undefined) {\n      this.#undoStack.push(entry);\n      this.#canCoalesce = false;\n      return entry;\n    }\n  }\n}\n\nexport function createEditStackEntry<LAnnotation>(\n  textDocument: TextDocument<LAnnotation>,\n  resolvedEdits: ResolvedTextEdit[],\n  versionBefore: number,\n  versionAfter: number,\n  selectionsBefore?: EditorSelection[],\n  selectionsAfter?: EditorSelection[],\n  lineAnnotationsBefore?: DiffLineAnnotation<LAnnotation>[],\n  lineAnnotationsAfter?: DiffLineAnnotation<LAnnotation>[]\n): EditStackEntry<LAnnotation> {\n  const forwardEdits = [...resolvedEdits].sort((a, b) => a.start - b.start);\n  const inverseEdits: ResolvedTextEdit[] = [];\n  let coalescingMode: EditStackCoalescingMode | undefined;\n  if (selectionsBefore?.length === forwardEdits.length) {\n    const caretOffsets: number[] = [];\n    for (const selection of selectionsBefore) {\n      if (\n        selection.start.line !== selection.end.line ||\n        selection.start.character !== selection.end.character\n      ) {\n        break;\n      }\n      caretOffsets.push(textDocument.offsetAt(selection.start));\n    }\n    if (caretOffsets.length === forwardEdits.length) {\n      caretOffsets.sort((a, b) => a - b);\n      let isBackspace = true;\n      let isDelete = true;\n      for (let i = 0; i < forwardEdits.length; i++) {\n        const edit = forwardEdits[i];\n        if (edit.text.length > 0 || edit.start === edit.end) {\n          isBackspace = false;\n          isDelete = false;\n          break;\n        }\n        isBackspace &&= caretOffsets[i] === edit.end;\n        isDelete &&= caretOffsets[i] === edit.start;\n      }\n      coalescingMode = isBackspace\n        ? COALESCING_MODE_BACKSPACE\n        : isDelete\n          ? COALESCING_MODE_DELETE\n          : undefined;\n    }\n  }\n  for (let i = 0, offsetDelta = 0; i < forwardEdits.length; i++) {\n    const edit = forwardEdits[i];\n    const replacedText = textDocument.getTextSlice(edit.start, edit.end);\n    const startAfterEdit = edit.start + offsetDelta;\n    inverseEdits.push({\n      start: startAfterEdit,\n      end: startAfterEdit + edit.text.length,\n      text: replacedText,\n    });\n    offsetDelta += edit.text.length - (edit.end - edit.start);\n  }\n  return {\n    forwardEdits: forwardEdits.map((edit) => ({ ...edit })),\n    inverseEdits: inverseEdits,\n    versionBefore,\n    versionAfter,\n    selectionsBefore: selectionsBefore?.map((selection) => ({\n      ...selection,\n    })),\n    selectionsAfter: selectionsAfter?.map((selection) => ({ ...selection })),\n    lineAnnotationsBefore: lineAnnotationsBefore?.slice(),\n    lineAnnotationsAfter: lineAnnotationsAfter?.slice(),\n    coalescingMode,\n  };\n}\n\n/** Determines if the change matches following modes:\n * - 'insert': simple typing\n * - 'backspace': backward delete\n * - 'delete': forward delete\n */\nexport function shouldCoalesceEditStackEntry<LAnnotation>(\n  previousEntry: EditStackEntry<LAnnotation> | undefined,\n  nextEntry: EditStackEntry<LAnnotation>\n): boolean {\n  if (\n    previousEntry === undefined ||\n    previousEntry.undoBoundary === true ||\n    nextEntry.undoBoundary === true ||\n    previousEntry.forwardEdits.length === 0 ||\n    previousEntry.forwardEdits.length !== previousEntry.inverseEdits.length ||\n    previousEntry.forwardEdits.length !== nextEntry.forwardEdits.length ||\n    nextEntry.forwardEdits.length !== nextEntry.inverseEdits.length\n  ) {\n    return false;\n  }\n  let mode: EditStackCoalescingMode | undefined;\n  for (let i = 0; i < previousEntry.forwardEdits.length; i++) {\n    const previousForward = previousEntry.forwardEdits[i];\n    const previousInverse = previousEntry.inverseEdits[i];\n    const nextForward = nextEntry.forwardEdits[i];\n    const nextInverse = nextEntry.inverseEdits[i];\n    const mappedNextStart = mapOffsetAfterForwardBatchToBefore(\n      nextForward.start,\n      previousEntry.forwardEdits\n    );\n    const previousWasInsert =\n      previousForward.start <= previousForward.end &&\n      previousForward.text.length > 0 &&\n      !previousForward.text.includes('\\n') &&\n      !previousInverse.text.includes('\\n');\n    const nextIsInsert =\n      nextForward.start === nextForward.end &&\n      nextForward.text.length > 0 &&\n      !nextForward.text.includes('\\n') &&\n      nextInverse.text.length === 0;\n    if (previousWasInsert && nextIsInsert) {\n      // Merge only when the next insert starts exactly where the previous\n      // inserted text ends, in after-edit offsets. `previousInverse.end` marks\n      // that point, since undo replaces exactly the inserted range. A\n      // base-offset check can't tell this apart from a caret that jumped to the\n      // left edge: both edges of a pure insert map back to the same base offset,\n      // so typing \"a\" then \"b\" at the left edge would merge as \"ab\" while the\n      // buffer holds \"ba\", corrupting redo.\n      if (nextForward.start !== previousInverse.end) {\n        return false;\n      }\n      mode ??= COALESCING_MODE_INSERT;\n      if (\n        mode !== COALESCING_MODE_INSERT ||\n        (previousEntry.coalescingMode !== undefined &&\n          previousEntry.coalescingMode !== COALESCING_MODE_INSERT) ||\n        (nextEntry.coalescingMode !== undefined &&\n          nextEntry.coalescingMode !== COALESCING_MODE_INSERT)\n      ) {\n        return false;\n      }\n      continue;\n    }\n    const previousWasDelete =\n      previousForward.text.length === 0 &&\n      previousForward.end > previousForward.start &&\n      previousInverse.text.length > 0;\n    const nextIsDelete =\n      nextForward.text.length === 0 &&\n      nextForward.end > nextForward.start &&\n      nextInverse.text.length > 0;\n    if (previousWasDelete && nextIsDelete) {\n      let nextMode: EditStackCoalescingMode;\n      if (mappedNextStart === previousForward.end) {\n        nextMode = COALESCING_MODE_DELETE;\n      } else if (\n        mappedNextStart + (nextForward.end - nextForward.start) !==\n        previousForward.start\n      ) {\n        return false;\n      } else {\n        nextMode = COALESCING_MODE_BACKSPACE;\n      }\n      mode ??= nextMode;\n      if (\n        mode !== nextMode ||\n        (previousEntry.coalescingMode !== undefined &&\n          previousEntry.coalescingMode !== nextMode) ||\n        (nextEntry.coalescingMode !== undefined &&\n          nextEntry.coalescingMode !== nextMode)\n      ) {\n        return false;\n      }\n      continue;\n    }\n    return false;\n  }\n  return mode !== undefined;\n}\n\n/** Coalesce edit stack entries for simple typing and single-character deletes. */\nexport function coalesceEditStackEntries<LAnnotation>(\n  previousEntry: EditStackEntry<LAnnotation>,\n  nextEntry: EditStackEntry<LAnnotation>\n): EditStackEntry<LAnnotation> {\n  const forwardEdits: ResolvedTextEdit[] = [];\n  const replacedTexts: string[] = [];\n  let coalescingMode: EditStackCoalescingMode | undefined;\n  for (let i = 0; i < previousEntry.forwardEdits.length; i++) {\n    const previousForward = previousEntry.forwardEdits[i];\n    const previousInverse = previousEntry.inverseEdits[i];\n    const nextForward = nextEntry.forwardEdits[i];\n    const nextInverse = nextEntry.inverseEdits[i];\n    const mappedNextStart = mapOffsetAfterForwardBatchToBefore(\n      nextForward.start,\n      previousEntry.forwardEdits\n    );\n\n    if (previousForward.text.length > 0) {\n      coalescingMode ??= COALESCING_MODE_INSERT;\n      forwardEdits.push({\n        start: previousForward.start,\n        end: previousForward.end,\n        text: previousForward.text + nextForward.text,\n      });\n      replacedTexts.push(previousInverse.text);\n      continue;\n    }\n\n    if (mappedNextStart === previousForward.end) {\n      coalescingMode ??= COALESCING_MODE_DELETE;\n      forwardEdits.push({\n        start: previousForward.start,\n        end: mappedNextStart + (nextForward.end - nextForward.start),\n        text: '',\n      });\n      replacedTexts.push(previousInverse.text + nextInverse.text);\n      continue;\n    }\n\n    coalescingMode ??= COALESCING_MODE_BACKSPACE;\n    forwardEdits.push({\n      start: Math.min(previousForward.start, mappedNextStart),\n      end: previousForward.end,\n      text: '',\n    });\n    replacedTexts.push(nextInverse.text + previousInverse.text);\n  }\n\n  return {\n    forwardEdits,\n    inverseEdits: buildInverseEditsFromReplacedTexts(\n      forwardEdits,\n      replacedTexts\n    ),\n    versionBefore: previousEntry.versionBefore,\n    versionAfter: nextEntry.versionAfter,\n    selectionsBefore: previousEntry.selectionsBefore?.slice(),\n    selectionsAfter: nextEntry.selectionsAfter?.slice(),\n    lineAnnotationsBefore: previousEntry.lineAnnotationsBefore?.slice(),\n    lineAnnotationsAfter: nextEntry.lineAnnotationsAfter?.slice(),\n    coalescingMode,\n  };\n}\n\nfunction buildInverseEditsFromReplacedTexts(\n  forwardEdits: readonly ResolvedTextEdit[],\n  replacedTexts: readonly string[]\n): ResolvedTextEdit[] {\n  const inverseEdits: ResolvedTextEdit[] = [];\n  for (let i = 0, offsetDelta = 0; i < forwardEdits.length; i++) {\n    const edit = forwardEdits[i];\n    const startAfterEdit = edit.start + offsetDelta;\n    inverseEdits.push({\n      start: startAfterEdit,\n      end: startAfterEdit + edit.text.length,\n      text: replacedTexts[i],\n    });\n    offsetDelta += edit.text.length - (edit.end - edit.start);\n  }\n  return inverseEdits;\n}\n\nfunction mapOffsetAfterForwardBatchToBefore(\n  offsetAfter: number,\n  forwardEdits: readonly ResolvedTextEdit[]\n): number {\n  let offset = offsetAfter;\n  for (const edit of forwardEdits) {\n    const oldLength = edit.end - edit.start;\n    const newLength = edit.text.length;\n    const delta = newLength - oldLength;\n    if (offset < edit.start) {\n      continue;\n    }\n    if (offset >= edit.start + newLength) {\n      offset -= delta;\n      continue;\n    }\n    offset = edit.start + Math.min(offset - edit.start, oldLength);\n  }\n  return offset;\n}\n"],"mappings":"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"}

package/dist/editor/editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.d.ts","names":[],"sources":["../../src/editor/editor.ts"],"mappings":";;;;;;;;UA+KiB,aAAA;;EAEf,iBAAA;EAF4B;;;;EAO5B,YAAA;EA4B+B;;;;EAvB/B,mBAAA,GAAsB,mBAAA;EA+BZ;EA7BV,gBAAA;EA8BgB;EA5BhB,aAAA;EAiCuC;;;;EA5BvC,YAAA,GAAe,YAAA;EAnBf;EAqBA,qBAAA,GAAwB,iBAAA;EAXxB;;;;EAgBA,sBAAA;EAPe;;;;;EAaf,SAAA;IACE,QAAA,GAAW,IAAA,cAAkB,OAAA;EAAA;EAG/B;EAAA,qBAAA,IACE,OAAA,EAAS,sBAAA,CAAuB,WAAA,MAC7B,WAAA;EAD6B;EAGlC,QAAA,IACE,MAAA,EAAQ,MAAA,CAAO,WAAA,GACf,YAAA,EAAc,sBAAA,CAAuB,WAAA;EAJlC;EAOL,QAAA,IACE,IAAA,EAAM,YAAA,EACN,eAAA,GAAkB,kBAAA,CAAmB,WAAA;EAN7B;EASV,OAAA;EATE;EAWF,MAAA;EAEA,OAAA;AAAA;AAAA,cAaW,MAAA,yBAA+B,WAAA,CAAY,WAAA;EAAA;EAoItD,WAAA,CAAY,OAAA,GAAS,aAAA,CAAc,WAAA;EAInC,UAAA,CAAW,OAAA,EAAS,aAAA,CAAc,WAAA;EAiClC,IAAA,CAAK,YAAA,EAAc,sBAAA,CAAuB,WAAA;EA7LxC;;;;;AAOK;AAaT;;;;EAsNE,UAAA,CAAW,KAAA,EAAO,QAAA,IAAY,aAAA;EAlFT;EAAA,IAqJjB,OAAA;EAjJgB;EAAA,IAsJhB,OAAA;EArHe;EA0HnB,IAAA;EASW;EAJX,IAAA;EAIA,OAAA,IAAW,YAAA;EAcX,OAAA;EAIA,QAAA,IAAY,WAAA;EAcZ,QAAA;IAAW,UAAA;IAAY;EAAA,GAAQ,WAAA;EAsB/B,aAAA,CACE,UAAA,GAAa,KAAA;IAAU,SAAA;EAAA;EAmCzB,UAAA,CAAW,OAAA,EAAS,MAAA;EA6BpB,KAAA,CAAM,OAAA,GAAU,YAAA;EAchB,IAAA;EAIA,OAAA,CAAQ,OAAA;EArb6C;EA+frD,aAAA,CAAc,IAAA,EAAM,YAAA,GAAe,YAAA;EA/fjB;EA2hBlB,+BAAA;EA3hBsD;EAsiBtD,gBAAA,EAAkB,WAAA,CAAY,WAAA;AAAA"}
+{"version":3,"file":"editor.d.ts","names":[],"sources":["../../src/editor/editor.ts"],"mappings":";;;;;;;;UAiLiB,aAAA;;EAEf,iBAAA;EAF4B;;;;EAO5B,YAAA;EA4B+B;;;;EAvB/B,mBAAA,GAAsB,mBAAA;EA+BZ;EA7BV,gBAAA;EA8BgB;EA5BhB,aAAA;EAiCuC;;;;EA5BvC,YAAA,GAAe,YAAA;EAnBf;EAqBA,qBAAA,GAAwB,iBAAA;EAXxB;;;;EAgBA,sBAAA;EAPe;;;;;EAaf,SAAA;IACE,QAAA,GAAW,IAAA,cAAkB,OAAA;EAAA;EAG/B;EAAA,qBAAA,IACE,OAAA,EAAS,sBAAA,CAAuB,WAAA,MAC7B,WAAA;EAD6B;EAGlC,QAAA,IACE,MAAA,EAAQ,MAAA,CAAO,WAAA,GACf,YAAA,EAAc,sBAAA,CAAuB,WAAA;EAJlC;EAOL,QAAA,IACE,IAAA,EAAM,YAAA,EACN,eAAA,GAAkB,kBAAA,CAAmB,WAAA;EAN7B;EASV,OAAA;EATE;EAWF,MAAA;EAEA,OAAA;AAAA;AAAA,cAaW,MAAA,yBAA+B,WAAA,CAAY,WAAA;EAAA;EAqItD,WAAA,CAAY,OAAA,GAAS,aAAA,CAAc,WAAA;EAInC,UAAA,CAAW,OAAA,EAAS,aAAA,CAAc,WAAA;EAiClC,IAAA,CAAK,YAAA,EAAc,sBAAA,CAAuB,WAAA;EA9LxC;;;;;AAOK;AAaT;;;;EAwME,UAAA,CAAW,KAAA,EAAO,QAAA,IAAY,aAAA;EAnET;EAAA,IAsIjB,OAAA;EAlIgB;EAAA,IAuIhB,OAAA;EAtGe;EA2GnB,IAAA;EASW;EAJX,IAAA;EAIA,OAAA,IAAW,YAAA;EAcX,OAAA;EAIA,QAAA,IAAY,WAAA;EAcZ,QAAA;IAAW,UAAA;IAAY;EAAA,GAAQ,WAAA;EAsB/B,aAAA,CACE,UAAA,GAAa,KAAA;IAAU,SAAA;EAAA;EAmCzB,UAAA,CAAW,OAAA,EAAS,MAAA;EA6BpB,KAAA,CAAM,OAAA,GAAU,YAAA;EAchB,IAAA;EAIA,OAAA,CAAQ,OAAA;EAva6C;EAifrD,aAAA,CAAc,IAAA,EAAM,YAAA,GAAe,YAAA;EAjfjB;EA6gBlB,+BAAA;EA7gBsD;EAwhBtD,gBAAA,EAAkB,WAAA,CAAY,WAAA;AAAA"}

package/dist/editor/editor.js

@@ -1,4 +1,5 @@
 import { dequeueRender, queueRender } from "../managers/UniversalRenderingManager.js";
+import { isGutterUtilityPath } from "../utils/isGutterUtilityPath.js";
 import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { isMoveCursorShortcut, isPrimaryModifier, isSafari } from "./platform.js";
 import { resolveEditorCommandFromKeyboardEvent, resolveFindAgainShortcut } from "./command.js";
@@ -8,7 +9,7 @@ import { resolveBlockCommentEdits, resolveCommentConfig, resolveLineCommentEdits
 import { addEventListener, clampDomOffset, extend, getLineNumberAttr, h, round } from "./utils.js";
 import { applyDocumentChangeToLineAnnotations, renderLineAnnotations } from "./lineAnnotations.js";
 import { PopoverManager } from "./popover.js";
-import { applyDeleteCharacterToSelections, applyDeleteHardLineForwardToSelections, applyDeleteSoftLineBackwardToSelections, applyDeleteWordBackwardToSelections, applyTextChangeToSelections, applyTextReplaceToSelections, applyTransposeToSelections, comparePosition, convertSelection, createSelectionFrom, createSelectionFromAnchorAndFocusOffsets, expandCollapsedSelectionToWord, extendSelection, extendSelections, findNexMatch, getAutoSurroundReplacementTexts, getCaretPosition, getDocumentBoundarySelection, getDocumentFullSelection, getSelectedLineBlocks, getSelectionAnchor, getSelectionClipboardTexts, getSelectionText, isCollapsedSelection, isLineEditable, mapCursorMove, mapSelectionShift, mergeOverlappingSelections, remapSelectionsAfterEdits, resolveIndentEdits, resolveSelectionCut, selectionIntersects, shiftSelectionLines } from "./selection.js";
+import { applyDeleteCharacterToSelections, applyDeleteHardLineForwardToSelections, applyDeleteSoftLineBackwardToSelections, applyDeleteWordBackwardToSelections, applyTextChangeToSelections, applyTextReplaceToSelections, applyTransposeToSelections, comparePosition, convertSelection, createSelectionFrom, createSelectionFromAnchorAndFocusOffsets, expandCollapsedSelectionToWord, extendSelection, extendSelections, findNextMatch, getAutoSurroundReplacementTexts, getCaretPosition, getDocumentBoundarySelection, getDocumentFullSelection, getSelectedLineBlocks, getSelectionAnchor, getSelectionClipboardTexts, getSelectionText, isCollapsedSelection, isLineEditable, mapCursorMove, mapSelectionShift, mergeOverlappingSelections, remapSelectionsAfterEdits, resolveIndentEdits, resolveSelectionCut, selectionIntersects, shiftSelectionLines } from "./selection.js";
 import { MarkerRenderer, markerSeverityDatasetKey } from "./marker.js";
 import { findBracketMatchRanges } from "./matchBrackets.js";
 import { createSpriteElement } from "./sprite.js";
@@ -146,14 +147,10 @@ var Editor = class {
 			const file = fileInstance.__getCurrentFile?.();
 			if (file !== void 0) requirePersistedCacheKey(file);
 		}
-		const { useTokenTransformer, enableGutterUtility, enableLineSelection, lineHoverHighlight = "disabled", ...rest } = fileInstance.options;
-		if (useTokenTransformer !== true || enableGutterUtility === true || enableLineSelection === true || lineHoverHighlight !== "disabled") {
+		if (fileInstance.options.useTokenTransformer !== true) {
 			fileInstance.setOptions({
-				...rest,
-				useTokenTransformer: true,
-				enableGutterUtility: false,
-				enableLineSelection: false,
-				lineHoverHighlight: "disabled"
+				...fileInstance.options,
+				useTokenTransformer: true
 			});
 			fileInstance.rerender();
 		}
@@ -485,7 +482,7 @@ var Editor = class {
 		this.#renderRange = renderRange;
 		this.#viewportWindowLines = renderRange?.totalLines;
 		this.#tokenizer?.prebuildStateStack(renderRange);
-		this.#markerRenderer?.removePopup();
+		this.#markerRenderer?.removePopover();
 		if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) this.#updateSelections(this.#selections ?? []);
 		if (this.#initSelections !== void 0 && this.#primaryCaretElement !== void 0) {
 			this.#initSelections = void 0;
@@ -628,10 +625,10 @@ var Editor = class {
 	}
 	#getPopoverManager() {
 		return this.#popoverManager ??= new PopoverManager({
-			hasActivePopover: () => this.#selectionAction !== void 0 || this.#markerRenderer?.isPopupVisible() === true,
+			hasActivePopover: () => this.#selectionAction !== void 0 || this.#markerRenderer?.isPopoverVisible() === true,
 			updateActivePopover: () => {
 				this.#updateSelectionActionPopover();
-				this.#markerRenderer?.updatePopupPosition();
+				this.#markerRenderer?.updatePopoverPosition();
 			}
 		});
 	}
@@ -642,10 +639,11 @@ var Editor = class {
 		this.#lastAccessedCharX = void 0;
 	}
 	#resetState() {
-		this.#setSelectedLinesSafe(null);
+		this.#setEditorActiveLineSafe(null);
 		this.#gutterWidthCache = void 0;
 		this.#contentWidthCache = void 0;
 		this.#shouldIgnoreSelectionChange = false;
+		this.#suppressNativeSelectionSync = false;
 		this.#overlayElements?.forEach((el) => el.remove());
 		this.#overlayElements = void 0;
 		this.#selections = void 0;
@@ -728,6 +726,12 @@ var Editor = class {
 		this.#selectEventDisposes?.forEach((dispose) => dispose());
 		this.#selectEventDisposes = disposes;
 	}
+	#isLineSelectionEnabled() {
+		return this.#fileInstance?.options.enableLineSelection === true;
+	}
+	#preserveEditorSelectionsForGutterGesture() {
+		this.#suppressNativeSelectionSync = this.#selections !== void 0;
+	}
 	#listenContentElement(contentEl, gutterEl) {
 		const { onFocus, onBlur } = this.#options;
 		const targetIsContentElement = (e) => {
@@ -754,7 +758,7 @@ var Editor = class {
 					return;
 				}
 				this.#setDeletedTextSelectionActive(false);
-				this.#markerRenderer?.removePopup();
+				this.#markerRenderer?.removePopover();
 				if (isSafari() && this.#lineAnnotations !== void 0 && this.#lineAnnotations.length > 0) {
 					const annotationDisposes = [...contentEl.querySelectorAll("[data-line-annotation]")].map((el) => [addEventListener(el, "mouseenter", () => {
 						this.#shouldIgnoreSelectionChange = true;
@@ -887,9 +891,20 @@ var Editor = class {
 		];
 		const deletionsCode = this.#fileContainer?.shadowRoot?.querySelector("[data-deletions]");
 		if (deletionsCode != null) this.#editorEventDisposes.push(addEventListener(deletionsCode, "pointerdown", (e) => {
-			const target = e.composedPath()[0];
+			const path = e.composedPath();
+			if (isGutterUtilityPath(path)) {
+				this.#preserveEditorSelectionsForGutterGesture();
+				return;
+			}
+			const target = path[0];
 			const gutterRow = target instanceof HTMLElement ? target.closest("[data-column-number]") : null;
-			if (gutterRow instanceof HTMLElement && this.#beginDeletionGutterSelection(gutterRow, deletionsCode, e.pointerType === "mouse")) return;
+			if (gutterRow instanceof HTMLElement) {
+				if (this.#isLineSelectionEnabled()) {
+					this.#preserveEditorSelectionsForGutterGesture();
+					return;
+				}
+				if (this.#beginDeletionGutterSelection(gutterRow, deletionsCode, e.pointerType === "mouse")) return;
+			}
 			this.#setDeletedTextSelectionActive(true);
 			if (this.#selections !== void 0) this.#updateSelections([]);
 		}, { passive: true }));
@@ -908,7 +923,16 @@ var Editor = class {
 				return lineNumber - 1;
 			};
 			this.#editorEventDisposes.push(addEventListener(gutterEl, "pointerdown", (e) => {
-				const gutterRow = resolveGutterTarget(e.composedPath()[0]);
+				const path = e.composedPath();
+				if (isGutterUtilityPath(path)) {
+					this.#preserveEditorSelectionsForGutterGesture();
+					return;
+				}
+				const gutterRow = resolveGutterTarget(path[0]);
+				if (gutterRow !== void 0 && this.#isLineSelectionEnabled()) {
+					this.#preserveEditorSelectionsForGutterGesture();
+					return;
+				}
 				if (gutterRow?.dataset.lineType === "change-deletion") {
 					const code = gutterRow.closest("[data-code]");
 					if (code != null) this.#beginDeletionGutterSelection(gutterRow, code, e.pointerType === "mouse");
@@ -918,7 +942,7 @@ var Editor = class {
 				const textDocument = this.#textDocument;
 				const lineIndex = resolveEditableLine(gutterRow);
 				if (lineIndex === void 0 || textDocument === void 0) return;
-				this.#markerRenderer?.removePopup();
+				this.#markerRenderer?.removePopover();
 				const selection = this.#spanLineSelection(lineIndex, lineIndex, textDocument);
 				this.#isGutterMouseDown = true;
 				this.#selectionStart = selection;
@@ -994,7 +1018,7 @@ var Editor = class {
 					this.#updateSelections(expanded);
 					this.focus();
 				} else {
-					const nextMatch = findNexMatch(textDocument, selections);
+					const nextMatch = findNextMatch(textDocument, selections);
 					if (nextMatch !== void 0) {
 						this.#updateSelections(nextMatch);
 						const primaryMatch = nextMatch.at(-1);
@@ -1420,7 +1444,7 @@ var Editor = class {
 			this.#updateSelections(this.#selections ?? []);
 			if (this.#selections !== void 0) this.focus();
 		}
-		this.#markerRenderer?.removePopup();
+		this.#markerRenderer?.removePopover();
 		this.#computeContentOffset(this.#contentElement);
 	};
 	#remeasureMetricsOnFontLoad() {
@@ -1434,7 +1458,7 @@ var Editor = class {
 			this.#contentWidthCache = void 0;
 			this.#resetCache();
 			if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) this.#updateSelections(this.#selections ?? []);
-			this.#markerRenderer?.removePopup();
+			this.#markerRenderer?.removePopover();
 		});
 	}
 	#rerender(change, newLineAnnotations, renderRange = this.#renderRange, shouldUpdateBuffer) {
@@ -1742,7 +1766,7 @@ var Editor = class {
 		}
 		this.#setDeletedTextSelectionActive(true);
 		this.#updateSelections([]);
-		[...deletionsCode.querySelectorAll("[data-gutter] > [data-column-number]")][focusIndex]?.setAttribute("data-selected-line", "single");
+		this.#setEditorActiveLineSafe(getLineNumberAttr(focusContent) ?? null, true, "deletions");
 		const lo = Math.min(anchorIndex, focusIndex);
 		const hi = Math.max(anchorIndex, focusIndex);
 		this.#deletedSelectionText = lo < 0 ? "" : rows.slice(lo, hi + 1).filter((row) => row.getAttribute("data-line-type") === "change-deletion").map((row) => row.textContent ?? "").join("\n");
@@ -1780,19 +1804,18 @@ var Editor = class {
 		if (pre == null) return;
 		if (active) {
 			pre.setAttribute("data-deleted-text-selection", "");
-			for (const highlighted of pre.querySelectorAll("[data-selected-line]")) highlighted.removeAttribute("data-selected-line");
+			this.#setEditorActiveLineSafe(null);
 			this.#deletedSelectionText = "";
 		} else {
 			pre.removeAttribute("data-deleted-text-selection");
 			this.#deletedSelectionText = "";
 		}
 	}
-	#setSelectedLinesSafe(range, lineNumberOnly = false) {
+	#setEditorActiveLineSafe(lineNumber, lineNumberOnly = false, side = "additions") {
 		try {
-			this.#fileInstance?.setSelectedLines(range, {
-				notify: false,
-				activeLineSide: "additions",
-				lineNumberOnly
+			this.#fileInstance?.setEditorActiveLine(lineNumber, {
+				lineNumberOnly,
+				side
 			});
 		} catch {}
 	}
@@ -1806,7 +1829,7 @@ var Editor = class {
 	#updateSelections(selections) {
 		this.__postponeBgTokenizeToNextFrame();
 		this.#primaryCaretElement = void 0;
-		this.#setSelectedLinesSafe(null);
+		this.#setEditorActiveLineSafe(null);
 		if (selections.length === 0 && this.#matches === void 0 && this.#markerRenderer === void 0) {
 			this.#selections = void 0;
 			this.#overlayElements?.forEach((el) => el.remove());
@@ -1826,10 +1849,7 @@ var Editor = class {
 			this.#selections = normalizedSelections;
 			const hasNonEmptySelection = normalizedSelections.some((selection) => !isCollapsedSelection(selection));
 			const caretLine = getCaretPosition(primarySelection).line + 1;
-			this.#setSelectedLinesSafe({
-				start: caretLine,
-				end: caretLine
-			}, hasNonEmptySelection);
+			this.#setEditorActiveLineSafe(caretLine, hasNonEmptySelection);
 			for (const selection of normalizedSelections) {
 				if (!isCollapsedSelection(selection)) this.#renderSelection(renderCtx, "selection", selection);
 				this.#renderCaret(renderCtx, selection, selection === primarySelection);