@lvce-editor/editor-worker 18.2.0 → 18.4.0

package/dist/editorWorkerMain.js

@@ -474,7 +474,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5$2 = async ({
+const create$5$1 = async ({
   isMessagePortOpen,
   messagePort
 }) => {
@@ -525,14 +525,35 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5$2,
+  create: create$5$1,
   signal: signal$1,
   wrap: wrap$5
 };
 
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
+const commands = Object.create(null);
+const register = commandMap => {
+  Object.assign(commands, commandMap);
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute$1 = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new CommandNotFoundError(command);
+  }
+  return fn(...args);
+};
+
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$8 = id => {
+const get$9 = id => {
   return callbacks[id];
 };
 const remove$9 = id => {
@@ -681,7 +702,7 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$8(id);
+  const fn = get$9(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -744,7 +765,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$a = (message, result) => {
+const create$j = (message, result) => {
   return {
     jsonrpc: Two$1,
     id: message.id,
@@ -753,7 +774,7 @@ const create$a = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$a(message, resultProperty);
+  return create$j(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -845,36 +866,17 @@ const handleJsonRpcMessage = async (...args) => {
   throw new JsonRpcError('unexpected message');
 };
 
-class CommandNotFoundError extends Error {
-  constructor(command) {
-    super(`Command not found ${command}`);
-    this.name = 'CommandNotFoundError';
-  }
-}
-const commands = Object.create(null);
-const register = commandMap => {
-  Object.assign(commands, commandMap);
-};
-const getCommand = key => {
-  return commands[key];
-};
-const execute$1 = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new CommandNotFoundError(command);
-  }
-  return fn(...args);
-};
-
 const Two = '2.0';
-const create$t = (method, params) => {
+
+const create$i = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$s = (id, method, params) => {
+
+const create$h = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -883,15 +885,14 @@ const create$s = (id, method, params) => {
   };
   return message;
 };
+
 let id = 0;
-const create$r = () => {
+const create$g = () => {
   return ++id;
 };
 
-/* eslint-disable n/no-unsupported-features/es-syntax */
-
 const registerPromise = map => {
-  const id = create$r();
+  const id = create$g();
   const {
     promise,
     resolve
@@ -909,7 +910,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$s(id, method, params);
+  const message = create$h(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -945,12 +946,13 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$t(method, params);
+      const message = create$i(method, params);
       ipc.send(message);
     }
   };
   return rpc;
 };
+
 const requiresSocket = () => {
   return false;
 };
@@ -965,6 +967,7 @@ const handleMessage = event => {
   const actualExecute = event?.target?.execute || execute$1;
   return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError$1, actualRequiresSocket);
 };
+
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
     ipc.addEventListener('message', handleMessage);
@@ -973,6 +976,7 @@ const handleIpc = ipc => {
     ipc.on('message', handleMessage);
   }
 };
+
 const listen$1 = async (module, options) => {
   const rawIpc = await module.listen(options);
   if (module.signal) {
@@ -982,8 +986,6 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
-/* eslint-disable @typescript-eslint/no-misused-promises */
-
 const createSharedLazyRpc = factory => {
   let rpcPromise;
   const getOrCreate = () => {
@@ -1011,24 +1013,22 @@ const createSharedLazyRpc = factory => {
     }
   };
 };
-const create$j = async ({
+
+const create$f = async ({
   commandMap,
   isMessagePortOpen,
   send
 }) => {
   return createSharedLazyRpc(() => {
-    return create$3$1({
+    return create$c({
       commandMap,
       isMessagePortOpen,
       send
     });
   });
 };
-const LazyTransferMessagePortRpcParent = {
-  __proto__: null,
-  create: create$j
-};
-const create$5$1 = async ({
+
+const create$e = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -1045,20 +1045,18 @@ const create$5$1 = async ({
   messagePort.start();
   return rpc;
 };
-const create$4$1 = async ({
+
+const create$d = async ({
   commandMap,
   messagePort
 }) => {
-  return create$5$1({
+  return create$e({
     commandMap,
     messagePort
   });
 };
-const PlainMessagePortRpcParent = {
-  __proto__: null,
-  create: create$4$1
-};
-const create$3$1 = async ({
+
+const create$c = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1068,17 +1066,14 @@ const create$3$1 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$5$1({
+  return create$e({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
   });
 };
-const TransferMessagePortRpcParent = {
-  __proto__: null,
-  create: create$3$1
-};
-const create$2$1 = async ({
+
+const create$b = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1088,29 +1083,9 @@ const create$2$1 = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const WebWorkerRpcClient = {
-  __proto__: null,
-  create: create$2$1
-};
-const createMockRpc = ({
-  commandMap
-}) => {
-  const invocations = [];
-  const invoke = (method, ...params) => {
-    invocations.push([method, ...params]);
-    const command = commandMap[method];
-    if (!command) {
-      throw new Error(`command ${method} not found`);
-    }
-    return command(...params);
-  };
-  const mockRpc = {
-    invocations,
-    invoke,
-    invokeAndTransfer: invoke
-  };
-  return mockRpc;
-};
+
+const Text$1 = 12;
+const Reference = 100;
 
 const Backspace = 1;
 const Tab$1 = 2;
@@ -1177,15 +1152,39 @@ const OpenerWorker = 4561;
 const RendererWorker$1 = 1;
 const TextMeasurementWorker = 7011;
 
+const FocusSelector = 'Viewlet.focusSelector';
+const SetCss$1 = 'Viewlet.setCss';
 const SetFocusContext$1 = 'Viewlet.setFocusContext';
+const SetPatches = 'Viewlet.setPatches';
 
 const FocusEditorText$1 = 12;
+const FocusExplorer = 13;
+
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
+};
 
 const rpcs = Object.create(null);
-const set$e = (id, rpc) => {
+const set$f = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$7 = id => {
+const get$8 = id => {
   return rpcs[id];
 };
 const remove$8 = id => {
@@ -1193,21 +1192,21 @@ const remove$8 = id => {
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create$9 = rpcId => {
+const create$a = rpcId => {
   return {
     async dispose() {
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1215,7 +1214,7 @@ const create$9 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$e(rpcId, mockRpc);
+      set$f(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$8(rpcId);
@@ -1224,7 +1223,7 @@ const create$9 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$e(rpcId, rpc);
+      set$f(rpcId, rpc);
     }
   };
 };
@@ -1234,8 +1233,8 @@ const {
   invoke: invoke$f,
   invokeAndTransfer: invokeAndTransfer$2,
   registerMockRpc: registerMockRpc$1,
-  set: set$d
-} = create$9(ExtensionHostWorker);
+  set: set$e
+} = create$a(ExtensionHostWorker);
 const executeReferenceProvider = async (id, offset) => {
   // @ts-ignore
   return invoke$f('ExtensionHostReference.executeReferenceProvider', id, offset);
@@ -1263,21 +1262,21 @@ const ExtensionHost = {
   invoke: invoke$f,
   invokeAndTransfer: invokeAndTransfer$2,
   registerMockRpc: registerMockRpc$1,
-  set: set$d
+  set: set$e
 };
 
 const {
   invoke: invoke$e,
-  set: set$c
-} = create$9(ExtensionManagementWorker);
+  set: set$d
+} = create$a(ExtensionManagementWorker);
 
 const {
   dispose: dispose$2,
   invoke: invoke$d,
   invokeAndTransfer: invokeAndTransfer$1,
   registerMockRpc,
-  set: set$b
-} = create$9(RendererWorker$1);
+  set: set$c
+} = create$a(RendererWorker$1);
 const searchFileHtml = async uri => {
   return invoke$d('ExtensionHost.searchFileWithHtml', uri);
 };
@@ -1664,7 +1663,7 @@ const RendererWorker = {
   sendMessagePortToSourceControlWorker,
   sendMessagePortToSyntaxHighlightingWorker: sendMessagePortToSyntaxHighlightingWorker$1,
   sendMessagePortToTextMeasurementWorker,
-  set: set$b,
+  set: set$c,
   setAdditionalFocus,
   setColorTheme,
   setExtensionsSearchValue,
@@ -1685,26 +1684,26 @@ const RendererWorker = {
 
 const {
   invoke: invoke$c,
-  set: set$a
-} = create$9(OpenerWorker);
+  set: set$b
+} = create$a(OpenerWorker);
 
 const {
-  set: set$9
-} = create$9(IconThemeWorker);
+  set: set$a
+} = create$a(IconThemeWorker);
 
 const {
   dispose: dispose$1,
   invoke: invoke$b,
   invokeAndTransfer,
-  set: set$8
-} = create$9(MarkdownWorker);
+  set: set$9
+} = create$a(MarkdownWorker);
 
 const SyntaxHighlightingWorker = {
   __proto__: null,
   dispose: dispose$1,
   invoke: invoke$b,
   invokeAndTransfer,
-  set: set$8
+  set: set$9
 };
 
 const createLazyRpc = rpcId => {
@@ -1712,7 +1711,7 @@ const createLazyRpc = rpcId => {
   let factory;
   const createRpc = async () => {
     const rpc = await factory();
-    set$e(rpcId, rpc);
+    set$f(rpcId, rpc);
   };
   const ensureRpc = async () => {
     if (!rpcPromise) {
@@ -1723,12 +1722,12 @@ const createLazyRpc = rpcId => {
   return {
     async invoke(method, ...params) {
       await ensureRpc();
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       return rpc.invoke(method, ...params);
     },
     async invokeAndTransfer(method, ...params) {
       await ensureRpc();
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       return rpc.invokeAndTransfer(method, ...params);
     },
     setFactory(value) {
@@ -1737,6 +1736,95 @@ const createLazyRpc = rpcId => {
   };
 };
 
+const toCommandId = key => {
+  const dotIndex = key.indexOf('.');
+  return key.slice(dotIndex + 1);
+};
+const create$9 = () => {
+  const states = Object.create(null);
+  const commandMapRef = {};
+  return {
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    },
+    diff(uid, modules, numbers) {
+      const {
+        newState,
+        oldState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
+    },
+    dispose(uid) {
+      delete states[uid];
+    },
+    get(uid) {
+      return states[uid];
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        newState,
+        oldState
+      };
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState,
+          oldState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (oldState === newerState || newState === newerState) {
+          return;
+        }
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...newerState
+        };
+        states[uid] = {
+          newState: latestNew,
+          oldState: latestOld.oldState
+        };
+      };
+      return wrapped;
+    },
+    wrapGetter(fn) {
+      const wrapped = (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        return fn(newState, ...args);
+      };
+      return wrapped;
+    }
+  };
+};
+const terminate = () => {
+  globalThis.close();
+};
+
 // TODO add tests for this
 const activateByEvent = async (event, assetDir, platform) => {
   string(event);
@@ -1753,7 +1841,7 @@ const codeGeneratorAccept = state => {
 const ModuleWorkerAndWorkaroundForChromeDevtoolsBug = 6;
 
 const launchWorker = async (name, url, intializeCommand) => {
-  const rpc = await TransferMessagePortRpcParent.create({
+  const rpc = await create$c({
     commandMap: {},
     isMessagePortOpen: true,
     async send(port) {
@@ -1790,7 +1878,7 @@ const invoke$a = async (method, ...params) => {
   return await worker.invoke(method, ...params);
 };
 
-const loadContent$2 = async (state, parentUid) => {
+const loadContent$3 = async (state, parentUid) => {
   const {
     height,
     uid,
@@ -1808,6 +1896,100 @@ const loadContent$2 = async (state, parentUid) => {
   };
 };
 
+const {
+  get: get$7,
+  getCommandIds,
+  set: set$8,
+  wrapCommand: wrapCommand$1,
+  wrapGetter
+} = create$9();
+
+const emptyIncrementalEdits = [];
+
+const ColorPicker = 41;
+const EditorCompletion = 9;
+const Empty = 0;
+const FindWidget = 16;
+const FocusEditorHover = 51;
+const FocusEditorRename$1 = 11;
+const SourceActions = 38;
+const FocusCodeGenerator = 52;
+
+const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
+  number(id);
+  const editor = {
+    additionalFocus: 0,
+    assetDir,
+    charWidth: 0,
+    columnWidth: 0,
+    completionState: '',
+    completionTriggerCharacters: [],
+    completionUid: 0,
+    cursorWidth: 2,
+    debugEnabled: false,
+    decorations: [],
+    deltaX: 0,
+    deltaY: 0,
+    diagnostics: [],
+    diagnosticsEnabled: false,
+    differences: [],
+    embeds: [],
+    finalDeltaY: 0,
+    finalY: 0,
+    focus: 0,
+    focused: false,
+    focusKey: Empty,
+    fontFamily: '',
+    fontSize: 0,
+    fontWeight: 0,
+    handleOffsetX: 0,
+    height,
+    highlightedLine: -1,
+    id,
+    incrementalEdits: emptyIncrementalEdits,
+    initial: true,
+    invalidStartIndex: 0,
+    isAutoClosingBracketsEnabled: false,
+    isAutoClosingQuotesEnabled: false,
+    isAutoClosingTagsEnabled: false,
+    isMonospaceFont: false,
+    isQuickSuggestionsEnabled: false,
+    itemHeight: 20,
+    languageId: '',
+    letterSpacing: 0,
+    lineCache: [],
+    lineNumbers: false,
+    lines: [],
+    longestLineWidth: 0,
+    maxLineY: 0,
+    minimumSliderSize: 20,
+    minLineY: 0,
+    modified: false,
+    numberOfLines: 0,
+    numberOfVisibleLines: 0,
+    platform,
+    primarySelectionIndex: 0,
+    rowHeight: 0,
+    savedSelections: [],
+    scrollBarHeight: 0,
+    scrollBarWidth: 0,
+    selections: new Uint32Array(),
+    tabSize: 0,
+    textInfos: [],
+    tokenizerId: 0,
+    uid: id,
+    undoStack: [],
+    uri,
+    validLines: [],
+    visualDecorations: [],
+    widgets: [],
+    width,
+    x,
+    y
+  };
+  set$8(id, editor, editor);
+};
+
 // TODO use numeric enum
 const CompositionUpdate = 'compositionUpdate';
 const ContentEditableInput = 'contentEditableInput';
@@ -1873,7 +2055,7 @@ const get$5 = id => {
   number(id);
   return editors[id];
 };
-const getKeys$1 = () => {
+const getKeys$2 = () => {
   return Object.keys(editors);
 };
 const set$6 = (id, oldEditor, newEditor) => {
@@ -2984,8 +3166,6 @@ const setDeltaY$2 = async (state, value) => {
   return newEditor2;
 };
 
-const emptyIncrementalEdits = [];
-
 const getIncrementalEdits = async (oldState, newState) => {
   if (!newState.undoStack) {
     return emptyIncrementalEdits;
@@ -3184,7 +3364,7 @@ const notifyListeners = async (listenerType, method, ...params) => {
   // Notify all listeners in parallel
   const notifications = rpcIds.map(async rpcId => {
     try {
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       if (rpc) {
         await rpc.invoke(method, ...params);
       }
@@ -3847,15 +4027,6 @@ const {
   set: set$1
 } = ExtensionHost;
 
-const ColorPicker = 41;
-const EditorCompletion = 9;
-const Empty = 0;
-const FindWidget = 16;
-const FocusEditorHover = 51;
-const FocusEditorRename$1 = 11;
-const SourceActions = 38;
-const FocusCodeGenerator = 52;
-
 const getFileExtensionIndex = file => {
   string(file);
   return file.lastIndexOf(Dot);
@@ -4230,6 +4401,46 @@ const createEditor = async ({
   });
 };
 
+const isEqual$2 = (oldState, newState) => {
+  return oldState.itemHeight === newState.itemHeight;
+};
+
+const isEqual$1 = (oldState, newState) => {
+  return oldState.focused === newState.focused && oldState.focus === newState.focus;
+};
+
+const isEqual = (oldState, newState) => {
+  return oldState.lines === newState.lines && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial;
+};
+
+const RenderFocus = 6;
+const RenderFocusContext = 7;
+const RenderCss = 11;
+const RenderIncremental = 12;
+
+const modules = [isEqual, isEqual$1, isEqual$1, isEqual$2];
+const numbers = [RenderIncremental, RenderFocus, RenderFocusContext, RenderCss];
+
+const diff = (oldState, newState) => {
+  const diffResult = [];
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
+    }
+  }
+  return diffResult;
+};
+
+const diff2 = uid => {
+  const {
+    newState,
+    oldState
+  } = get$7(uid);
+  const result = diff(oldState, newState);
+  return result;
+};
+
 // @ts-ignore
 const getNewSelections$c = selections => {
   const newSelections = [];
@@ -4875,7 +5086,7 @@ const create$6 = () => {
 };
 
 const newStateGenerator$6 = (state, parentUid) => {
-  return loadContent$2(state, parentUid);
+  return loadContent$3(state, parentUid);
 };
 const openColorPicker = async editor => {
   return addWidgetToEditor(ColorPicker$1, ColorPicker, editor, create$6, newStateGenerator$6);
@@ -7164,18 +7375,18 @@ const launchFindWidgetWorker = async () => {
 const rpcId = 9002;
 const launch = async () => {
   // TODO race condition
-  if (get$7(rpcId)) {
+  if (get$8(rpcId)) {
     return;
   }
   const rpc = await launchFindWidgetWorker();
-  set$e(rpcId, rpc);
+  set$f(rpcId, rpc);
 };
 const invoke$3 = async (method, ...params) => {
-  const rpc = get$7(rpcId);
+  const rpc = get$8(rpcId);
   return await rpc.invoke(method, ...params);
 };
 const dispose = async () => {
-  const rpc = get$7(rpcId);
+  const rpc = get$8(rpcId);
   remove$8(rpcId);
   if (rpc) {
     await rpc.dispose();
@@ -7197,7 +7408,7 @@ const getEditor = editorUid => {
   return newState;
 };
 
-const loadContent$1 = async (state, parentUid) => {
+const loadContent$2 = async (state, parentUid) => {
   const {
     uid
   } = state;
@@ -7220,7 +7431,7 @@ const loadContent$1 = async (state, parentUid) => {
 };
 
 const newStateGenerator$3 = (state, parentUid) => {
-  return loadContent$1(state, parentUid);
+  return loadContent$2(state, parentUid);
 };
 const openFind2 = async editor => {
   const fullFocus = true;
@@ -9609,7 +9820,7 @@ const getEditorHoverInfo = async (editorUid, position) => {
   };
 };
 
-const loadContent = async (editorUid, state, position) => {
+const loadContent$1 = async (editorUid, state, position) => {
   const hoverInfo = await getEditorHoverInfo(editorUid, position);
   if (!hoverInfo) {
     return state;
@@ -10476,8 +10687,8 @@ const getKeyBindings = () => {
   }];
 };
 
-const getKeys = () => {
-  return getKeys$1();
+const getKeys$1 = () => {
+  return getKeys$2();
 };
 
 /**
@@ -10562,7 +10773,7 @@ const getDiagnostics = editor => {
 const getProblems = async () => {
   // TODO maybe combine querying diagnostics for problems view with diagnostics for editor
   // or query the diagnostics for the problems view directtly from the extension host worker
-  const keys = getKeys$1();
+  const keys = getKeys$2();
   const editors = keys.map(key => {
     const numericKey = parseInt(key);
     const editor = get$5(numericKey);
@@ -10675,12 +10886,12 @@ const handleBeforeInput = (editor, inputType, data) => {
 };
 
 const handleMessagePort = async (port, rpcId) => {
-  const rpc = await PlainMessagePortRpcParent.create({
+  const rpc = await create$d({
     commandMap: {},
     messagePort: port
   });
   if (rpcId) {
-    set$e(rpcId, rpc);
+    set$f(rpcId, rpc);
   }
 };
 
@@ -10774,7 +10985,7 @@ const hotReload = async () => {
   isReloading = true;
 
   // TODO use getEditors
-  const keys = getKeys$1();
+  const keys = getKeys$2();
   const savedStates = await saveWidgetState(keys);
   await relaunchWorkers();
   const newEditors = await restoreWidgetState(keys, savedStates);
@@ -10795,7 +11006,7 @@ const sendMessagePortToExtensionHostWorker2 = async (port, initialCommand, rpcId
 const createExtensionHostRpc = async () => {
   try {
     const initialCommand = 'HandleMessagePort.handleMessagePort2';
-    const rpc = await TransferMessagePortRpcParent.create({
+    const rpc = await create$c({
       commandMap: {},
       async send(port) {
         await sendMessagePortToExtensionHostWorker2(port, initialCommand, EditorWorker);
@@ -10814,7 +11025,7 @@ const initializeExtensionHost = async () => {
 
 const createExtensionManagementWorkerRpc = async () => {
   try {
-    const rpc = await TransferMessagePortRpcParent.create({
+    const rpc = await create$c({
       commandMap: {},
       async send(port) {
         await sendMessagePortToExtensionManagementWorker(port, EditorWorker);
@@ -10829,7 +11040,7 @@ const createExtensionManagementWorkerRpc = async () => {
 const initializeExtensionManagementWorker = async () => {
   try {
     const rpc = await createExtensionManagementWorkerRpc();
-    set$c(rpc);
+    set$d(rpc);
   } catch {
     // ignore
   }
@@ -10841,11 +11052,11 @@ const send$2 = port => {
 };
 const initializeOpenerWorker = async () => {
   try {
-    const rpc = await LazyTransferMessagePortRpcParent.create({
+    const rpc = await create$f({
       commandMap: {},
       send: send$2
     });
-    set$a(rpc);
+    set$b(rpc);
   } catch {
     // ignore
   }
@@ -10865,7 +11076,7 @@ const sendMessagePortToSyntaxHighlightingWorker = async port => {
 
 const createSyntaxHighlightingWorkerRpc = async () => {
   try {
-    const rpc = await TransferMessagePortRpcParent.create({
+    const rpc = await create$c({
       commandMap: {},
       send: sendMessagePortToSyntaxHighlightingWorker
     });
@@ -10891,11 +11102,11 @@ const send$1 = port => {
 };
 const initializeTextMeasurementWorker = async () => {
   try {
-    const rpc = await LazyTransferMessagePortRpcParent.create({
+    const rpc = await create$f({
       commandMap: {},
       send: send$1
     });
-    set$9(rpc);
+    set$a(rpc);
   } catch {
     // ignore
   }
@@ -10914,6 +11125,170 @@ const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
   await Promise.all([initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental), initializeExtensionHost(), initializeExtensionManagementWorker(), initializeTextMeasurementWorker(), initializeOpenerWorker()]);
 };
 
+const kLineHeight = 'editor.lineHeight';
+const kFontSize = 'editor.fontSize';
+const kFontFamily = 'editor.fontFamily';
+const kTabSize = 'editor.tabSize';
+const kLineNumbers = 'editor.lineNumbers';
+const kDiagnostics = 'editor.diagnostics';
+const kQuickSuggestions = 'editor.quickSuggestions';
+const kAutoClosingQuotes = 'editor.autoClosingQuotes';
+const kAutoClosingBrackets = 'editor.autoclosingBrackets';
+const kFontWeight = 'editor.fontWeight';
+const isAutoClosingBracketsEnabled = async () => {
+  return Boolean(await get$1(kAutoClosingBrackets));
+};
+const isAutoClosingQuotesEnabled = async () => {
+  return Boolean(await get$1(kAutoClosingQuotes));
+};
+const isQuickSuggestionsEnabled = async () => {
+  return Boolean(await get$1(kQuickSuggestions));
+};
+const isAutoClosingTagsEnabled = async () => {
+  return true;
+};
+const getRowHeight = async () => {
+  return (await get$1(kLineHeight)) || 20;
+};
+const getFontSize = async () => {
+  return (await get$1(kFontSize)) || 15; // TODO find out if it is possible to use all numeric values for settings for efficiency, maybe settings could be an array
+};
+const getFontFamily = async () => {
+  return (await get$1(kFontFamily)) || 'Fira Code';
+};
+const getLetterSpacing = async () => {
+  {
+    return 0;
+  }
+};
+const getTabSize = async () => {
+  return (await get$1(kTabSize)) || 2;
+};
+const getLineNumbers = async () => {
+  return (await get$1(kLineNumbers)) ?? false;
+};
+const getCompletionTriggerCharacters = async () => {
+  return ['.', '/'];
+};
+const diagnosticsEnabled = async () => {
+  return (await get$1(kDiagnostics)) ?? false;
+};
+const getFontWeight = async () => {
+  return (await get$1(kFontWeight)) ?? 400;
+};
+
+const getEditorPreferences = async () => {
+  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, rowHeight, tabSize, letterSpacing, completionTriggerCharacters] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters()]);
+  return {
+    completionTriggerCharacters,
+    diagnosticsEnabled: diagnosticsEnabled$1,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    isAutoClosingBracketsEnabled: isAutoClosingBracketsEnabled$1,
+    isAutoClosingQuotesEnabled: isAutoClosingQuotesEnabled$1,
+    isAutoClosingTagsEnabled: isAutoClosingTagsEnabled$1,
+    isQuickSuggestionsEnabled: isQuickSuggestionsEnabled$1,
+    letterSpacing,
+    lineNumbers,
+    rowHeight,
+    tabSize
+  };
+};
+
+const loadContent = async (state, savedState) => {
+  const {
+    assetDir,
+    height,
+    id,
+    platform,
+    uri,
+    width,
+    x,
+    y
+  } = state;
+  const {
+    completionTriggerCharacters,
+    diagnosticsEnabled,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    isAutoClosingBracketsEnabled,
+    isAutoClosingQuotesEnabled,
+    isAutoClosingTagsEnabled,
+    isQuickSuggestionsEnabled,
+    letterSpacing,
+    lineNumbers,
+    rowHeight,
+    tabSize
+  } = await getEditorPreferences();
+  // TODO support overwriting language id by setting it explicitly or via settings
+  const charWidth = await measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing);
+  const languages = await getLanguages(platform, assetDir);
+  const computedlanguageId = getLanguageId$1(uri, languages);
+  const newEditor0 = {
+    ...state,
+    charWidth,
+    completionTriggerCharacters,
+    diagnosticsEnabled,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    isAutoClosingBracketsEnabled,
+    isAutoClosingQuotesEnabled,
+    isAutoClosingTagsEnabled,
+    isQuickSuggestionsEnabled,
+    languageId: computedlanguageId,
+    letterSpacing,
+    lineNumbers,
+    rowHeight,
+    tabSize
+  };
+  const content = await readFile(uri);
+
+  // TODO avoid creating intermediate editors here
+  const newEditor1 = setBounds(newEditor0, x, y, width, height, 9);
+  const newEditor2 = setText$1(newEditor1, content);
+  let newEditor3 = newEditor2;
+
+  // Detect links and initialize decorations
+  const linkDecorations = detectAllLinksAsDecorations(newEditor3);
+  const newEditor3WithLinks = {
+    ...newEditor3,
+    decorations: linkDecorations
+  };
+  const syncIncremental = getEnabled();
+  const {
+    differences,
+    textInfos
+  } = await getVisible$1(newEditor3WithLinks, syncIncremental);
+  const newEditor4 = {
+    ...newEditor3WithLinks,
+    differences,
+    focus: FocusEditorText$1,
+    focused: true,
+    textInfos
+  };
+
+  // TODO only sync when needed
+  // e.g. it might not always be necessary to send text to extension host worker
+  // @ts-ignore
+  await invoke$6(TextDocumentSyncFull, uri, id, computedlanguageId, content);
+
+  // TODO await promise
+  if (diagnosticsEnabled) {
+    await updateDiagnostics(newEditor4);
+  }
+  const completionsOnTypeRaw = await get$1('editor.completionsOnType');
+  const completionsOnType = Boolean(completionsOnTypeRaw);
+  const newEditor5 = {
+    ...newEditor4,
+    completionsOnType,
+    initial: false
+  };
+  return newEditor5;
+};
+
 // TODO move cursor
 // TODO multiple cursors -> vscode removes multiple cursors
 // TODO with selection -> vscode moves whole selection
@@ -10980,6 +11355,319 @@ const registerListener = (listenerType, rpcId) => {
   registerListener$1(listenerType, rpcId);
 };
 
+const getCss = itemHeight => {
+  return `:root {
+  --ActivityBarItemHeight: var(--${itemHeight}px);
+}
+`;
+};
+
+const renderCss = (oldState, newState) => {
+  const {
+    itemHeight,
+    uid
+  } = newState;
+  const css = getCss(itemHeight);
+  return [SetCss$1, uid, css];
+};
+
+const renderFocus$2 = (oldState, newState) => {
+  const selector = '.EditorInput';
+  return [FocusSelector, newState.uid, selector];
+};
+
+const renderFocusContext$1 = (oldState, newState) => {
+  return [SetFocusContext$1, newState.uid, FocusExplorer];
+};
+
+const SetText = 1;
+const Replace = 2;
+const SetAttribute = 3;
+const RemoveAttribute = 4;
+const Add = 6;
+const NavigateChild = 7;
+const NavigateParent = 8;
+const RemoveChild = 9;
+const NavigateSibling = 10;
+const SetReferenceNodeUid = 11;
+
+const isKey = key => {
+  return key !== 'type' && key !== 'childCount';
+};
+
+const getKeys = node => {
+  const keys = Object.keys(node).filter(isKey);
+  return keys;
+};
+
+const arrayToTree = nodes => {
+  const result = [];
+  let i = 0;
+  while (i < nodes.length) {
+    const node = nodes[i];
+    const {
+      children,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, node.childCount || 0);
+    result.push({
+      node,
+      children
+    });
+    i += 1 + nodesConsumed;
+  }
+  return result;
+};
+const getChildrenWithCount = (nodes, startIndex, childCount) => {
+  if (childCount === 0) {
+    return {
+      children: [],
+      nodesConsumed: 0
+    };
+  }
+  const children = [];
+  let i = startIndex;
+  let remaining = childCount;
+  let totalConsumed = 0;
+  while (remaining > 0 && i < nodes.length) {
+    const node = nodes[i];
+    const nodeChildCount = node.childCount || 0;
+    const {
+      children: nodeChildren,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, nodeChildCount);
+    children.push({
+      node,
+      children: nodeChildren
+    });
+    const nodeSize = 1 + nodesConsumed;
+    i += nodeSize;
+    totalConsumed += nodeSize;
+    remaining--;
+  }
+  return {
+    children,
+    nodesConsumed: totalConsumed
+  };
+};
+
+const compareNodes = (oldNode, newNode) => {
+  const patches = [];
+  // Check if node type changed - return null to signal incompatible nodes
+  // (caller should handle this with a Replace operation)
+  if (oldNode.type !== newNode.type) {
+    return null;
+  }
+  // Handle reference nodes - special handling for uid changes
+  if (oldNode.type === Reference) {
+    if (oldNode.uid !== newNode.uid) {
+      patches.push({
+        type: SetReferenceNodeUid,
+        uid: newNode.uid
+      });
+    }
+    return patches;
+  }
+  // Handle text nodes
+  if (oldNode.type === Text$1 && newNode.type === Text$1) {
+    if (oldNode.text !== newNode.text) {
+      patches.push({
+        type: SetText,
+        value: newNode.text
+      });
+    }
+    return patches;
+  }
+  // Compare attributes
+  const oldKeys = getKeys(oldNode);
+  const newKeys = getKeys(newNode);
+  // Check for attribute changes
+  for (const key of newKeys) {
+    if (oldNode[key] !== newNode[key]) {
+      patches.push({
+        type: SetAttribute,
+        key,
+        value: newNode[key]
+      });
+    }
+  }
+  // Check for removed attributes
+  for (const key of oldKeys) {
+    if (!(key in newNode)) {
+      patches.push({
+        type: RemoveAttribute,
+        key
+      });
+    }
+  }
+  return patches;
+};
+
+const treeToArray = node => {
+  const result = [node.node];
+  for (const child of node.children) {
+    result.push(...treeToArray(child));
+  }
+  return result;
+};
+
+const diffChildren = (oldChildren, newChildren, patches) => {
+  const maxLength = Math.max(oldChildren.length, newChildren.length);
+  // Track where we are: -1 means at parent, >= 0 means at child index
+  let currentChildIndex = -1;
+  // Collect indices of children to remove (we'll add these patches at the end in reverse order)
+  const indicesToRemove = [];
+  for (let i = 0; i < maxLength; i++) {
+    const oldNode = oldChildren[i];
+    const newNode = newChildren[i];
+    if (!oldNode && !newNode) {
+      continue;
+    }
+    if (!oldNode) {
+      // Add new node - we should be at the parent
+      if (currentChildIndex >= 0) {
+        // Navigate back to parent
+        patches.push({
+          type: NavigateParent
+        });
+        currentChildIndex = -1;
+      }
+      // Flatten the entire subtree so renderInternal can handle it
+      const flatNodes = treeToArray(newNode);
+      patches.push({
+        type: Add,
+        nodes: flatNodes
+      });
+    } else if (newNode) {
+      // Compare nodes to see if we need any patches
+      const nodePatches = compareNodes(oldNode.node, newNode.node);
+      // If nodePatches is null, the node types are incompatible - need to replace
+      if (nodePatches === null) {
+        // Navigate to this child
+        if (currentChildIndex === -1) {
+          patches.push({
+            type: NavigateChild,
+            index: i
+          });
+          currentChildIndex = i;
+        } else if (currentChildIndex !== i) {
+          patches.push({
+            type: NavigateSibling,
+            index: i
+          });
+          currentChildIndex = i;
+        }
+        // Replace the entire subtree
+        const flatNodes = treeToArray(newNode);
+        patches.push({
+          type: Replace,
+          nodes: flatNodes
+        });
+        // After replace, we're at the new element (same position)
+        continue;
+      }
+      // Check if we need to recurse into children
+      const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
+      // Only navigate to this element if we need to do something
+      if (nodePatches.length > 0 || hasChildrenToCompare) {
+        // Navigate to this child if not already there
+        if (currentChildIndex === -1) {
+          patches.push({
+            type: NavigateChild,
+            index: i
+          });
+          currentChildIndex = i;
+        } else if (currentChildIndex !== i) {
+          patches.push({
+            type: NavigateSibling,
+            index: i
+          });
+          currentChildIndex = i;
+        }
+        // Apply node patches (these apply to the current element, not children)
+        if (nodePatches.length > 0) {
+          patches.push(...nodePatches);
+        }
+        // Compare children recursively
+        if (hasChildrenToCompare) {
+          diffChildren(oldNode.children, newNode.children, patches);
+        }
+      }
+    } else {
+      // Remove old node - collect the index for later removal
+      indicesToRemove.push(i);
+    }
+  }
+  // Navigate back to parent if we ended at a child
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+    currentChildIndex = -1;
+  }
+  // Add remove patches in reverse order (highest index first)
+  // This ensures indices remain valid as we remove
+  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
+    patches.push({
+      type: RemoveChild,
+      index: indicesToRemove[j]
+    });
+  }
+};
+const diffTrees = (oldTree, newTree, patches, path) => {
+  // At the root level (path.length === 0), we're already AT the element
+  // So we compare the root node directly, then compare its children
+  if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
+    const oldNode = oldTree[0];
+    const newNode = newTree[0];
+    // Compare root nodes
+    const nodePatches = compareNodes(oldNode.node, newNode.node);
+    // If nodePatches is null, the root node types are incompatible - need to replace
+    if (nodePatches === null) {
+      const flatNodes = treeToArray(newNode);
+      patches.push({
+        type: Replace,
+        nodes: flatNodes
+      });
+      return;
+    }
+    if (nodePatches.length > 0) {
+      patches.push(...nodePatches);
+    }
+    // Compare children
+    if (oldNode.children.length > 0 || newNode.children.length > 0) {
+      diffChildren(oldNode.children, newNode.children, patches);
+    }
+  } else {
+    // Non-root level or multiple root elements - use the regular comparison
+    diffChildren(oldTree, newTree, patches);
+  }
+};
+
+const removeTrailingNavigationPatches = patches => {
+  // Find the last non-navigation patch
+  let lastNonNavigationIndex = -1;
+  for (let i = patches.length - 1; i >= 0; i--) {
+    const patch = patches[i];
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+      lastNonNavigationIndex = i;
+      break;
+    }
+  }
+  // Return patches up to and including the last non-navigation patch
+  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+};
+
+const diffTree = (oldNodes, newNodes) => {
+  // Step 1: Convert flat arrays to tree structures
+  const oldTree = arrayToTree(oldNodes);
+  const newTree = arrayToTree(newNodes);
+  // Step 3: Compare the trees
+  const patches = [];
+  diffTrees(oldTree, newTree, patches, []);
+  // Remove trailing navigation patches since they serve no purpose
+  return removeTrailingNavigationPatches(patches);
+};
+
 const getCursorsVirtualDom = cursors => {
   const dom = [];
   for (const translate of cursors) {
@@ -11095,6 +11783,133 @@ const getSelectionsVirtualDom = selections => {
   return dom;
 };
 
+const getEditorVirtualDom = ({
+  cursorInfos = [],
+  diagnostics = [],
+  differences,
+  gutterInfos = [],
+  highlightedLine = -1,
+  lineNumbers = true,
+  scrollBarDiagnostics = [],
+  selectionInfos = [],
+  textInfos
+}) => {
+  const cursorInfosArray = [...cursorInfos];
+  const diagnosticsArray = [...diagnostics];
+  const gutterInfosArray = [...gutterInfos];
+  const scrollBarDiagnosticsArray = [...scrollBarDiagnostics];
+  const rowsDom = getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine);
+  const cursorsDom = getCursorsVirtualDom(cursorInfosArray);
+  const selectionsDom = getSelectionsVirtualDom(selectionInfos);
+  const diagnosticsDom = getDiagnosticsVirtualDom(diagnosticsArray);
+  const gutterDom = getEditorGutterVirtualDom(gutterInfosArray);
+  const scrollBarDiagnosticsDom = getDiagnosticsVirtualDom(scrollBarDiagnosticsArray);
+  return [{
+    childCount: 2,
+    className: 'Viewlet Editor',
+    role: 'code',
+    type: Div
+  }, {
+    childCount: gutterInfosArray.length,
+    className: 'Gutter',
+    type: Div
+  }, ...gutterDom, {
+    childCount: 4,
+    className: 'EditorContent',
+    type: Div
+  }, {
+    childCount: 4,
+    className: 'EditorLayers',
+    type: Div
+  }, {
+    childCount: selectionsDom.length,
+    className: 'Selections',
+    type: Div
+  }, ...selectionsDom, {
+    childCount: textInfos.length,
+    className: 'EditorRows',
+    type: Div
+  }, ...rowsDom, {
+    childCount: cursorsDom.length,
+    className: 'LayerCursor',
+    type: Div
+  }, ...cursorsDom, {
+    childCount: diagnosticsDom.length,
+    className: 'LayerDiagnostics',
+    type: Div
+  }, ...diagnosticsDom, {
+    childCount: scrollBarDiagnosticsDom.length,
+    className: 'EditorScrollBarDiagnostics',
+    type: Div
+  }, ...scrollBarDiagnosticsDom, {
+    childCount: 1,
+    className: 'ScrollBar ScrollBarVertical',
+    type: Div
+  }, {
+    childCount: 0,
+    className: 'ScrollBarThumb ScrollBarThumbVertical',
+    type: Div
+  }, {
+    childCount: 1,
+    className: 'ScrollBar ScrollBarHorizontal',
+    type: Div
+  }, {
+    childCount: 0,
+    className: 'ScrollBarThumb ScrollBarThumbHorizontal',
+    type: Div
+  }];
+};
+
+const getDom = state => {
+  if (state.initial) {
+    return [];
+  }
+  return getEditorVirtualDom(state);
+};
+const renderIncremental = (oldState, newState) => {
+  const oldDom = getDom(oldState);
+  const newDom = getDom(newState);
+  const patches = diffTree(oldDom, newDom);
+  return [SetPatches, newState.uid, patches];
+};
+
+const getRenderer = diffType => {
+  switch (diffType) {
+    case RenderCss:
+      return renderCss;
+    case RenderFocus:
+      return renderFocus$2;
+    case RenderFocusContext:
+      return renderFocusContext$1;
+    case RenderIncremental:
+      return renderIncremental;
+    default:
+      throw new Error('unknown renderer');
+  }
+};
+
+const applyRender = (oldState, newState, diffResult) => {
+  const commands = [];
+  for (const item of diffResult) {
+    const fn = getRenderer(item);
+    const result = fn(oldState, newState);
+    if (result.length > 0) {
+      commands.push(result);
+    }
+  }
+  return commands;
+};
+
+const render2 = (uid, diffResult) => {
+  const {
+    newState,
+    oldState
+  } = get$7(uid);
+  set$8(uid, newState, newState);
+  const commands = applyRender(oldState, newState, diffResult);
+  return commands;
+};
+
 const addWidget = widget => {
   const module = get$6(widget.id);
   if (!module) {
@@ -11353,6 +12168,15 @@ const renderEventListeners = () => {
   }];
 };
 
+const saveState = (state, savedState) => {
+  const {
+    lines
+  } = state;
+  return {
+    lines
+  };
+};
+
 const setDebugEnabled = (state, enabled) => {
   return state;
 };
@@ -11369,7 +12193,7 @@ const unregisterListener = (listenerType, rpcId) => {
 };
 
 const invoke = async (method, ...params) => {
-  const worker = get$7(DebugWorker);
+  const worker = get$8(DebugWorker);
   return worker.invoke(method, ...params);
 };
 
@@ -11379,7 +12203,7 @@ const getDebugHighlight = async debugId => {
 };
 
 const getKey = () => {
-  const keys = getKeys$1();
+  const keys = getKeys$2();
   return parseInt(keys[0]);
 };
 const updateDebugInfo = async debugId => {
@@ -11427,7 +12251,7 @@ const wrapCommand = fn => async (editorUid, ...args) => {
 const commandMap = {
   'ActivateByEvent.activateByEvent': activateByEvent,
   'CodeGenerator.accept': codeGeneratorAccept,
-  'ColorPicker.loadContent': loadContent$2,
+  'ColorPicker.loadContent': loadContent$3,
   'Editor.addCursorAbove': wrapCommand(addCursorAbove),
   'Editor.addCursorBelow': wrapCommand(addCursorBelow),
   'Editor.applyDocumentEdits': wrapCommand(applyDocumentEdits),
@@ -11450,6 +12274,7 @@ const commandMap = {
   'Editor.copyLineDown': wrapCommand(copyLineDown),
   'Editor.copyLineUp': wrapCommand(copyLineUp),
   'Editor.create': createEditor,
+  'Editor.create2': createEditor2,
   'Editor.cursorCharacterLeft': wrapCommand(cursorCharacterLeft),
   'Editor.cursorCharacterRight': wrapCommand(cursorCharacterRight),
   'Editor.cursorDown': wrapCommand(cursorDown),
@@ -11476,12 +12301,14 @@ const commandMap = {
   'Editor.deleteWordPartLeft': wrapCommand(deleteWordPartLeft),
   'Editor.deleteWordPartRight': wrapCommand(deleteWordPartRight),
   'Editor.deleteWordRight': wrapCommand(deleteWordRight),
+  'Editor.diff2': diff2,
   'Editor.executeWidgetCommand': wrapCommand(executeWidgetCommand),
   'Editor.findAllReferences': wrapCommand(findAllReferences$1),
   'Editor.format': wrapCommand(format),
+  'Editor.getCommandIds': getCommandIds,
   'Editor.getDiagnostics': getDiagnostics$1,
   'Editor.getKeyBindings': getKeyBindings,
-  'Editor.getKeys': getKeys,
+  'Editor.getKeys': getKeys$1,
   'Editor.getLanguageId': getLanguageId,
   'Editor.getLines2': getLines2,
   'Editor.getMenuEntries': getMenuEntries,
@@ -11533,6 +12360,7 @@ const commandMap = {
   'Editor.indendLess': wrapCommand(indentLess),
   'Editor.indentMore': wrapCommand(indentMore),
   'Editor.insertLineBreak': wrapCommand(insertLineBreak),
+  'Editor.loadContent': wrapCommand$1(loadContent),
   'Editor.moveLineDown': wrapCommand(moveLineDown),
   'Editor.moveLineUp': wrapCommand(moveLineUp),
   'Editor.moveRectangleSelection': wrapCommand(moveRectangleSelection),
@@ -11550,10 +12378,12 @@ const commandMap = {
   'Editor.paste': wrapCommand(paste),
   'Editor.pasteText': wrapCommand(pasteText),
   'Editor.render': renderEditor,
+  'Editor.render2': render2,
   'Editor.renderEventListeners': renderEventListeners,
   'Editor.replaceRange': wrapCommand(replaceRange),
   'Editor.rerender': wrapCommand(rerender),
   'Editor.save': wrapCommand(save),
+  'Editor.saveState': wrapGetter(saveState),
   'Editor.selectAll': wrapCommand(selectAll),
   'Editor.selectAllLeft': wrapCommand(editorSelectAllLeft),
   'Editor.selectAllOccurrences': wrapCommand(selectAllOccurrences),
@@ -11585,6 +12415,7 @@ const commandMap = {
   'Editor.showSourceActions3': showSourceActions,
   'Editor.sortLinesAscending': wrapCommand(sortLinesAscending),
   'Editor.tabCompletion': wrapCommand(tabCompletion),
+  'Editor.terminate': terminate,
   'Editor.toggleBlockComment': wrapCommand(toggleBlockComment),
   'Editor.toggleComment': wrapCommand(toggleComment),
   'Editor.toggleLineComment': wrapCommand(editorToggleLineComment),
@@ -11646,7 +12477,7 @@ const commandMap = {
   'FindWidget.handleReplaceFocus': handleReplaceFocus,
   'FindWidget.handleReplaceInput': handleReplaceInput,
   'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
-  'FindWidget.loadContent': loadContent$1,
+  'FindWidget.loadContent': loadContent$2,
   'FindWidget.replace': replace,
   'FindWidget.replaceAll': replaceAll,
   'FindWidget.toggleMatchCase': toggleMatchCase,
@@ -11660,10 +12491,11 @@ const commandMap = {
   'Hover.handleSashPointerDown': handleSashPointerDown,
   'Hover.handleSashPointerMove': handleSashPointerMove,
   'Hover.handleSashPointerUp': handleSashPointerUp,
-  'Hover.loadContent': loadContent,
+  'Hover.loadContent': loadContent$1,
   'Hover.render': renderHover,
   'Initialize.initialize': intialize,
   'Listener.register': registerListener,
+  'Listener.registerListener': registerListener$1,
   'Listener.unregister': unregisterListener,
   'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker': sendMessagePortToExtensionHostWorker2
 };
@@ -11674,7 +12506,7 @@ const send = port => {
 };
 const createTextMeasurementWorkerRpc = async () => {
   try {
-    const rpc = await TransferMessagePortRpcParent.create({
+    const rpc = await create$c({
       commandMap: {},
       send
     });
@@ -11686,10 +12518,10 @@ const createTextMeasurementWorkerRpc = async () => {
 
 const listen = async () => {
   setFactory$1(createTextMeasurementWorkerRpc);
-  const rpc = await WebWorkerRpcClient.create({
+  const rpc = await create$b({
     commandMap: commandMap
   });
-  set$b(rpc);
+  set$c(rpc);
 };
 
 const CodeGeneratorInput = 'CodeGeneratorInput';