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

package/dist/editor/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","names":["SHORTCUTS: Partial<Record<string, EditorCommand>>"],"sources":["../../src/editor/command.ts"],"sourcesContent":["import { isMacLike, isPrimaryModifier } from './platform';\n\nexport type EditorCommand =\n  | 'indent'\n  | 'outdent'\n  | 'undo'\n  | 'redo'\n  | 'selectAll'\n  | 'findNextMatch'\n  | 'openSearchPanel'\n  | 'moveCursorToDocStart'\n  | 'moveCursorToDocEnd'\n  | 'expandSelectionDocStart'\n  | 'expandSelectionDocEnd';\n\nconst SHORTCUTS: Partial<Record<string, EditorCommand>> = {\n  a: 'selectAll',\n  d: 'findNextMatch',\n  f: 'openSearchPanel',\n};\n\nexport function resolveEditorCommandFromKeyboardEvent(\n  event: KeyboardEvent,\n  isMac: boolean = isMacLike()\n): EditorCommand | undefined {\n  const hasPrimaryModifier = isPrimaryModifier(event, isMac);\n  const { shiftKey, altKey, key } = event;\n  if (altKey) {\n    return undefined;\n  }\n\n  const normalizedKey = key.length === 1 ? key.toLowerCase() : key;\n\n  if (!hasPrimaryModifier && normalizedKey === 'Tab') {\n    return shiftKey ? 'outdent' : 'indent';\n  }\n\n  if (!hasPrimaryModifier) {\n    return undefined;\n  }\n\n  if (normalizedKey === 'z') {\n    return shiftKey ? 'redo' : 'undo';\n  }\n\n  if (!isMac && normalizedKey === 'y') {\n    return 'redo';\n  }\n\n  if (normalizedKey === 'Home' || (isMac && normalizedKey === 'ArrowUp')) {\n    if (shiftKey) {\n      return 'expandSelectionDocStart';\n    }\n    return 'moveCursorToDocStart';\n  }\n\n  if (normalizedKey === 'End' || (isMac && normalizedKey === 'ArrowDown')) {\n    if (shiftKey) {\n      return 'expandSelectionDocEnd';\n    }\n    return 'moveCursorToDocEnd';\n  }\n\n  return SHORTCUTS[normalizedKey];\n}\n"],"mappings":";;;AAeA,MAAMA,YAAoD;CACxD,GAAG;CACH,GAAG;CACH,GAAG;CACJ;AAED,SAAgB,sCACd,OACA,QAAiB,WAAW,EACD;CAC3B,MAAM,qBAAqB,kBAAkB,OAAO,MAAM;CAC1D,MAAM,EAAE,UAAU,QAAQ,QAAQ;AAClC,KAAI,OACF;CAGF,MAAM,gBAAgB,IAAI,WAAW,IAAI,IAAI,aAAa,GAAG;AAE7D,KAAI,CAAC,sBAAsB,kBAAkB,MAC3C,QAAO,WAAW,YAAY;AAGhC,KAAI,CAAC,mBACH;AAGF,KAAI,kBAAkB,IACpB,QAAO,WAAW,SAAS;AAG7B,KAAI,CAAC,SAAS,kBAAkB,IAC9B,QAAO;AAGT,KAAI,kBAAkB,UAAW,SAAS,kBAAkB,WAAY;AACtE,MAAI,SACF,QAAO;AAET,SAAO;;AAGT,KAAI,kBAAkB,SAAU,SAAS,kBAAkB,aAAc;AACvE,MAAI,SACF,QAAO;AAET,SAAO;;AAGT,QAAO,UAAU"}
+{"version":3,"file":"command.js","names":[],"sources":["../../src/editor/command.ts"],"sourcesContent":["import { isMacLike, isPrimaryModifier } from './platform';\n\nexport type EditorCommand =\n  | 'indent'\n  | 'outdent'\n  | 'indentLess'\n  | 'indentMore'\n  | 'undo'\n  | 'redo'\n  | 'selectAll'\n  | 'findNextMatch'\n  | 'openSearchPanel'\n  | 'openSearchReplacePanel'\n  | 'moveLineUp'\n  | 'moveLineDown'\n  | 'copyLineUp'\n  | 'copyLineDown'\n  | 'simplifySelection'\n  | 'insertBlankLine'\n  | 'deleteHardLineForward'\n  | 'toggleComment'\n  | 'toggleBlockComment'\n  | 'moveCursorToDocStart'\n  | 'moveCursorToDocEnd'\n  | 'expandSelectionDocStart'\n  | 'expandSelectionDocEnd';\n\nconst SHORTCUTS: Partial<Record<string, EditorCommand>> = {\n  a: 'selectAll',\n  d: 'findNextMatch',\n};\n\nexport function resolveEditorCommandFromKeyboardEvent(\n  event: KeyboardEvent,\n  isMac: boolean = isMacLike()\n): EditorCommand | undefined {\n  const hasPrimaryModifier = isPrimaryModifier(event, isMac);\n  const { shiftKey, altKey, key } = event;\n\n  const normalizedKey = key.length === 1 ? key.toLowerCase() : key;\n\n  // Safari and Firefox do not report macOS control+k as a beforeinput action,\n  // so resolve the native delete-to-line-end shortcut from keydown instead.\n  if (\n    isMac &&\n    event.ctrlKey &&\n    !event.metaKey &&\n    !shiftKey &&\n    !altKey &&\n    (normalizedKey === 'k' || event.code === 'KeyK')\n  ) {\n    return 'deleteHardLineForward';\n  }\n\n  if (\n    !event.metaKey &&\n    !event.ctrlKey &&\n    shiftKey &&\n    altKey &&\n    (normalizedKey === 'a' || event.code === 'KeyA')\n  ) {\n    return 'toggleBlockComment';\n  }\n\n  if (!event.metaKey && !event.ctrlKey && shiftKey && altKey) {\n    if (normalizedKey === 'ArrowUp') {\n      return 'copyLineUp';\n    }\n    if (normalizedKey === 'ArrowDown') {\n      return 'copyLineDown';\n    }\n  }\n\n  if (\n    !event.metaKey &&\n    !event.ctrlKey &&\n    !shiftKey &&\n    !altKey &&\n    normalizedKey === 'Escape'\n  ) {\n    return 'simplifySelection';\n  }\n\n  if (!event.metaKey && !shiftKey) {\n    if (!event.ctrlKey && altKey && normalizedKey === 'ArrowUp') {\n      return 'moveLineUp';\n    }\n    if (!event.ctrlKey && altKey && normalizedKey === 'ArrowDown') {\n      return 'moveLineDown';\n    }\n    if (\n      (isMac || navigator.platform.includes('Linux')) &&\n      event.ctrlKey &&\n      altKey\n    ) {\n      if (normalizedKey === 'p' || event.code === 'KeyP') {\n        return 'moveLineUp';\n      }\n      if (normalizedKey === 'n' || event.code === 'KeyN') {\n        return 'moveLineDown';\n      }\n    }\n  }\n\n  // cmd/ctrl+f opens the search panel in find mode; adding alt opens it in\n  // find/replace mode. macOS emits a dead key for Option+F (key === 'ƒ'), so\n  // fall back to event.code to detect the physical F key.\n  if (hasPrimaryModifier && (normalizedKey === 'f' || event.code === 'KeyF')) {\n    return altKey ? 'openSearchReplacePanel' : 'openSearchPanel';\n  }\n\n  if (altKey) {\n    return undefined;\n  }\n\n  if (!hasPrimaryModifier && normalizedKey === 'Tab') {\n    return shiftKey ? 'outdent' : 'indent';\n  }\n\n  if (!hasPrimaryModifier) {\n    return undefined;\n  }\n\n  if (!shiftKey && normalizedKey === 'Enter') {\n    return 'insertBlankLine';\n  }\n\n  if (!shiftKey && (normalizedKey === '/' || event.code === 'Slash')) {\n    return 'toggleComment';\n  }\n\n  if (!shiftKey && normalizedKey === '[') {\n    return 'indentLess';\n  }\n\n  if (!shiftKey && normalizedKey === ']') {\n    return 'indentMore';\n  }\n\n  if (normalizedKey === 'z') {\n    return shiftKey ? 'redo' : 'undo';\n  }\n\n  if (!isMac && normalizedKey === 'y') {\n    return 'redo';\n  }\n\n  if (normalizedKey === 'Home' || (isMac && normalizedKey === 'ArrowUp')) {\n    if (shiftKey) {\n      return 'expandSelectionDocStart';\n    }\n    return 'moveCursorToDocStart';\n  }\n\n  if (normalizedKey === 'End' || (isMac && normalizedKey === 'ArrowDown')) {\n    if (shiftKey) {\n      return 'expandSelectionDocEnd';\n    }\n    return 'moveCursorToDocEnd';\n  }\n\n  return SHORTCUTS[normalizedKey];\n}\n\n// Detects the native \"find again\" shortcut (cmd/ctrl+g for next, adding shift\n// for previous) so the find/replace panel can override the browser default and\n// step through matches. macOS can emit a dead key for the physical G, so fall\n// back to event.code like the cmd+f handling above.\nexport function resolveFindAgainShortcut(\n  event: KeyboardEvent,\n  isMac: boolean = isMacLike()\n): 'next' | 'previous' | undefined {\n  if (event.altKey) {\n    return undefined;\n  }\n  if (!isPrimaryModifier(event, isMac)) {\n    return undefined;\n  }\n  const normalizedKey =\n    event.key.length === 1 ? event.key.toLowerCase() : event.key;\n  if (normalizedKey === 'g' || event.code === 'KeyG') {\n    return event.shiftKey ? 'previous' : 'next';\n  }\n  return undefined;\n}\n"],"mappings":";;AA2BA,MAAM,YAAoD;CACxD,GAAG;CACH,GAAG;AACL;AAEA,SAAgB,sCACd,OACA,QAAiB,UAAU,GACA;CAC3B,MAAM,qBAAqB,kBAAkB,OAAO,KAAK;CACzD,MAAM,EAAE,UAAU,QAAQ,QAAQ;CAElC,MAAM,gBAAgB,IAAI,WAAW,IAAI,IAAI,YAAY,IAAI;CAI7D,IACE,SACA,MAAM,WACN,CAAC,MAAM,WACP,CAAC,YACD,CAAC,WACA,kBAAkB,OAAO,MAAM,SAAS,SAEzC,OAAO;CAGT,IACE,CAAC,MAAM,WACP,CAAC,MAAM,WACP,YACA,WACC,kBAAkB,OAAO,MAAM,SAAS,SAEzC,OAAO;CAGT,IAAI,CAAC,MAAM,WAAW,CAAC,MAAM,WAAW,YAAY,QAAQ;EAC1D,IAAI,kBAAkB,WACpB,OAAO;EAET,IAAI,kBAAkB,aACpB,OAAO;CAEX;CAEA,IACE,CAAC,MAAM,WACP,CAAC,MAAM,WACP,CAAC,YACD,CAAC,UACD,kBAAkB,UAElB,OAAO;CAGT,IAAI,CAAC,MAAM,WAAW,CAAC,UAAU;EAC/B,IAAI,CAAC,MAAM,WAAW,UAAU,kBAAkB,WAChD,OAAO;EAET,IAAI,CAAC,MAAM,WAAW,UAAU,kBAAkB,aAChD,OAAO;EAET,KACG,SAAS,UAAU,SAAS,SAAS,OAAO,MAC7C,MAAM,WACN,QACA;GACA,IAAI,kBAAkB,OAAO,MAAM,SAAS,QAC1C,OAAO;GAET,IAAI,kBAAkB,OAAO,MAAM,SAAS,QAC1C,OAAO;EAEX;CACF;CAKA,IAAI,uBAAuB,kBAAkB,OAAO,MAAM,SAAS,SACjE,OAAO,SAAS,2BAA2B;CAG7C,IAAI,QACF;CAGF,IAAI,CAAC,sBAAsB,kBAAkB,OAC3C,OAAO,WAAW,YAAY;CAGhC,IAAI,CAAC,oBACH;CAGF,IAAI,CAAC,YAAY,kBAAkB,SACjC,OAAO;CAGT,IAAI,CAAC,aAAa,kBAAkB,OAAO,MAAM,SAAS,UACxD,OAAO;CAGT,IAAI,CAAC,YAAY,kBAAkB,KACjC,OAAO;CAGT,IAAI,CAAC,YAAY,kBAAkB,KACjC,OAAO;CAGT,IAAI,kBAAkB,KACpB,OAAO,WAAW,SAAS;CAG7B,IAAI,CAAC,SAAS,kBAAkB,KAC9B,OAAO;CAGT,IAAI,kBAAkB,UAAW,SAAS,kBAAkB,WAAY;EACtE,IAAI,UACF,OAAO;EAET,OAAO;CACT;CAEA,IAAI,kBAAkB,SAAU,SAAS,kBAAkB,aAAc;EACvE,IAAI,UACF,OAAO;EAET,OAAO;CACT;CAEA,OAAO,UAAU;AACnB;AAMA,SAAgB,yBACd,OACA,QAAiB,UAAU,GACM;CACjC,IAAI,MAAM,QACR;CAEF,IAAI,CAAC,kBAAkB,OAAO,KAAK,GACjC;CAIF,KADE,MAAM,IAAI,WAAW,IAAI,MAAM,IAAI,YAAY,IAAI,MAAM,SACrC,OAAO,MAAM,SAAS,QAC1C,OAAO,MAAM,WAAW,aAAa;AAGzC"}

package/dist/editor/editStack.d.ts

@@ -1,6 +1,5 @@
-import { DiffLineAnnotation } from "../types.js";
+import { DiffLineAnnotation, EditorSelection } from "../types.js";
 import { ResolvedTextEdit, TextDocument } from "./textDocument.js";
-import { EditorSelection } from "./selection.js";
 
 //#region src/editor/editStack.d.ts
 /** An entry in the edit stack. */
@@ -21,6 +20,12 @@ interface EditStackEntry<LAnnotation> {
   lineAnnotationsBefore?: DiffLineAnnotation<LAnnotation>[];
   /** Line annotations after the transaction. */
   lineAnnotationsAfter?: DiffLineAnnotation<LAnnotation>[];
+  /**
+   * When `true`, this entry is its own undo step and never merges with the
+   * entry before or after it. Set for paste and cut, which otherwise look like
+   * typing and would merge into the previous keystroke.
+   */
+  undoBoundary?: boolean;
 }
 /** Options for the edit stack. */
 interface EditStackOptions {

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

@@ -1 +1 @@
-{"version":3,"file":"editStack.d.ts","names":["DiffLineAnnotation","EditorSelection","ResolvedTextEdit","TextDocument","EditStackEntry","LAnnotation","EditStackOptions","EditStack","createEditStackEntry","shouldCoalesceEditStackEntry","coalesceEditStackEntries"],"sources":["../../src/editor/editStack.d.ts"],"sourcesContent":["import type { DiffLineAnnotation } from '../types';\nimport type { EditorSelection } from './selection';\nimport type { ResolvedTextEdit, TextDocument } from './textDocument';\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/** 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/** A stack of edit entries. */\nexport declare class EditStack<LAnnotation> {\n    #private;\n    constructor(options?: EditStackOptions);\n    get canUndo(): boolean;\n    get canRedo(): boolean;\n    /** Clears both the undo and redo stacks. */\n    clear(): void;\n    /** Clears the redo stack. */\n    clearRedo(): void;\n    /** Pushes a new entry onto the undo stack. */\n    push(entry: EditStackEntry<LAnnotation>): void;\n    /** Sets the selections after the last undo entry. */\n    setLastUndoSelectionsAfter(selections: EditorSelection[]): void;\n    /** Sets the line annotations after the last undo entry. */\n    setLastUndoLineAnnotations(lineAnnotationsBefore: DiffLineAnnotation<LAnnotation>[], lineAnnotationsAfter: DiffLineAnnotation<LAnnotation>[]): void;\n    /** Returns the last undo entry, or `undefined` if empty. */\n    peekUndo(): EditStackEntry<LAnnotation> | undefined;\n    /** Replaces the last undo entry with the given entry. */\n    replaceLastUndo(entry: EditStackEntry<LAnnotation>): void;\n    /** Moves the latest undo entry to the redo stack and returns it, or `undefined` if empty. */\n    popUndoToRedo(): EditStackEntry<LAnnotation> | void;\n    /** Moves the latest redo entry back to the undo stack and returns it, or `undefined` if empty. */\n    popRedoToUndo(): EditStackEntry<LAnnotation> | void;\n}\nexport declare function createEditStackEntry<LAnnotation>(textDocument: TextDocument<LAnnotation>, resolvedEdits: ResolvedTextEdit[], versionBefore: number, versionAfter: number, selectionsBefore?: EditorSelection[], selectionsAfter?: EditorSelection[], lineAnnotationsBefore?: DiffLineAnnotation<LAnnotation>[], lineAnnotationsAfter?: DiffLineAnnotation<LAnnotation>[]): EditStackEntry<LAnnotation>;\n/** Determines if the change matches following modes:\n * - 'insert': simple typing\n * - 'backspace': backward delete\n * - 'delete': forward delete\n */\nexport declare function shouldCoalesceEditStackEntry<LAnnotation>(previousEntry: EditStackEntry<LAnnotation> | undefined, nextEntry: EditStackEntry<LAnnotation>): boolean;\n/** Coalesce edit stack entries for simple typing and single-character deletes. */\nexport declare function coalesceEditStackEntries<LAnnotation>(previousEntry: EditStackEntry<LAnnotation>, nextEntry: EditStackEntry<LAnnotation>): EditStackEntry<LAnnotation>;\n//# sourceMappingURL=editStack.d.ts.map"],"mappings":";;;;;;UAIiBI;EAAAA;EAECF,YAAAA,EAAAA,gBAAAA,EAAAA;EAEAA;EAMKD,YAAAA,EANLC,gBAMKD,EAAAA;EAEDA;EAEyBI,aAAAA,EAAAA,MAAAA;EAAnBL;EAEkBK,YAAAA,EAAAA,MAAAA;EAAnBL;EAAkB,gBAAA,CAAA,EANtBC,eAMsB,EAAA;EAG5BK;EAKIC,eAAS,CAAA,EAZRN,eAYQI,EAAA;EAEJC;EAQKD,qBAAAA,CAAAA,EApBHL,kBAoBGK,CApBgBA,WAoBhBA,CAAAA,EAAAA;EAAfD;EAE2BH,oBAAAA,CAAAA,EApBhBD,kBAoBgBC,CApBGI,WAoBHJ,CAAAA,EAAAA;;;AAEuFI,UAnBjHC,gBAAAA,CAmBiHD;EAAnBL;EAEhFK,UAAAA,CAAAA,EAAAA,MAAAA;;;AAEJD,cAlBNG,SAkBMH,CAAAA,WAAAA,CAAAA,CAAAA;EAESC,CAAAA,OAAAA;EAAfD,WAAAA,CAAAA,OAAAA,CAAAA,EAlBKE,gBAkBLF;EAEeC,IAAAA,OAAAA,CAAAA,CAAAA,EAAAA,OAAAA;EAAfD,IAAAA,OAAAA,CAAAA,CAAAA,EAAAA,OAAAA;EAAc;EAEXI,KAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAA6DH;EAAbF,SAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAA0CD;EAAoFD,IAAAA,CAAAA,KAAAA,EAdtLG,cAcsLH,CAdvKI,WAcuKJ,CAAAA,CAAAA,EAAAA,IAAAA;EAAqCA;EAA8DI,0BAAAA,CAAAA,UAAAA,EAZ9PJ,eAY8PI,EAAAA,CAAAA,EAAAA,IAAAA;EAAnBL;EAA6EK,0BAAAA,CAAAA,qBAAAA,EAV7SL,kBAU6SK,CAV1RA,WAU0RA,CAAAA,EAAAA,EAAAA,oBAAAA,EAVpPL,kBAUoPK,CAVjOA,WAUiOA,CAAAA,EAAAA,CAAAA,EAAAA,IAAAA;EAAnBL;EAAmDK,QAAAA,CAAAA,CAAAA,EARnXD,cAQmXC,CARpWA,WAQoWA,CAAAA,GAAAA,SAAAA;EAAfD;EAAc,eAAA,CAAA,KAAA,EANvWA,cAMuW,CANxVC,WAMwV,CAAA,CAAA,EAAA,IAAA;EAM1WI;EAAwEJ,aAAAA,CAAAA,CAAAA,EAV3ED,cAU2EC,CAV5DA,WAU4DA,CAAAA,GAAAA,IAAAA;EAAfD;EAAmEC,aAAAA,CAAAA,CAAAA,EAR/HD,cAQ+HC,CARhHA,WAQgHA,CAAAA,GAAAA,IAAAA;;AAAD,iBAN3HG,oBAM2H,CAAA,WAAA,CAAA,CAAA,YAAA,EAN3EL,YAM2E,CAN9DE,WAM8D,CAAA,EAAA,aAAA,EANjCH,gBAMiC,EAAA,EAAA,aAAA,EAAA,MAAA,EAAA,YAAA,EAAA,MAAA,EAAA,gBAAA,CAAA,EANmDD,eAMnD,EAAA,EAAA,eAAA,CAAA,EANwFA,eAMxF,EAAA,EAAA,qBAAA,CAAA,EANmID,kBAMnI,CANsJK,WAMtJ,CAAA,EAAA,EAAA,oBAAA,CAAA,EAN6LL,kBAM7L,CANgNK,WAMhN,CAAA,EAAA,CAAA,EANiOD,cAMjO,CANgPC,WAMhP,CAAA;AAEnJ;;;;;AAAkKA,iBAF1II,4BAE0IJ,CAAAA,WAAAA,CAAAA,CAAAA,aAAAA,EAFjFD,cAEiFC,CAFlEA,WAEkEA,CAAAA,GAAAA,SAAAA,EAAAA,SAAAA,EAF7BD,cAE6BC,CAFdA,WAEcA,CAAAA,CAAAA,EAAAA,OAAAA;;AAAD,iBAAzIK,wBAAyI,CAAA,WAAA,CAAA,CAAA,aAAA,EAApFN,cAAoF,CAArEC,WAAqE,CAAA,EAAA,SAAA,EAA5CD,cAA4C,CAA7BC,WAA6B,CAAA,CAAA,EAAdD,cAAc,CAACC,WAAD,CAAA"}
+{"version":3,"file":"editStack.d.ts","names":[],"sources":["../../src/editor/editStack.ts"],"mappings":";;;;;UAOiB,cAAA;EAAA;EAEf,YAAA,EAAc,gBAAA;EAFe;EAI7B,YAAA,EAAc,gBAAA;EAAA;EAEd,aAAA;EAMkB;EAJlB,YAAA;EAMwB;EAJxB,gBAAA,GAAmB,eAAA;EAMI;EAJvB,eAAA,GAAkB,eAAA;EAIuB;EAFzC,qBAAA,GAAwB,kBAAA,CAAmB,WAAA;EAZ3C;EAcA,oBAAA,GAAuB,kBAAA,CAAmB,WAAA;EAZ1C;;;;;EAkBA,YAAA;AAAA;;UAIe,gBAAA;EAZS;EAcxB,UAAU;AAAA;;cAIC,SAAA;EAAA;EAKX,WAAA,CAAY,OAAA,GAAU,gBAAA;EAAA,IAOlB,OAAA;EAAA,IAIA,OAAA;EAtB2B;EA2B/B,KAAA;EAzBU;EA+BV,SAAA;EA3BW;EAgCX,IAAA,CAAK,KAAA,EAAO,cAAA,CAAe,WAAA;EAhCP;EAyCpB,0BAAA,CAA2B,UAAA,EAAY,eAAA;EATZ;EAmB3B,0BAAA,CACE,qBAAA,EAAuB,kBAAA,CAAmB,WAAA,KAC1C,oBAAA,EAAsB,kBAAA,CAAmB,WAAA;EAZJ;EAsBvC,QAAA,IAAY,cAAA,CAAe,WAAA;EAXF;EAgBzB,eAAA,CAAgB,KAAA,EAAO,cAAA,CAAe,WAAA;EAfd;EAyBxB,aAAA,IAAiB,cAAA,CAAe,WAAA;EAfpB;EAwBZ,aAAA,IAAiB,cAAA,CAAe,WAAA;AAAA;AAAA,iBASlB,oBAAA,cACd,YAAA,EAAc,YAAA,CAAa,WAAA,GAC3B,aAAA,EAAe,gBAAA,IACf,aAAA,UACA,YAAA,UACA,gBAAA,GAAmB,eAAA,IACnB,eAAA,GAAkB,eAAA,IAClB,qBAAA,GAAwB,kBAAA,CAAmB,WAAA,KAC3C,oBAAA,GAAuB,kBAAA,CAAmB,WAAA,MACzC,cAAA,CAAe,WAAA;;;;;;iBAiCF,4BAAA,cACd,aAAA,EAAe,cAAA,CAAe,WAAA,eAC9B,SAAA,EAAW,cAAA,CAAe,WAAA;;iBAoFZ,wBAAA,cACd,aAAA,EAAe,cAAA,CAAe,WAAA,GAC9B,SAAA,EAAW,cAAA,CAAe,WAAA,IACzB,cAAA,CAAe,WAAA"}

package/dist/editor/editStack.js

@@ -104,7 +104,7 @@ function createEditStackEntry(textDocument, resolvedEdits, versionBefore, versio
 * - 'delete': forward delete
 */
 function shouldCoalesceEditStackEntry(previousEntry, nextEntry) {
-	if (previousEntry === void 0 || previousEntry.forwardEdits.length === 0 || previousEntry.forwardEdits.length !== previousEntry.inverseEdits.length || previousEntry.forwardEdits.length !== nextEntry.forwardEdits.length || nextEntry.forwardEdits.length !== nextEntry.inverseEdits.length) return false;
+	if (previousEntry === void 0 || previousEntry.undoBoundary === true || nextEntry.undoBoundary === true || previousEntry.forwardEdits.length === 0 || previousEntry.forwardEdits.length !== previousEntry.inverseEdits.length || previousEntry.forwardEdits.length !== nextEntry.forwardEdits.length || nextEntry.forwardEdits.length !== nextEntry.inverseEdits.length) return false;
 	let mode;
 	for (let i = 0; i < previousEntry.forwardEdits.length; i++) {
 		const previousForward = previousEntry.forwardEdits[i];
@@ -113,9 +113,9 @@ function shouldCoalesceEditStackEntry(previousEntry, nextEntry) {
 		const nextInverse = nextEntry.inverseEdits[i];
 		const mappedNextStart = mapOffsetAfterForwardBatchToBefore(nextForward.start, previousEntry.forwardEdits);
 		const previousWasInsert = previousForward.start <= previousForward.end && previousForward.text.length > 0 && !previousForward.text.includes("\n") && !previousInverse.text.includes("\n");
-		const nextIsInsert = nextForward.start === nextForward.end && nextForward.text.length > 0 && nextInverse.text.length === 0;
+		const nextIsInsert = nextForward.start === nextForward.end && nextForward.text.length > 0 && !nextForward.text.includes("\n") && nextInverse.text.length === 0;
 		if (previousWasInsert && nextIsInsert) {
-			if (mappedNextStart !== previousForward.end) return false;
+			if (nextForward.start !== previousInverse.end) return false;
 			mode ??= "insert";
 			if (mode !== "insert") return false;
 			continue;
@@ -212,7 +212,7 @@ function mapOffsetAfterForwardBatchToBefore(offsetAfter, forwardEdits) {
 	}
 	return offset;
 }
-
 //#endregion
 export { EditStack, coalesceEditStackEntries, createEditStackEntry, shouldCoalesceEditStackEntry };
+
 //# sourceMappingURL=editStack.js.map

package/dist/editor/editStack.js.map

@@ -1 +1 @@
-{"version":3,"file":"editStack.js","names":["#maxEntries","#undoStack","#redoStack","inverseEdits: ResolvedTextEdit[]","mode: 'insert' | 'backspace' | 'delete' | undefined","forwardEdits: ResolvedTextEdit[]","replacedTexts: string[]"],"sources":["../../src/editor/editStack.ts"],"sourcesContent":["import type { DiffLineAnnotation } from '../types';\nimport type { EditorSelection } from './selection';\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\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.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      nextInverse.text.length === 0;\n    if (previousWasInsert && nextIsInsert) {\n      const expectedMappedNextStart = previousForward.end;\n      // Allow continuing typing after replacing a selection (e.g. \"hello\" -> \"w\")\n      // while still requiring that the cursor extension maps inside the same base range.\n      if (mappedNextStart !== expectedMappedNextStart) {\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"],"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":";;AAIA,MAAM,iCAAiC;;AAmCvC,IAAa,YAAb,MAAoC;CAClC,aAA4C,CAAC;CAC7C,aAA4C,CAAC;CAC7C;CAEA,YAAY,SAA4B;EACtC,KAAKA,cAAc,KAAK,IACtB,GACA,SAAS,cAAc,8BACzB;CACF;CAEA,IAAI,UAAmB;EACrB,OAAO,KAAKC,WAAW,SAAS;CAClC;CAEA,IAAI,UAAmB;EACrB,OAAO,KAAKC,WAAW,SAAS;CAClC;;CAGA,QAAc;EACZ,KAAKD,WAAW,SAAS;EACzB,KAAKC,WAAW,SAAS;CAC3B;;CAGA,YAAkB;EAChB,KAAKA,WAAW,SAAS;CAC3B;;CAGA,KAAK,OAA0C;EAC7C,KAAKD,WAAW,KAAK,KAAK;EAC1B,KAAK,UAAU;EACf,IAAI,KAAKA,WAAW,SAAS,KAAKD,aAChC,KAAKC,WAAW,MAAM;CAE1B;;CAGA,2BAA2B,YAAqC;EAC9D,MAAM,YAAY,KAAKA,WAAW,KAAKA,WAAW,SAAS;EAC3D,IAAI,cAAc,KAAA,GAChB,UAAU,kBAAkB,WAAW,KAAK,eAAe,EACzD,GAAG,UACL,EAAE;CAEN;;CAGA,2BACE,uBACA,sBACM;EACN,MAAM,YAAY,KAAKA,WAAW,KAAKA,WAAW,SAAS;EAC3D,IAAI,cAAc,KAAA,GAAW;GAC3B,UAAU,wBAAwB,sBAAsB,MAAM;GAC9D,UAAU,uBAAuB,qBAAqB,MAAM;EAC9D;CACF;;CAGA,WAAoD;EAClD,OAAO,KAAKA,WAAW,KAAKA,WAAW,SAAS;CAClD;;CAGA,gBAAgB,OAA0C;EACxD,IAAI,KAAKA,WAAW,WAAW,GAAG;GAChC,KAAK,KAAK,KAAK;GACf;EACF;EACA,KAAKA,WAAW,KAAKA,WAAW,SAAS,KAAK;EAC9C,KAAK,UAAU;CACjB;;CAGA,gBAAoD;EAClD,MAAM,QAAQ,KAAKA,WAAW,IAAI;EAClC,IAAI,UAAU,KAAA,GAAW;GACvB,KAAKC,WAAW,KAAK,KAAK;GAC1B,OAAO;EACT;CACF;;CAGA,gBAAoD;EAClD,MAAM,QAAQ,KAAKA,WAAW,IAAI;EAClC,IAAI,UAAU,KAAA,GAAW;GACvB,KAAKD,WAAW,KAAK,KAAK;GAC1B,OAAO;EACT;CACF;AACF;AAEA,SAAgB,qBACd,cACA,eACA,eACA,cACA,kBACA,iBACA,uBACA,sBAC6B;CAC7B,MAAM,eAAe,CAAC,GAAG,aAAa,CAAC,CAAC,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,KAAK;CACxE,MAAM,eAAmC,CAAC;CAC1C,KAAK,IAAI,IAAI,GAAG,cAAc,GAAG,IAAI,aAAa,QAAQ,KAAK;EAC7D,MAAM,OAAO,aAAa;EAC1B,MAAM,eAAe,aAAa,aAAa,KAAK,OAAO,KAAK,GAAG;EACnE,MAAM,iBAAiB,KAAK,QAAQ;EACpC,aAAa,KAAK;GAChB,OAAO;GACP,KAAK,iBAAiB,KAAK,KAAK;GAChC,MAAM;EACR,CAAC;EACD,eAAe,KAAK,KAAK,UAAU,KAAK,MAAM,KAAK;CACrD;CACA,OAAO;EACL,cAAc,aAAa,KAAK,UAAU,EAAE,GAAG,KAAK,EAAE;EACxC;EACd;EACA;EACA,kBAAkB,kBAAkB,KAAK,eAAe,EACtD,GAAG,UACL,EAAE;EACF,iBAAiB,iBAAiB,KAAK,eAAe,EAAE,GAAG,UAAU,EAAE;EACvE,uBAAuB,uBAAuB,MAAM;EACpD,sBAAsB,sBAAsB,MAAM;CACpD;AACF;;;;;;AAOA,SAAgB,6BACd,eACA,WACS;CACT,IACE,kBAAkB,KAAA,KAClB,cAAc,iBAAiB,QAC/B,UAAU,iBAAiB,QAC3B,cAAc,aAAa,WAAW,KACtC,cAAc,aAAa,WAAW,cAAc,aAAa,UACjE,cAAc,aAAa,WAAW,UAAU,aAAa,UAC7D,UAAU,aAAa,WAAW,UAAU,aAAa,QAEzD,OAAO;CAET,IAAI;CACJ,KAAK,IAAI,IAAI,GAAG,IAAI,cAAc,aAAa,QAAQ,KAAK;EAC1D,MAAM,kBAAkB,cAAc,aAAa;EACnD,MAAM,kBAAkB,cAAc,aAAa;EACnD,MAAM,cAAc,UAAU,aAAa;EAC3C,MAAM,cAAc,UAAU,aAAa;EAC3C,MAAM,kBAAkB,mCACtB,YAAY,OACZ,cAAc,YAChB;EACA,MAAM,oBACJ,gBAAgB,SAAS,gBAAgB,OACzC,gBAAgB,KAAK,SAAS,KAC9B,CAAC,gBAAgB,KAAK,SAAS,IAAI,KACnC,CAAC,gBAAgB,KAAK,SAAS,IAAI;EACrC,MAAM,eACJ,YAAY,UAAU,YAAY,OAClC,YAAY,KAAK,SAAS,KAC1B,CAAC,YAAY,KAAK,SAAS,IAAI,KAC/B,YAAY,KAAK,WAAW;EAC9B,IAAI,qBAAqB,cAAc;GAQrC,IAAI,YAAY,UAAU,gBAAgB,KACxC,OAAO;GAET,SAAS;GACT,IAAI,SAAS,UACX,OAAO;GAET;EACF;EACA,MAAM,oBACJ,gBAAgB,KAAK,WAAW,KAChC,gBAAgB,MAAM,gBAAgB,SACtC,gBAAgB,KAAK,SAAS;EAChC,MAAM,eACJ,YAAY,KAAK,WAAW,KAC5B,YAAY,MAAM,YAAY,SAC9B,YAAY,KAAK,SAAS;EAC5B,IAAI,qBAAqB,cAAc;GACrC,IAAI,oBAAoB,gBAAgB,KAAK;IAC3C,SAAS;IACT,IAAI,SAAS,UACX,OAAO;IAET;GACF;GACA,IACE,mBAAmB,YAAY,MAAM,YAAY,WACjD,gBAAgB,OAEhB,OAAO;GAET,SAAS;GACT,IAAI,SAAS,aACX,OAAO;GAET;EACF;EACA,OAAO;CACT;CACA,OAAO,SAAS,KAAA;AAClB;;AAGA,SAAgB,yBACd,eACA,WAC6B;CAC7B,MAAM,eAAmC,CAAC;CAC1C,MAAM,gBAA0B,CAAC;CACjC,KAAK,IAAI,IAAI,GAAG,IAAI,cAAc,aAAa,QAAQ,KAAK;EAC1D,MAAM,kBAAkB,cAAc,aAAa;EACnD,MAAM,kBAAkB,cAAc,aAAa;EACnD,MAAM,cAAc,UAAU,aAAa;EAC3C,MAAM,cAAc,UAAU,aAAa;EAC3C,MAAM,kBAAkB,mCACtB,YAAY,OACZ,cAAc,YAChB;EAEA,IAAI,gBAAgB,KAAK,SAAS,GAAG;GACnC,aAAa,KAAK;IAChB,OAAO,gBAAgB;IACvB,KAAK,gBAAgB;IACrB,MAAM,gBAAgB,OAAO,YAAY;GAC3C,CAAC;GACD,cAAc,KAAK,gBAAgB,IAAI;GACvC;EACF;EAEA,IAAI,oBAAoB,gBAAgB,KAAK;GAC3C,aAAa,KAAK;IAChB,OAAO,gBAAgB;IACvB,KAAK,mBAAmB,YAAY,MAAM,YAAY;IACtD,MAAM;GACR,CAAC;GACD,cAAc,KAAK,gBAAgB,OAAO,YAAY,IAAI;GAC1D;EACF;EAEA,aAAa,KAAK;GAChB,OAAO,KAAK,IAAI,gBAAgB,OAAO,eAAe;GACtD,KAAK,gBAAgB;GACrB,MAAM;EACR,CAAC;EACD,cAAc,KAAK,YAAY,OAAO,gBAAgB,IAAI;CAC5D;CAEA,OAAO;EACL;EACA,cAAc,mCACZ,cACA,aACF;EACA,eAAe,cAAc;EAC7B,cAAc,UAAU;EACxB,kBAAkB,cAAc,kBAAkB,MAAM;EACxD,iBAAiB,UAAU,iBAAiB,MAAM;EAClD,uBAAuB,cAAc,uBAAuB,MAAM;EAClE,sBAAsB,UAAU,sBAAsB,MAAM;CAC9D;AACF;AAEA,SAAS,mCACP,cACA,eACoB;CACpB,MAAM,eAAmC,CAAC;CAC1C,KAAK,IAAI,IAAI,GAAG,cAAc,GAAG,IAAI,aAAa,QAAQ,KAAK;EAC7D,MAAM,OAAO,aAAa;EAC1B,MAAM,iBAAiB,KAAK,QAAQ;EACpC,aAAa,KAAK;GAChB,OAAO;GACP,KAAK,iBAAiB,KAAK,KAAK;GAChC,MAAM,cAAc;EACtB,CAAC;EACD,eAAe,KAAK,KAAK,UAAU,KAAK,MAAM,KAAK;CACrD;CACA,OAAO;AACT;AAEA,SAAS,mCACP,aACA,cACQ;CACR,IAAI,SAAS;CACb,KAAK,MAAM,QAAQ,cAAc;EAC/B,MAAM,YAAY,KAAK,MAAM,KAAK;EAClC,MAAM,YAAY,KAAK,KAAK;EAC5B,MAAM,QAAQ,YAAY;EAC1B,IAAI,SAAS,KAAK,OAChB;EAEF,IAAI,UAAU,KAAK,QAAQ,WAAW;GACpC,UAAU;GACV;EACF;EACA,SAAS,KAAK,QAAQ,KAAK,IAAI,SAAS,KAAK,OAAO,SAAS;CAC/D;CACA,OAAO;AACT"}

package/dist/editor/editor.d.ts

@@ -1,21 +1,104 @@
-import { DiffLineAnnotation, DiffsEditableComponent, DiffsEditor, DiffsEditorSelection, DiffsHighlighter, FileContents, RenderRange } from "../types.js";
-import { QuickEditContext } from "./quickEdit.js";
+import { DiffLineAnnotation, DiffsEditableComponent, DiffsEditor, EditorState, FileContents, Range, TextEdit } from "../types.js";
+import { LanguageConfigMap } from "./languages.js";
+import { Marker } from "./marker.js";
+import { AutoSurround } from "./selection.js";
+import { SelectionActionContext } from "./selectionAction.js";
+import { PersistStateStorage } from "./stateStorage.js";
 
 //#region src/editor/editor.d.ts
 interface EditorOptions<LAnnotation> {
-  enabledQuickEdit?: boolean;
-  renderQuickEdit?: (context: QuickEditContext<LAnnotation>) => HTMLElement;
+  /** The maximum number of entries to keep in the undo stack. */
+  historyMaxEntries?: number;
+  /**
+   * Preserve each file's document and editor state when switching files.
+   * Every editable file must provide a unique, stable `cacheKey`.
+   */
+  persistState?: boolean;
+  /**
+   * Storage for serializable editor state. Text documents stay in this Editor's
+   * in-memory cache. Defaults to `"inMemory"`.
+   */
+  persistStateStorage?: PersistStateStorage;
+  /** Render rounded corners for selection ranges, default is true. */
+  roundedSelection?: boolean;
+  /** Highlight matching brackets near the caret, default is true. */
+  matchBrackets?: boolean;
+  /**
+   * Controls auto-surround when typing quotes or brackets over a selection.
+   * Default is `"default"` (both quotes and brackets).
+   */
+  autoSurround?: AutoSurround;
+  /** Per-language comment tokens used by the comment commands. */
+  languageCommentConfig?: LanguageConfigMap;
+  /**
+   * Show a floating selection action popover anchored to the active selection,
+   * default is disabled.
+   */
+  enabledSelectionAction?: boolean;
+  /**
+   * Custom clipboard provider.
+   * Highly recommended to use native clipboard API if you are building an electron app.
+   * see https://www.electronjs.org/docs/latest/api/clipboard
+   */
+  clipboard?: {
+    readText: (type?: string) => Promise<string> | string;
+  };
+  /** Render the selection action widget element. */
+  renderSelectionAction?: (context: SelectionActionContext<LAnnotation>) => HTMLElement;
+  /** Callback when the editor is attached to a file. */
+  onAttach?: (editor: Editor<LAnnotation>, fileInstance: DiffsEditableComponent<LAnnotation>) => void;
+  /** Callback when the editor document changes. */
   onChange?: (file: FileContents, lineAnnotations?: DiffLineAnnotation<LAnnotation>[]) => void;
+  /** Callback when the editor gains focus. */
+  onFocus?: () => void;
+  /** Callback when the editor loses focus. */
+  onBlur?: () => void;
   __debug?: boolean;
 }
 declare class Editor<LAnnotation> implements DiffsEditor<LAnnotation> {
   #private;
   constructor(options?: EditorOptions<LAnnotation>);
-  edit(component: DiffsEditableComponent<LAnnotation>): () => void;
-  setSelections(selections: DiffsEditorSelection[]): void;
+  setOptions(options: EditorOptions<LAnnotation>): void;
+  edit(fileInstance: DiffsEditableComponent<LAnnotation>): () => void;
+  /**
+   * Apply edits to current attached file. Every edit joins the undo timeline:
+   * a programmatic edit must leave the document and its history exactly as
+   * the same edit typed by the user would (history equivalence — see
+   * TextDocument.applyResolvedEdits), so it is undoable like any other edit.
+   *
+   * @param updateHistory Whether to record caller selection snapshots for
+   * exact undo/redo restoration. Defaults to true. When false, live selections
+   * are remapped during replay and the text edit still joins the undo timeline.
+   */
+  applyEdits(edits: TextEdit[], updateHistory?: boolean): void;
+  /** Whether there is an edit to undo. */
+  get canUndo(): boolean;
+  /** Whether there is an undone edit to redo. */
+  get canRedo(): boolean;
+  /** Undo the last edit. Does nothing when there is nothing to undo. */
+  undo(): void;
+  /** Redo the last undone edit. Does nothing when there is nothing to redo. */
+  redo(): void;
+  getFile(): FileContents | undefined;
+  getText(): string;
+  getState(): EditorState;
+  setState({
+    selections,
+    view
+  }: EditorState): void;
+  setSelections(selections: (Range & {
+    direction: 'none' | 'backward' | 'forward';
+  })[]): void;
+  setMarkers(markers: Marker[]): void;
   focus(options?: FocusOptions): void;
-  cleanUp(): void;
-  syncWithRender(highlighter: DiffsHighlighter, fileContainer: HTMLElement, fileContents: FileContents, lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined, renderRange: RenderRange | undefined, editMode?: 'simple' | 'advanced'): void;
+  blur(): void;
+  cleanUp(recycle?: boolean): void;
+  /** @internal Capture outgoing state and substitute cached text before render. */
+  __prepareFile(file: FileContents): FileContents;
+  /** @internal */
+  __postponeBgTokenizeToNextFrame(): void;
+  /** @internal */
+  __syncRenderView: DiffsEditor<LAnnotation>['__syncRenderView'];
 }
 //#endregion
 export { Editor, EditorOptions };

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

@@ -1 +1 @@
-{"version":3,"file":"editor.d.ts","names":["DiffLineAnnotation","DiffsEditableComponent","DiffsEditor","DiffsEditorSelection","DiffsHighlighter","FileContents","RenderRange","QuickEditContext","EditorOptions","LAnnotation","HTMLElement","Editor","FocusOptions"],"sources":["../../src/editor/editor.d.ts"],"sourcesContent":["import type { DiffLineAnnotation, DiffsEditableComponent, DiffsEditor, DiffsEditorSelection, DiffsHighlighter, FileContents, RenderRange } from '../types';\nimport { type QuickEditContext } from './quickEdit';\nexport interface EditorOptions<LAnnotation> {\n    enabledQuickEdit?: boolean;\n    renderQuickEdit?: (context: QuickEditContext<LAnnotation>) => HTMLElement;\n    onChange?: (file: FileContents, lineAnnotations?: DiffLineAnnotation<LAnnotation>[]) => void;\n    __debug?: boolean;\n}\nexport declare class Editor<LAnnotation> implements DiffsEditor<LAnnotation> {\n    #private;\n    constructor(options?: EditorOptions<LAnnotation>);\n    edit(component: DiffsEditableComponent<LAnnotation>): () => void;\n    setSelections(selections: DiffsEditorSelection[]): void;\n    focus(options?: FocusOptions): void;\n    cleanUp(): void;\n    syncWithRender(highlighter: DiffsHighlighter, fileContainer: HTMLElement, fileContents: FileContents, lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined, renderRange: RenderRange | undefined, editMode?: 'simple' | 'advanced'): void;\n}\n//# sourceMappingURL=editor.d.ts.map"],"mappings":";;;;UAEiBQ;;EAAAA,eAAAA,CAAa,EAAA,CAAA,OAAAC,EAEEF,gBAFF,CAEmBE,WAFnB,CAAA,EAAA,GAEoCC,WAFpC;EAEmBD,QAAAA,CAAAA,EAAAA,CAAAA,IAAAA,EAC3BJ,YAD2BI,EAAAA,eAAAA,CAAAA,EACKT,kBADLS,CACwBA,WADxBA,CAAAA,EAAAA,EAAAA,GAAAA,IAAAA;EAAjBF,OAAAA,CAAAA,EAAAA,OAAAA;;AACVF,cAGDM,MAHCN,CAAAA,WAAAA,CAAAA,YAG8BH,WAH9BG,CAG0CI,WAH1CJ,CAAAA,CAAAA;EAAmDI,CAAAA,OAAAA;EAAnBT,WAAAA,CAAAA,OAAAA,CAAAA,EAK5BQ,aAL4BR,CAKdS,WALcT,CAAAA;EAAkB,IAAA,CAAA,SAAA,EAMpDC,sBANoD,CAM7BQ,WAN6B,CAAA,CAAA,EAAA,GAAA,GAAA,IAAA;EAGnDE,aAAM,CAAA,UAAAF,EAIGN,oBAJH,EAAA,CAAA,EAAA,IAAA;EAAqCM,KAAAA,CAAAA,OAAAA,CAAAA,EAK5CG,YAL4CH,CAAAA,EAAAA,IAAAA;EAExBA,OAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAAdD,cAAAA,CAAAA,WAAAA,EAKMJ,gBALNI,EAAAA,aAAAA,EAKuCE,WALvCF,EAAAA,YAAAA,EAKkEH,YALlEG,EAAAA,eAAAA,EAKiGR,kBALjGQ,CAKoHC,WALpHD,CAAAA,EAAAA,GAAAA,SAAAA,EAAAA,WAAAA,EAK6JF,WAL7JE,GAAAA,SAAAA,EAAAA,QAAAA,CAAAA,EAAAA,QAAAA,GAAAA,UAAAA,CAAAA,EAAAA,IAAAA"}
+{"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"}