@lvce-editor/static-server 0.117.17 → 0.117.19

package/static/{c3545e4 → db98382}/packages/editor-worker/dist/editorWorkerMain.js

@@ -733,6 +733,23 @@ const restoreMessageError = (error, _currentStack) => {
   }
   return restoredError;
 };
+const getFallbackMessage = error => {
+  if (error && typeof error.message === 'string' && error.message) {
+    return error.message;
+  }
+  if (error && error.data) {
+    return getFallbackMessage(error.data);
+  }
+  const stringified = String(error);
+  if (stringified !== '[object Object]') {
+    return stringified;
+  }
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return stringified;
+  }
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
@@ -741,13 +758,13 @@ const restoreJsonRpcError = error => {
   if (error && error.code && error.code === MethodNotFound) {
     return restoreMethodNotFoundError(error, currentStack);
   }
+  if (error && error.error) {
+    return restoreJsonRpcError(error.error);
+  }
   if (error && error.message) {
     return restoreMessageError(error);
   }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
-  }
-  return new Error(`JsonRpc Error: ${error}`);
+  return new Error(`JsonRpc Error: ${getFallbackMessage(error)}`);
 };
 const unwrapJsonRpcResult = responseMessage => {
   if ('error' in responseMessage) {
@@ -826,7 +843,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$j = (message, result) => {
+const create$l = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -835,7 +852,7 @@ const create$j = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$j(message, resultProperty);
+  return create$l(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -934,7 +951,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$i = (method, params) => {
+const create$k = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -942,7 +959,7 @@ const create$i = (method, params) => {
   };
 };
 
-const create$h = (id, method, params) => {
+const create$j = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -953,12 +970,12 @@ const create$h = (id, method, params) => {
 };
 
 let id = 0;
-const create$g = () => {
+const create$i = () => {
   return ++id;
 };
 
 const registerPromise = map => {
-  const id = create$g();
+  const id = create$i();
   const {
     promise,
     resolve
@@ -975,7 +992,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$h(id, method, params);
+  const message = create$j(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -1011,7 +1028,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$i(method, params);
+      const message = create$k(method, params);
       ipc.send(message);
     }
   };
@@ -1079,7 +1096,7 @@ const createSharedLazyRpc = factory => {
   };
 };
 
-const create$f = async ({
+const create$h = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -1097,7 +1114,7 @@ const create$f = async ({
   return rpc;
 };
 
-const create$e = async ({
+const create$g = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1107,20 +1124,20 @@ const create$e = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$f({
+  return create$h({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
   });
 };
 
-const create$d = async ({
+const create$f = async ({
   commandMap,
   isMessagePortOpen,
   send
 }) => {
   return createSharedLazyRpc(() => {
-    return create$e({
+    return create$g({
       commandMap,
       isMessagePortOpen,
       send
@@ -1128,17 +1145,17 @@ const create$d = async ({
   });
 };
 
-const create$c = async ({
+const create$e = async ({
   commandMap,
   messagePort
 }) => {
-  return create$f({
+  return create$h({
     commandMap,
     messagePort
   });
 };
 
-const create$b = async ({
+const create$d = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1181,7 +1198,7 @@ const remove$8 = id => {
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create$a = rpcId => {
+const create$c = rpcId => {
   return {
     async dispose() {
       const rpc = get$9(rpcId);
@@ -1310,26 +1327,26 @@ const SetPatches = 'Viewlet.setPatches';
 const FocusEditorText$1 = 12;
 
 const {
-  invoke: invoke$i,
+  invoke: invoke$j,
   set: set$g
-} = create$a(DialogWorker);
+} = create$c(DialogWorker);
 
 const {
-  invoke: invoke$h,
+  invoke: invoke$i,
   set: set$f
-} = create$a(DragAndDropWorker);
+} = create$c(DragAndDropWorker);
 
 const {
-  invoke: invoke$g,
+  invoke: invoke$h,
   set: set$e
-} = create$a(ErrorWorker);
+} = create$c(ErrorWorker);
 
 const {
-  invoke: invoke$f,
+  invoke: invoke$g,
   set: set$d
-} = create$a(ExtensionManagementWorker);
+} = create$c(ExtensionManagementWorker);
 const getLanguages$1 = (platform, assetDir) => {
-  return invoke$f('Extensions.getLanguages', platform, assetDir);
+  return invoke$g('Extensions.getLanguages', platform, assetDir);
 };
 
 const createLazyRpc = rpcId => {
@@ -1406,29 +1423,29 @@ const createLazyRpc = rpcId => {
 };
 
 const {
-  invoke: invoke$e,
+  invoke: invoke$f,
   set: set$c
-} = create$a(OpenerWorker);
+} = create$c(OpenerWorker);
 const openUrl = async (url, platform) => {
-  return invoke$e('Open.openUrl', url, platform);
+  return invoke$f('Open.openUrl', url, platform);
 };
 
 const {
-  invoke: invoke$d,
+  invoke: invoke$e,
   set: set$b
-} = create$a(TextMeasurementWorker);
+} = create$c(TextMeasurementWorker);
 
 const {
-  invoke: invoke$c,
+  invoke: invoke$d,
   invokeAndTransfer,
   set: set$a
-} = create$a(RendererWorker);
+} = create$c(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
-  await invoke$c('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$d('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToDragAndDropWorker = async port => {
   const command = 'DragAndDrop.handleMessagePort';
@@ -1446,14 +1463,11 @@ const sendMessagePortToErrorWorker = async (port, rpcId) => {
   const command = 'Errors.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToErrorWorker', port, command, rpcId);
 };
-const readFile$1 = async uri => {
-  return invoke$c('FileSystem.readFile', uri);
-};
 const writeClipBoardText = async text => {
-  await invoke$c('ClipBoard.writeText', /* text */text);
+  await invoke$d('ClipBoard.writeText', /* text */text);
 };
 const readClipBoardText = async () => {
-  return invoke$c('ClipBoard.readText');
+  return invoke$d('ClipBoard.readText');
 };
 const sendMessagePortToTextMeasurementWorker = async port => {
   const command = 'TextMeasurement.handleMessagePort';
@@ -1464,10 +1478,10 @@ const sendMessagePortToExtensionManagementWorker$1 = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
 const getPreference = async key => {
-  return await invoke$c('Preferences.get', key);
+  return await invoke$d('Preferences.get', key);
 };
 const openUri = async (uri, focus, options) => {
-  await invoke$c('Main.openUri', {
+  await invoke$d('Main.openUri', {
     ...options,
     focus,
     uri
@@ -1478,13 +1492,13 @@ const sendMessagePortToSyntaxHighlightingWorker$1 = async port => {
 };
 
 const {
-  invoke: invoke$b,
+  invoke: invoke$c,
   set: set$9
-} = create$a(MarkdownWorker);
+} = create$c(MarkdownWorker);
 
 const SyntaxHighlightingWorker = {
   __proto__: null,
-  invoke: invoke$b,
+  invoke: invoke$c,
   set: set$9
 };
 
@@ -1492,7 +1506,7 @@ const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
-const create$9 = () => {
+const create$b = () => {
   const commandQueues = new Map();
   const generations = Object.create(null);
   const states = Object.create(null);
@@ -1755,7 +1769,7 @@ const activateByEvent = async (event, assetDir, platform) => {
   string(event);
   // Assert.string(assetDir)
   // Assert.number(platform)
-  await invoke$f('Extensions.activateByEvent', event);
+  await invoke$g('Extensions.activateByEvent', event);
 };
 
 const codeGeneratorAccept = state => {
@@ -1782,9 +1796,9 @@ const toEditorValue = (value, originalValue) => {
   return `0x${match[1]}`;
 };
 
-const editorStates = create$9();
+const editorStates = create$b();
 const {
-  dispose: dispose$5,
+  dispose: dispose$6,
   getCommandIds,
   registerCommands,
   wrapGetter
@@ -2403,7 +2417,7 @@ const getInitialLineState = initialLineState => {
   return deepCopy(initialLineState);
 };
 
-const state$d = {
+const state$e = {
   warned: []
 };
 const flattenTokensArray = tokens => {
@@ -2415,10 +2429,10 @@ const flattenTokensArray = tokens => {
   return flattened;
 };
 const warnDeprecatedArrayReturn = (languageId, fn) => {
-  if (state$d.warned.includes(fn)) {
+  if (state$e.warned.includes(fn)) {
     return;
   }
-  state$d.warned.push(fn);
+  state$e.warned.push(fn);
   console.warn(`tokenizers without hasArrayReturn=false are deprecated (language ${languageId})`);
 };
 const safeTokenizeLine = (languageId, tokenizeLine, line, lineStateAtStart, hasArrayReturn) => {
@@ -2479,40 +2493,40 @@ const TokenizePlainText = {
   tokenizeLine
 };
 
-const state$c = {
+const state$d = {
   enabled: false
 };
 const setEnabled$1 = value => {
-  state$c.enabled = value;
+  state$d.enabled = value;
 };
 const getEnabled$1 = () => {
-  return state$c.enabled;
+  return state$d.enabled;
 };
 
 const {
-  invoke: invoke$a,
+  invoke: invoke$b,
   set: set$6
 } = SyntaxHighlightingWorker;
 
-const state$b = {
+const state$c = {
   pending: Object.create(null),
   tokenizePaths: Object.create(null),
   tokenizers: Object.create(null)
 };
 const has = languageId => {
-  return Object.hasOwn(state$b.tokenizers, languageId);
+  return Object.hasOwn(state$c.tokenizers, languageId);
 };
 const set$5 = (languageId, tokenizer) => {
-  state$b.tokenizers[languageId] = tokenizer;
+  state$c.tokenizers[languageId] = tokenizer;
 };
 const get$6 = languageId => {
-  return state$b.tokenizers[languageId];
+  return state$c.tokenizers[languageId];
 };
 const setTokenizePath = (languageId, tokenizePath) => {
-  state$b.tokenizePaths[languageId] = tokenizePath;
+  state$c.tokenizePaths[languageId] = tokenizePath;
 };
 const getTokenizePath$1 = languageId => {
-  return state$b.tokenizePaths[languageId] || '';
+  return state$c.tokenizePaths[languageId] || '';
 };
 const setTokenizePaths = languages => {
   for (const language of languages) {
@@ -2522,7 +2536,7 @@ const setTokenizePaths = languages => {
   }
 };
 const isPending = languageId => {
-  return Object.hasOwn(state$b.pending, languageId);
+  return Object.hasOwn(state$c.pending, languageId);
 };
 
 const tokenMaps = Object.create(null);
@@ -2541,7 +2555,7 @@ const loadTokenizer = async (languageId, tokenizePath) => {
   setTokenizePath(languageId, tokenizePath);
   if (getEnabled$1()) {
     // @ts-ignore
-    const tokenMap = await invoke$a('Tokenizer.load', languageId, tokenizePath);
+    const tokenMap = await invoke$b('Tokenizer.load', languageId, tokenizePath);
     set$4(languageId, tokenMap);
     return;
   }
@@ -2705,10 +2719,18 @@ const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
   };
 };
 
-const sentLines = Object.create(null);
-
 // TODO only send changed lines to renderer process instead of all lines in viewport
 const getTokensViewport2 = async (editor, startLineIndex, endLineIndex, syncIncremental) => {
+  const {
+    lifecycle
+  } = editor;
+  if (lifecycle?.disposed) {
+    return {
+      embeddedResults: [],
+      tokenizersToLoad: [],
+      tokens: []
+    };
+  }
   if (getEnabled$1()) {
     if (syncIncremental) {
       const {
@@ -2719,23 +2741,23 @@ const getTokensViewport2 = async (editor, startLineIndex, endLineIndex, syncIncr
       } = editor;
       let hasLinesToSend = true;
       let linesToSend = lines;
-      if (sentLines[id] === lines) {
+      if (lifecycle?.sentLines === lines) {
         hasLinesToSend = false;
         linesToSend = [];
-      } else {
-        sentLines[id] = lines;
+      } else if (lifecycle) {
+        lifecycle.sentLines = lines;
       }
       const slimEditor = {
         invalidStartIndex,
         languageId
       };
-      return invoke$a('GetTokensViewport.getTokensViewport', slimEditor,
+      return invoke$b('GetTokensViewport.getTokensViewport', slimEditor,
       // @ts-ignore
       startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
     }
     // TODO only send needed lines of text
     // @ts-ignore
-    return invoke$a('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
+    return invoke$b('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
   }
   return getTokensViewport(editor, startLineIndex, endLineIndex);
 };
@@ -3353,14 +3375,14 @@ const getVisible$1 = async (editor, syncIncremental) => {
   };
 };
 
-const state$a = {
+const state$b = {
   enabled: false
 };
 const setEnabled = value => {
-  state$a.enabled = value;
+  state$b.enabled = value;
 };
 const getEnabled = () => {
-  return state$a.enabled;
+  return state$b.enabled;
 };
 
 // TODO this should be in a separate scrolling module
@@ -3410,7 +3432,7 @@ const setDeltaY$1 = async (state, value) => {
 const emptyIncrementalEdits = [];
 
 const getIncrementalEdits = async (oldState, newState) => {
-  if (!newState.undoStack) {
+  if (newState.lifecycle?.disposed || !newState.undoStack) {
     return emptyIncrementalEdits;
   }
   if (oldState.undoStack === newState.undoStack) {
@@ -3429,7 +3451,7 @@ const getIncrementalEdits = async (oldState, newState) => {
       const oldLine = oldState.lines[rowIndex];
       const newLine = lines[rowIndex];
       // @ts-ignore
-      const incrementalEdits = await invoke$a(
+      const incrementalEdits = await invoke$b(
       // @ts-ignore
       'TokenizeIncremental.tokenizeIncremental', newState.uid,
       // @ts-ignore
@@ -3649,7 +3671,7 @@ const start = delivery => {
   delivery.running = run$1(delivery);
   return delivery.running;
 };
-const dispose$4 = rpcId => {
+const dispose$5 = rpcId => {
   const delivery = deliveries.get(rpcId);
   if (delivery) {
     delivery.disposed = true;
@@ -3659,7 +3681,7 @@ const dispose$4 = rpcId => {
 const send$2 = (rpcId, rpc, status) => {
   let delivery = deliveries.get(rpcId);
   if (!delivery || delivery.rpc !== rpc) {
-    dispose$4(rpcId);
+    dispose$5(rpcId);
     delivery = {
       baseline: undefined,
       disposed: false,
@@ -3677,7 +3699,7 @@ const send$2 = (rpcId, rpc, status) => {
   return delivery.running || start(delivery);
 };
 
-const state$9 = Object.create(null);
+const state$a = Object.create(null);
 
 /**
  * Register a listener for a specific event type
@@ -3687,13 +3709,13 @@ const state$9 = Object.create(null);
 const registerListener$1 = (listenerType, rpcId) => {
   number(listenerType);
   number(rpcId);
-  if (!Object.hasOwn(state$9, listenerType)) {
-    state$9[listenerType] = [];
+  if (!Object.hasOwn(state$a, listenerType)) {
+    state$a[listenerType] = [];
   }
 
   // Avoid duplicate registrations
-  if (!state$9[listenerType].includes(rpcId)) {
-    state$9[listenerType].push(rpcId);
+  if (!state$a[listenerType].includes(rpcId)) {
+    state$a[listenerType].push(rpcId);
   }
 };
 
@@ -3706,12 +3728,12 @@ const unregisterListener$1 = (listenerType, rpcId) => {
   number(listenerType);
   number(rpcId);
   if (listenerType === EditorSelection$1) {
-    dispose$4(rpcId);
+    dispose$5(rpcId);
   }
-  if (Object.hasOwn(state$9, listenerType)) {
-    const index = state$9[listenerType].indexOf(rpcId);
+  if (Object.hasOwn(state$a, listenerType)) {
+    const index = state$a[listenerType].indexOf(rpcId);
     if (index !== -1) {
-      state$9[listenerType].splice(index, 1);
+      state$a[listenerType].splice(index, 1);
     }
   }
 };
@@ -3723,7 +3745,7 @@ const unregisterListener$1 = (listenerType, rpcId) => {
  */
 const getListeners = listenerType => {
   number(listenerType);
-  return state$9[listenerType] || [];
+  return state$a[listenerType] || [];
 };
 
 /**
@@ -3822,11 +3844,31 @@ const splitLines = lines => {
   return lines.split('\n');
 };
 
+const state$9 = {};
+const create$a = () => create$g({
+  commandMap: {},
+  send: port => invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, 'FileSystem.connect')
+});
+const invoke$a = async (method, ...args) => {
+  state$9.rpcPromise ||= create$a();
+  let rpc;
+  try {
+    const {
+      rpcPromise
+    } = state$9;
+    rpc = await rpcPromise;
+  } catch (error) {
+    delete state$9.rpcPromise;
+    throw error;
+  }
+  return rpc.invoke(method, ...args);
+};
+
 const invoke$9 = async (applicationId, method, ...args) => {
-  return applicationId === undefined ? invoke$c(method, ...args) : invoke$c('Application.execute', applicationId, method, ...args);
+  return applicationId === undefined ? invoke$d(method, ...args) : invoke$d('Application.execute', applicationId, method, ...args);
 };
 const readFile = async (applicationId, uri) => {
-  return applicationId === undefined ? readFile$1(uri) : invoke$9(applicationId, 'FileSystem.readFile', uri);
+  return applicationId === undefined ? invoke$a('FileSystem.readFile', uri) : invoke$a('ApplicationFileSystem.execute', applicationId, 'readFile', uri);
 };
 
 const notifyTabModifiedStatusChange = async (uri, modified, applicationId) => {
@@ -3868,7 +3910,7 @@ const measureTextWidthFast = async (text, charWidth) => {
 };
 
 const measureTextWidthSlow = async (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
-  const width = await invoke$d('TextMeasurement.measureTextWidth', text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
+  const width = await invoke$e('TextMeasurement.measureTextWidth', text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
   return width;
 };
 
@@ -4574,7 +4616,7 @@ const updateColorPickerValue$1 = async (editor, value) => {
 };
 
 const invoke$8 = async (applicationId, method, ...args) => {
-  return applicationId === undefined ? invoke$f(method, ...args) : invoke$f('Extensions.invokeForApplication', applicationId, method, ...args);
+  return applicationId === undefined ? invoke$g(method, ...args) : invoke$g('Extensions.invokeForApplication', applicationId, method, ...args);
 };
 
 const validTypes = new Set(['added', 'deleted', 'modified']);
@@ -5174,7 +5216,7 @@ const getColorPickerWorkerCommandMap = () => ({
 const ModuleWorkerAndWorkaroundForChromeDevtoolsBug = 6;
 
 const launchWorker = async (name, url, intializeCommand, commandMap = {}) => {
-  const rpc = await create$e({
+  const rpc = await create$g({
     commandMap,
     isMessagePortOpen: true,
     async send(port) {
@@ -5230,6 +5272,10 @@ const loadContent$3 = async (state, parentUid) => {
   };
 };
 
+const create$9 = () => ({
+  disposed: false
+});
+
 const ColorPicker = 41;
 const EditorCompletion = 9;
 const Empty = 0;
@@ -5310,6 +5356,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir, _langua
     itemHeight: 20,
     languageId: '',
     letterSpacing: 0,
+    lifecycle: create$9(),
     lightBulbRowIndex: -1,
     lineCache: [],
     lineNumbers: false,
@@ -5530,7 +5577,7 @@ const get$3 = async key => {
   return value;
 };
 const update = async settings => {
-  await invoke$c('Preferences.update', settings);
+  await invoke$d('Preferences.update', settings);
 };
 
 const createEditor = async ({
@@ -5629,6 +5676,7 @@ const createEditor = async ({
     itemHeight: 20,
     languageId: computedlanguageId,
     letterSpacing,
+    lifecycle: create$9(),
     lineCache: [],
     lineNumbers,
     lines: [],
@@ -5790,7 +5838,9 @@ const createStandaloneEditor = async ({
     cursorInfos,
     selectionInfos
   };
-  set$8(id, createdEditor, finalEditor);
+  if (!createdEditor.lifecycle?.disposed) {
+    set$8(id, createdEditor, finalEditor);
+  }
 };
 
 const isEqual$5 = (oldState, newState) => {
@@ -5876,7 +5926,7 @@ const run = async (uid, token, save) => {
   await save(token);
 };
 const schedule = (uid, save) => {
-  dispose$3(uid);
+  dispose$4(uid);
   const token = ++state$7.nextToken;
   const timeout = setTimeout(run, autoSaveDelay, uid, token, save);
   pendingSaves.set(uid, {
@@ -5891,9 +5941,9 @@ const consume = (uid, token) => {
   if (!isLatest(uid, token)) {
     return;
   }
-  dispose$3(uid);
+  dispose$4(uid);
 };
-const dispose$3 = uid => {
+const dispose$4 = uid => {
   const pendingSave = pendingSaves.get(uid);
   if (!pendingSave) {
     return;
@@ -6016,8 +6066,8 @@ const invoke$6 = async (method, ...params) => {
   const worker = await workerPromise;
   return await worker.invoke(method, ...params);
 };
-const dispose$2 = async () => {
-  if (getKeys$2().length > 1) {
+const dispose$3 = async () => {
+  if (getKeys$2().some(uid => get$8(Number(uid))?.newState.widgets?.some(widget => widget.id === Rename$1))) {
     return;
   }
   const promise = workerPromise;
@@ -6029,6 +6079,17 @@ const dispose$2 = async () => {
   } catch {}
 };
 
+const renderedDoms = new Map();
+const get$1 = uid => {
+  return renderedDoms.get(uid);
+};
+const set$1 = (uid, dom) => {
+  renderedDoms.set(uid, dom);
+};
+const dispose$2 = uid => {
+  renderedDoms.delete(uid);
+};
+
 const addWidget$1 = widget => {
   const module = get$7(widget.id);
   if (!module) {
@@ -6050,11 +6111,11 @@ const next = editorUid => {
   revisions.set(editorUid, revision);
   return revision;
 };
-const get$1 = editorUid => {
+const get = editorUid => {
   return revisions.get(editorUid) || 0;
 };
 const record = (editorUid, revision) => {
-  revisions.set(editorUid, Math.max(get$1(editorUid), revision));
+  revisions.set(editorUid, Math.max(get(editorUid), revision));
 };
 const dispose$1 = editorUid => {
   revisions.delete(editorUid);
@@ -6110,20 +6171,31 @@ const disposeEditor = async editorUid => {
   if (!editor) {
     return [];
   }
+  if (editor.lifecycle) {
+    editor.lifecycle.disposed = true;
+    delete editor.lifecycle.sentLines;
+  }
+  // Invalidate the registry before awaiting widget or worker cleanup.
+  dispose$6(editorUid);
+  dispose$2(editorUid);
+  dispose$4(editorUid);
   clear$1(editorUid);
+  dispose$1(editorUid);
+  const pending = [];
+  if (getEnabled$1()) {
+    pending.push(invoke$b('TextDocument.dispose', editor.id));
+  }
   for (const widget of editor.widgets) {
     if (widget.id === ColorPicker$2) {
-      await invoke$7('ColorPicker.dispose', widget.newState.uid);
+      pending.push(invoke$7('ColorPicker.dispose', widget.newState.uid));
     }
   }
   const commands = renderWidgets$1(editor, {
     ...editor,
     widgets: []
   });
-  dispose$1(editorUid);
-  dispose$3(editorUid);
-  dispose$5(editorUid);
-  await dispose$2();
+  pending.push(dispose$3());
+  await Promise.all(pending);
   if (getKeys$2().length === 0) {
     await notifyEditorStatusCleared();
   }
@@ -6362,8 +6434,8 @@ const closeWidgetsMaybe = widgets => {
 };
 
 const logError = async (error, prefix) => {
-  const prettyError = await invoke$g('Errors.prepare', error);
-  await invoke$g('Errors.print', prettyError, prefix);
+  const prettyError = await invoke$h('Errors.prepare', error);
+  await invoke$h('Errors.print', prettyError, prefix);
 };
 const logFallback = (error, prefix) => {
   if (prefix) {
@@ -6700,7 +6772,7 @@ const showFilePicker = async platform => {
   const {
     canceled,
     filePath
-  } = await invoke$e('Open.showSaveDialog', dialogTitle, [], platform);
+  } = await invoke$f('Open.showSaveDialog', dialogTitle, [], platform);
   if (canceled) {
     return '';
   }
@@ -6724,7 +6796,7 @@ const isPermissionDeniedError = error => {
 };
 const showSaveErrorDialog = async error => {
   if (isPermissionDeniedError(error)) {
-    await invoke$i('ElectronDialog.showMessageBox', {
+    await invoke$j('ElectronDialog.showMessageBox', {
       buttons: ['OK'],
       defaultId: 0,
       message: "You don't have permission to save changes to this file.",
@@ -6733,7 +6805,7 @@ const showSaveErrorDialog = async error => {
     });
     return;
   }
-  await invoke$i('ElectronDialog.showMessageBox', {
+  await invoke$j('ElectronDialog.showMessageBox', {
     buttons: ['OK'],
     defaultId: 0,
     detail: error.message,
@@ -7346,7 +7418,7 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
   if (!newState) {
     return editor;
   }
-  if (get$1(editor.uid) !== widgetRevision) {
+  if (get(editor.uid) !== widgetRevision) {
     return get$8(editor.uid)?.newState || editor;
   }
   // @ts-ignore
@@ -8417,7 +8489,7 @@ const deleteWordRight = editor => {
 
 const findAllReferences$1 = async editor => {
   // @ts-ignore
-  await invoke$c('SideBar.show', 'References', /* focus */true);
+  await invoke$d('SideBar.show', 'References', /* focus */true);
   return editor;
 };
 
@@ -9113,7 +9185,7 @@ const clear = editor => {
     decorations: filtered
   };
 };
-const set$1 = (editor, offset, length) => {
+const set = (editor, offset, length) => {
   if (matches(editor, offset, length)) {
     return editor;
   }
@@ -9216,10 +9288,10 @@ const startTextDrag = async (state, x, y) => {
   }
   try {
     if (state.textDragId) {
-      await invoke$h('DragAndDrop.discardTextDrag', state.textDragId);
+      await invoke$i('DragAndDrop.discardTextDrag', state.textDragId);
     }
     const text = getText$1(state).slice(startOffset, endOffset);
-    const textDragId = await invoke$h('DragAndDrop.createTextDrag', {
+    const textDragId = await invoke$i('DragAndDrop.createTextDrag', {
       endOffset,
       sourceUri: state.uri,
       startOffset,
@@ -9330,7 +9402,7 @@ const handleMouseMoveWithAltKey = async (editor, x, y) => {
     if (!definition) {
       return clear(editor);
     }
-    return set$1(editor, wordOffset, wordLength);
+    return set(editor, wordOffset, wordLength);
   } catch (error) {
     if (isNoDefinitionProviderFoundError(error)) {
       return clear(editor);
@@ -9354,7 +9426,7 @@ const getDiagnosticHoverDetail = ({
 
 const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
   // @ts-ignore
-  return invoke$c('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, lineHeight, width);
+  return invoke$d('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, lineHeight, width);
 };
 
 const maximumWidth = 600;
@@ -9629,7 +9701,7 @@ const applyHoverContent = async (editor, getNewState) => {
   const widgetRevision = next(editor.uid);
   const widget = widgets[widgetIndex];
   const newState = await getNewState(widget.newState);
-  if (get$1(editor.uid) !== widgetRevision) {
+  if (get(editor.uid) !== widgetRevision) {
     return editor;
   }
   if (!newState) {
@@ -9678,7 +9750,7 @@ const showHover = async (editor, position, token) => {
     return;
   }
   set$8(editor.uid, latestInstance.oldState, newEditor);
-  await invoke$c('Editor.renderPending', editor.uid);
+  await invoke$d('Editor.renderPending', editor.uid);
 };
 
 // TODO several things can happen:
@@ -9770,7 +9842,7 @@ const editorHandleNativeSelectionChange = (editor, range) => {
 const handlePointerCaptureLost = async editor => {
   if (editor.textDragId) {
     try {
-      await invoke$h('DragAndDrop.discardTextDrag', editor.textDragId);
+      await invoke$i('DragAndDrop.discardTextDrag', editor.textDragId);
     } catch {
       // The pointer state still needs to be reset if the worker is unavailable.
     }
@@ -10058,7 +10130,7 @@ const handlePointerUp = async editor => {
     return resetEditor;
   }
   try {
-    const data = await invoke$h('DragAndDrop.takeTextDrag', editor.textDragId);
+    const data = await invoke$i('DragAndDrop.takeTextDrag', editor.textDragId);
     if (!data) {
       return resetEditor;
     }
@@ -10385,7 +10457,7 @@ const indentMore = editor => {
 
 const getLanguageConfiguration = async editor => {
   // @ts-ignore
-  return invoke$c('Languages.getLanguageConfiguration', {
+  return invoke$d('Languages.getLanguageConfiguration', {
     languageId: editor.languageId,
     uri: editor.uri
   });
@@ -10696,14 +10768,14 @@ const addWidget = (widget, id, render) => {
 };
 
 const setFocus = async focusKey => {
-  await invoke$c('Focus.setFocus', focusKey);
+  await invoke$d('Focus.setFocus', focusKey);
 };
 const unsetAdditionalFocus = async focusKey => {
   if (!focusKey) {
     return;
   }
   // @ts-ignore
-  await invoke$c('Focus.removeAdditionalFocus', focusKey);
+  await invoke$d('Focus.removeAdditionalFocus', focusKey);
 };
 
 const FocusEditor = 12;
@@ -10903,7 +10975,7 @@ const createFn = (key, name, widgetId) => {
     const latestChildIndex = latestAfterInvoke.widgets.findIndex(isWidget);
     if (latestChildIndex === -1) {
       set$8(editor.uid, editor, latestAfterInvoke);
-      await dispose$2();
+      await dispose$3();
       return latestAfterInvoke;
     }
     const diff = await invoke(`${name}.diff2`, uid);
@@ -11207,11 +11279,11 @@ const openRename = async editor => {
   try {
     editorWithRenameWidget = await addWidgetToEditor(Rename$1, FocusEditorRename$1, editor, create$1, newStateGenerator$1, fullFocus);
   } catch (error) {
-    await dispose$2();
+    await dispose$3();
     throw error;
   }
   if (editorWithRenameWidget === editor) {
-    await dispose$2();
+    await dispose$3();
     return editor;
   }
   const wordBefore = getWordBefore(editor, rowIndex, columnIndex);
@@ -13645,7 +13717,7 @@ const executeViewletCommand$1 = async (commandMap, uid, commandId, ...args) => {
     throw new TypeError(`Viewlet command not found: ${commandId}`);
   }
   await fn(uid, ...args);
-  await invoke$c('Viewlet.executeViewletCommand', uid, '__renderPending', false);
+  await invoke$d('Viewlet.executeViewletCommand', uid, '__renderPending', false);
 };
 
 const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...params) => {
@@ -13823,7 +13895,7 @@ const getDiagnostics$1 = async editorUid => {
 };
 
 const ensure = async (fontName, fontUrl) => {
-  await invoke$d('TextMeasurement.ensureFont', fontName, fontUrl);
+  await invoke$e('TextMeasurement.ensureFont', fontName, fontUrl);
 };
 
 const findWidgetFocusContexts = [FindWidget, FocusFindWidgetReplace$1, FocusFindWidgetOptions, FocusFindWidgetToggleReplace, FocusFindWidgetPreviousMatchButton, FocusFindWidgetNextMatchButton, FocusFindWidgetCloseButton, FocusFindWidgetReplaceButton, FocusFindWidgetReplaceAllButton];
@@ -14471,7 +14543,7 @@ const handleBeforeInput = (editor, inputType, data) => {
 };
 
 const handleMessagePort = async (port, rpcId) => {
-  const rpc = await create$c({
+  const rpc = await create$e({
     commandMap: {},
     messagePort: port
   });
@@ -14847,7 +14919,7 @@ const hotReload = async () => {
 
     // TODO ask renderer worker to rerender all editors
     // @ts-ignore
-    await invoke$c(`Editor.rerender`);
+    await invoke$d(`Editor.rerender`);
   } finally {
     state.isReloading = false;
   }
@@ -14866,7 +14938,7 @@ const sendMessagePortToSyntaxHighlightingWorker = async port => {
 
 const createSyntaxHighlightingWorkerRpc = async () => {
   try {
-    const rpc = await create$e({
+    const rpc = await create$g({
       commandMap: {},
       send: sendMessagePortToSyntaxHighlightingWorker
     });
@@ -15043,6 +15115,9 @@ const loadContent = async (state, savedState, largeFile = false) => {
       textInfos: []
     };
   }
+  if (state.lifecycle?.disposed) {
+    return state;
+  }
   const savedLargeFile = !!savedState && typeof savedState === 'object' && savedState.largeFile === true;
   largeFile ||= state.largeFile === true || existingEditor?.largeFile === true || savedLargeFile || content.length > largeFileContentLength;
   const effectiveEditor = {
@@ -15200,7 +15275,7 @@ const refreshGutterDecorationsAll = async () => {
         ...latest.newState,
         gutterDecorations: refreshedEditor.gutterDecorations
       });
-      await invoke$c('Editor.renderPending', editor.id);
+      await invoke$d('Editor.renderPending', editor.id);
     }
   }
 };
@@ -16097,14 +16172,6 @@ const getScrollBarDiagnostics = (editor, diagnostics) => {
   return scrollBarDecorations;
 };
 
-const renderedDoms = new Map();
-const get = uid => {
-  return renderedDoms.get(uid);
-};
-const set = (uid, dom) => {
-  renderedDoms.set(uid, dom);
-};
-
 const getDom = state => {
   const {
     diagnostics = [],
@@ -16130,13 +16197,13 @@ const mergeConflictsEqual = (oldState, newState) => {
   });
 };
 const renderIncremental = (oldState, newState) => {
-  const oldDom = oldState.initial || !mergeConflictsEqual(oldState, newState) ? getDom(oldState) : get(newState.uid) || getDom(oldState);
+  const oldDom = oldState.initial || !mergeConflictsEqual(oldState, newState) ? getDom(oldState) : get$1(newState.uid) || getDom(oldState);
   const newDom = getDom(newState);
   const patches = diffTree(oldDom, newDom);
   if (patches.length === 0) {
     return [];
   }
-  set(newState.uid, newDom);
+  set$1(newState.uid, newDom);
   return [SetPatches, newState.uid, patches];
 };
 
@@ -16504,9 +16571,11 @@ const saveState = (state, savedState) => {
     ...(largeFile && {
       largeFile: true
     }),
-    lines,
-    redoStack,
-    undoStack
+    ...((redoStack.length > 0 || undoStack.length > 0) && {
+      lines,
+      redoStack,
+      undoStack
+    })
   };
 };
 
@@ -16570,7 +16639,7 @@ const updateDebugInfo = async debugId => {
   };
   set$8(key, oldState, newEditor);
   // @ts-ignore
-  await invoke$c('Editor.rerender', key);
+  await invoke$d('Editor.rerender', key);
 };
 
 const queues = {};
@@ -16619,7 +16688,7 @@ const executeDiagnosticProvider = async editor => {
   return executeIsolatedDiagnosticProvider(editor);
 };
 
-const invoke = (...args) => invoke$c(...args);
+const invoke = (...args) => invoke$d(...args);
 
 /**
  * Merges link decorations with diagnostic decorations
@@ -16797,7 +16866,7 @@ const saveAfterDelay = async (uid, token) => {
   });
   await save$1(uid);
   if (didSave) {
-    await invoke$c('Editor.renderPending', uid);
+    await invoke$d('Editor.renderPending', uid);
   }
 };
 
@@ -16846,7 +16915,7 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
     }
     const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
     set$8(uid, state, newEditorWithDerivedState);
-    await dispose$2();
+    await dispose$3();
     if (editorDiagnosticEffect.isActive(state, newEditorWithDerivedState)) {
       void editorDiagnosticEffect.apply(newEditorWithDerivedState);
     }
@@ -16883,7 +16952,7 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
     if (lines !== finalEditor.lines && !isUntitledFile(finalEditor.uri)) {
       schedule(uid, token => saveAfterDelay(uid, token));
     } else if (modified && !finalEditor.modified) {
-      dispose$3(uid);
+      dispose$4(uid);
     }
     return returnState ? finalEditor : undefined;
   });
@@ -17224,7 +17293,7 @@ for (const [key, value] of Object.entries(commandMap)) {
 }
 
 const initializeDragAndDropWorker = async () => {
-  const rpc = await create$d({
+  const rpc = await create$f({
     commandMap: {},
     send: sendMessagePortToDragAndDropWorker
   });
@@ -17232,7 +17301,7 @@ const initializeDragAndDropWorker = async () => {
 };
 
 const initializeErrorWorker = async () => {
-  const rpc = await create$d({
+  const rpc = await create$f({
     commandMap: {},
     send(port) {
       return sendMessagePortToErrorWorker(port, EditorWorker);
@@ -17242,7 +17311,7 @@ const initializeErrorWorker = async () => {
 };
 
 const createExtensionManagementWorkerRpc = async () => {
-  const rpc = await create$d({
+  const rpc = await create$f({
     commandMap: {},
     async send(port) {
       await sendMessagePortToExtensionManagementWorker$1(port, EditorWorker);
@@ -17265,7 +17334,7 @@ const send$1 = port => {
   return sendMessagePortToOpenerWorker(port);
 };
 const initializeOpenerWorker = async () => {
-  const rpc = await create$d({
+  const rpc = await create$f({
     commandMap: {},
     send: send$1
   });
@@ -17273,7 +17342,7 @@ const initializeOpenerWorker = async () => {
 };
 
 const initializeRendererWorker = async () => {
-  const rpc = await create$b({
+  const rpc = await create$d({
     commandMap: commandMap
   });
   set$a(rpc);
@@ -17283,7 +17352,7 @@ const send = port => {
   return sendMessagePortToTextMeasurementWorker(port);
 };
 const initializeTextMeasurementWorker = async () => {
-  const rpc = await create$d({
+  const rpc = await create$f({
     commandMap: {},
     send
   });
@@ -17293,7 +17362,7 @@ const initializeTextMeasurementWorker = async () => {
 const listen = async () => {
   registerCommands(commandMap);
   await Promise.all([initializeRendererWorker(), initializeDragAndDropWorker(), initializeErrorWorker(), initializeExtensionManagementWorker(), initializeTextMeasurementWorker(), initializeOpenerWorker()]);
-  const dialogRpc = await create$d({
+  const dialogRpc = await create$f({
     commandMap: {},
     send: sendMessagePortToDialogWorker
   });