@lvce-editor/editor-worker 7.3.0 → 7.5.0

package/dist/editorWorkerMain.js

@@ -1,406 +1,3 @@
-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 Error(`command not found ${command}`);
-  }
-  return fn(...args);
-};
-
-const state$9 = {
-  /**
-   * @type {any}
-   */
-  ipc: undefined
-};
-const get$7 = () => {
-  return state$9.ipc;
-};
-const set$7 = ipc => {
-  state$9.ipc = ipc;
-};
-
-const Two = '2.0';
-const create$4$1 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
-const callbacks = Object.create(null);
-const set$6 = (id, fn) => {
-  callbacks[id] = fn;
-};
-const get$6 = id => {
-  return callbacks[id];
-};
-const remove$8 = id => {
-  delete callbacks[id];
-};
-let id = 0;
-const create$3$1 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3$1();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$6(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2$1 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
-class JsonRpcError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'JsonRpcError';
-  }
-}
-const NewLine$3 = '\n';
-const DomException = 'DOMException';
-const ReferenceError$1 = 'ReferenceError';
-const SyntaxError$1 = 'SyntaxError';
-const TypeError$1 = 'TypeError';
-const getErrorConstructor = (message, type) => {
-  if (type) {
-    switch (type) {
-      case DomException:
-        return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
-      case ReferenceError$1:
-        return ReferenceError;
-      default:
-        return Error;
-    }
-  }
-  if (message.startsWith('TypeError: ')) {
-    return TypeError;
-  }
-  if (message.startsWith('SyntaxError: ')) {
-    return SyntaxError;
-  }
-  if (message.startsWith('ReferenceError: ')) {
-    return ReferenceError;
-  }
-  return Error;
-};
-const constructError = (message, type, name) => {
-  const ErrorConstructor = getErrorConstructor(message, type);
-  if (ErrorConstructor === DOMException && name) {
-    return new ErrorConstructor(message, name);
-  }
-  if (ErrorConstructor === Error) {
-    const error = new Error(message);
-    if (name && name !== 'VError') {
-      error.name = name;
-    }
-    return error;
-  }
-  return new ErrorConstructor(message);
-};
-const getNewLineIndex$1 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$3, startIndex);
-};
-const getParentStack = error => {
-  let parentStack = error.stack || error.data || error.message || '';
-  if (parentStack.startsWith('    at')) {
-    parentStack = error.message + NewLine$3 + parentStack;
-  }
-  return parentStack;
-};
-const joinLines$2 = lines => {
-  return lines.join(NewLine$3);
-};
-const MethodNotFound = -32601;
-const Custom = -32001;
-const splitLines$2 = lines => {
-  return lines.split(NewLine$3);
-};
-const restoreJsonRpcError = error => {
-  if (error && error instanceof Error) {
-    return error;
-  }
-  const currentStack = joinLines$2(splitLines$2(new Error().stack || '').slice(1));
-  if (error && error.code && error.code === MethodNotFound) {
-    const restoredError = new JsonRpcError(error.message);
-    const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine$3 + currentStack;
-    return restoredError;
-  }
-  if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine$3 + error.data.stack + NewLine$3 + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex$1(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
-      }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
-      }
-    }
-    return restoredError;
-  }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
-  }
-  return new Error(`JsonRpc Error: ${error}`);
-};
-const unwrapJsonRpcResult = responseMessage => {
-  if ('error' in responseMessage) {
-    const restoredError = restoreJsonRpcError(responseMessage.error);
-    throw restoredError;
-  }
-  if ('result' in responseMessage) {
-    return responseMessage.result;
-  }
-  throw new JsonRpcError('unexpected response message');
-};
-const warn$1 = (...args) => {
-  console.warn(...args);
-};
-const resolve = (id, response) => {
-  const fn = get$6(id);
-  if (!fn) {
-    console.log(response);
-    warn$1(`callback ${id} may already be disposed`);
-    return;
-  }
-  fn(response);
-  remove$8(id);
-};
-const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
-const getErrorType = prettyError => {
-  if (prettyError && prettyError.type) {
-    return prettyError.type;
-  }
-  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
-    return prettyError.constructor.name;
-  }
-  return undefined;
-};
-const getErrorProperty = (error, prettyError) => {
-  if (error && error.code === E_COMMAND_NOT_FOUND) {
-    return {
-      code: MethodNotFound,
-      message: error.message,
-      data: error.stack
-    };
-  }
-  return {
-    code: Custom,
-    message: prettyError.message,
-    data: {
-      stack: prettyError.stack,
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
-      code: prettyError.code,
-      name: prettyError.name
-    }
-  };
-};
-const create$1$1 = (message, error) => {
-  return {
-    jsonrpc: Two,
-    id: message.id,
-    error
-  };
-};
-const getErrorResponse = (message, error, preparePrettyError, logError) => {
-  const prettyError = preparePrettyError(error);
-  logError(error, prettyError);
-  const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(message, errorProperty);
-};
-const create$d = (message, result) => {
-  return {
-    jsonrpc: Two,
-    id: message.id,
-    result: result ?? null
-  };
-};
-const getSuccessResponse = (message, result) => {
-  const resultProperty = result ?? null;
-  return create$d(message, resultProperty);
-};
-const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
-  try {
-    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
-    return getSuccessResponse(message, result);
-  } catch (error) {
-    return getErrorResponse(message, error, preparePrettyError, logError);
-  }
-};
-const defaultPreparePrettyError = error => {
-  return error;
-};
-const defaultLogError = () => {
-  // ignore
-};
-const defaultRequiresSocket = () => {
-  return false;
-};
-const defaultResolve = resolve;
-
-// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
-const normalizeParams = args => {
-  if (args.length === 1) {
-    const options = args[0];
-    return {
-      ipc: options.ipc,
-      message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
-      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
-    };
-  }
-  return {
-    ipc: args[0],
-    message: args[1],
-    execute: args[2],
-    resolve: args[3],
-    preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
-  };
-};
-const handleJsonRpcMessage = async (...args) => {
-  const options = normalizeParams(args);
-  const {
-    message,
-    ipc,
-    execute,
-    resolve,
-    preparePrettyError,
-    logError,
-    requiresSocket
-  } = options;
-  if ('id' in message) {
-    if ('method' in message) {
-      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-      try {
-        ipc.send(response);
-      } catch (error) {
-        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
-        ipc.send(errorResponse);
-      }
-      return;
-    }
-    resolve(message.id, message);
-    return;
-  }
-  if ('method' in message) {
-    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-    return;
-  }
-  throw new JsonRpcError('unexpected message');
-};
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2$1(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
-  }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-const send = (transport, method, ...params) => {
-  const message = create$4$1(method, params);
-  transport.send(message);
-};
-const invoke$9 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer$2 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
-
-const invoke$8 = async (method, ...params) => {
-  const ipc = get$7();
-  return invoke$9(ipc, method, ...params);
-};
-const invokeAndTransfer$1 = async (method, ...params) => {
-  const ipc = get$7();
-  return invokeAndTransfer$2(ipc, method, ...params);
-};
-const listen$5 = ipc => {
-  set$7(ipc);
-};
-
-const invoke$7 = async (method, ...params) => {
-  return invoke$8(method, ...params);
-};
-const invokeAndTransfer = async (method, ...params) => {
-  return invokeAndTransfer$1(method, ...params);
-};
-
-// TODO add tests for this
-const activateByEvent = async event => {
-  await invoke$7('ExtensionHostManagement.activateByEvent', event);
-};
-
-const codeGeneratorAccept = state => {
-  // TODO close code generator widget
-  return state;
-};
-
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -417,16 +14,16 @@ const getCombinedMessage = (error, message) => {
   }
   return stringifiedError;
 };
-const NewLine$2 = '\n';
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$2, startIndex);
+const NewLine$3 = '\n';
+const getNewLineIndex$1 = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$3, startIndex);
 };
 const mergeStacks = (parent, child) => {
   if (!child) {
     return parent;
   }
-  const parentNewLineIndex = getNewLineIndex(parent);
-  const childNewLineIndex = getNewLineIndex(child);
+  const parentNewLineIndex = getNewLineIndex$1(parent);
+  const childNewLineIndex = getNewLineIndex$1(child);
   if (childNewLineIndex === -1) {
     return parent;
   }
@@ -589,9 +186,9 @@ class Ipc extends EventTarget {
 const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
 const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
 const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
-const NewLine$1 = '\n';
-const joinLines$1 = lines => {
-  return lines.join(NewLine$1);
+const NewLine$2 = '\n';
+const joinLines$2 = lines => {
+  return lines.join(NewLine$2);
 };
 const RE_AT = /^\s+at/;
 const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
@@ -602,7 +199,7 @@ const getDetails = lines => {
   const index = lines.findIndex(isNormalStackLine);
   if (index === -1) {
     return {
-      actualMessage: joinLines$1(lines),
+      actualMessage: joinLines$2(lines),
       rest: []
     };
   }
@@ -617,8 +214,8 @@ const getDetails = lines => {
     rest: lines.slice(index, lastIndex)
   };
 };
-const splitLines$1 = lines => {
-  return lines.split(NewLine$1);
+const splitLines$2 = lines => {
+  return lines.split(NewLine$2);
 };
 const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
 const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
@@ -629,7 +226,7 @@ const isMessageCodeBlockEndIndex = line => {
   return RE_MESSAGE_CODE_BLOCK_END.test(line);
 };
 const getMessageCodeBlock = stderr => {
-  const lines = splitLines$1(stderr);
+  const lines = splitLines$2(stderr);
   const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
   const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
   const relevantLines = lines.slice(startIndex, endIndex);
@@ -640,7 +237,7 @@ const isModuleNotFoundMessage = line => {
   return line.includes('[ERR_MODULE_NOT_FOUND]');
 };
 const getModuleNotFoundError = stderr => {
-  const lines = splitLines$1(stderr);
+  const lines = splitLines$2(stderr);
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
@@ -688,7 +285,7 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
   if (isModuleNotFoundError(stderr)) {
     return getModuleNotFoundError(stderr);
   }
-  const lines = splitLines$1(stderr);
+  const lines = splitLines$2(stderr);
   const {
     actualMessage,
     rest
@@ -699,7 +296,7 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     stack: rest
   };
 };
-let IpcError$1 = class IpcError extends VError {
+class IpcError extends VError {
   // @ts-ignore
   constructor(betterMessage, stdout = '', stderr = '') {
     if (stdout || stderr) {
@@ -717,30 +314,189 @@ let IpcError$1 = class IpcError extends VError {
     } else {
       super(betterMessage);
     }
-    // @ts-ignore
-    this.name = 'IpcError';
-    // @ts-ignore
-    this.stdout = stdout;
-    // @ts-ignore
-    this.stderr = stderr;
+    // @ts-ignore
+    this.name = 'IpcError';
+    // @ts-ignore
+    this.stdout = stdout;
+    // @ts-ignore
+    this.stderr = stderr;
+  }
+}
+const readyMessage = 'ready';
+const getData$2 = event => {
+  return event.data;
+};
+const listen$7 = () => {
+  // @ts-ignore
+  if (typeof WorkerGlobalScope === 'undefined') {
+    throw new TypeError('module is not in web worker scope');
+  }
+  return globalThis;
+};
+const signal$8 = global => {
+  global.postMessage(readyMessage);
+};
+class IpcChildWithModuleWorker extends Ipc {
+  getData(event) {
+    return getData$2(event);
+  }
+  send(message) {
+    // @ts-ignore
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    // @ts-ignore
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    // ignore
+  }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
+}
+const wrap$f = global => {
+  return new IpcChildWithModuleWorker(global);
+};
+const waitForFirstMessage = async port => {
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  port.addEventListener('message', resolve, {
+    once: true
+  });
+  const event = await promise;
+  // @ts-ignore
+  return event.data;
+};
+const listen$6 = async () => {
+  const parentIpcRaw = listen$7();
+  signal$8(parentIpcRaw);
+  const parentIpc = wrap$f(parentIpcRaw);
+  const firstMessage = await waitForFirstMessage(parentIpc);
+  if (firstMessage.method !== 'initialize') {
+    throw new IpcError('unexpected first message');
+  }
+  const type = firstMessage.params[0];
+  if (type === 'message-port') {
+    parentIpc.send({
+      jsonrpc: '2.0',
+      id: firstMessage.id,
+      result: null
+    });
+    parentIpc.dispose();
+    const port = firstMessage.params[1];
+    return port;
+  }
+  return globalThis;
+};
+class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
+  getData(event) {
+    return getData$2(event);
+  }
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    if (this._rawIpc.close) {
+      this._rawIpc.close();
+    }
+  }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+    this._rawIpc.start();
+  }
+}
+const wrap$e = port => {
+  return new IpcChildWithModuleWorkerAndMessagePort(port);
+};
+const IpcChildWithModuleWorkerAndMessagePort$1 = {
+  __proto__: null,
+  listen: listen$6,
+  wrap: wrap$e
+};
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
+};
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
+};
+const getFirstEvent = (eventEmitter, eventMap) => {
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  const listenerMap = Object.create(null);
+  const cleanup = value => {
+    for (const event of Object.keys(eventMap)) {
+      removeListener(eventEmitter, event, listenerMap[event]);
+    }
+    resolve(value);
+  };
+  for (const [event, type] of Object.entries(eventMap)) {
+    const listener = event => {
+      cleanup({
+        type,
+        event
+      });
+    };
+    addListener(eventEmitter, event, listener);
+    listenerMap[event] = listener;
   }
+  return promise;
 };
-const readyMessage = 'ready';
-const getData$2 = event => {
-  return event.data;
-};
-const listen$8 = ({
-  port
+const Message$1 = 3;
+const create$5$1 = async ({
+  messagePort,
+  isMessagePortOpen
 }) => {
-  return port;
+  if (!isMessagePort(messagePort)) {
+    throw new IpcError('port must be of type MessagePort');
+  }
+  if (isMessagePortOpen) {
+    return messagePort;
+  }
+  const eventPromise = getFirstEvent(messagePort, {
+    message: Message$1
+  });
+  messagePort.start();
+  const {
+    type,
+    event
+  } = await eventPromise;
+  if (type !== Message$1) {
+    throw new IpcError('Failed to wait for ipc message');
+  }
+  if (event.data !== readyMessage) {
+    throw new IpcError('unexpected first message');
+  }
+  return messagePort;
 };
-const signal$9 = port => {
-  port.postMessage(readyMessage);
+const signal$1 = messagePort => {
+  messagePort.start();
 };
-class IpcChildWithMessagePort extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
+class IpcParentWithMessagePort extends Ipc {
+  getData = getData$2;
   send(message) {
     this._rawIpc.postMessage(message);
   }
@@ -749,228 +505,418 @@ class IpcChildWithMessagePort extends Ipc {
     this._rawIpc.postMessage(message, transfer);
   }
   dispose() {
-    // ignore
-  }
-  onClose(callback) {
-    // ignore
+    this._rawIpc.close();
   }
   onMessage(callback) {
     this._rawIpc.addEventListener('message', callback);
-    this._rawIpc.start();
   }
+  onClose(callback) {}
 }
-const wrap$g = port => {
-  return new IpcChildWithMessagePort(port);
+const wrap$5 = messagePort => {
+  return new IpcParentWithMessagePort(messagePort);
 };
-const IpcChildWithMessagePort$1 = {
+const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  listen: listen$8,
-  signal: signal$9,
-  wrap: wrap$g
+  create: create$5$1,
+  signal: signal$1,
+  wrap: wrap$5
 };
-const listen$7 = () => {
-  // @ts-ignore
-  if (typeof WorkerGlobalScope === 'undefined') {
-    throw new TypeError('module is not in web worker scope');
-  }
-  return globalThis;
+
+const Two = '2.0';
+const create$4$1 = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
 };
-const signal$8 = global => {
-  global.postMessage(readyMessage);
+const callbacks = Object.create(null);
+const set$a = (id, fn) => {
+  callbacks[id] = fn;
 };
-class IpcChildWithModuleWorker extends Ipc {
-  getData(event) {
-    return getData$2(event);
+const get$7 = id => {
+  return callbacks[id];
+};
+const remove$8 = id => {
+  delete callbacks[id];
+};
+let id = 0;
+const create$3$2 = () => {
+  return ++id;
+};
+const registerPromise = () => {
+  const id = create$3$2();
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  set$a(id, resolve);
+  return {
+    id,
+    promise
+  };
+};
+const create$2$2 = (method, params) => {
+  const {
+    id,
+    promise
+  } = registerPromise();
+  const message = {
+    jsonrpc: Two,
+    method,
+    params,
+    id
+  };
+  return {
+    message,
+    promise
+  };
+};
+class JsonRpcError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'JsonRpcError';
   }
-  send(message) {
-    // @ts-ignore
-    this._rawIpc.postMessage(message);
+}
+const NewLine$1 = '\n';
+const DomException = 'DOMException';
+const ReferenceError$1 = 'ReferenceError';
+const SyntaxError$1 = 'SyntaxError';
+const TypeError$1 = 'TypeError';
+const getErrorConstructor = (message, type) => {
+  if (type) {
+    switch (type) {
+      case DomException:
+        return DOMException;
+      case TypeError$1:
+        return TypeError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case ReferenceError$1:
+        return ReferenceError;
+      default:
+        return Error;
+    }
   }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    // @ts-ignore
-    this._rawIpc.postMessage(message, transfer);
+  if (message.startsWith('TypeError: ')) {
+    return TypeError;
   }
-  dispose() {
-    // ignore
+  if (message.startsWith('SyntaxError: ')) {
+    return SyntaxError;
   }
-  onClose(callback) {
-    // ignore
+  if (message.startsWith('ReferenceError: ')) {
+    return ReferenceError;
   }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
+  return Error;
+};
+const constructError = (message, type, name) => {
+  const ErrorConstructor = getErrorConstructor(message, type);
+  if (ErrorConstructor === DOMException && name) {
+    return new ErrorConstructor(message, name);
   }
-}
-const wrap$f = global => {
-  return new IpcChildWithModuleWorker(global);
+  if (ErrorConstructor === Error) {
+    const error = new Error(message);
+    if (name && name !== 'VError') {
+      error.name = name;
+    }
+    return error;
+  }
+  return new ErrorConstructor(message);
 };
-const IpcChildWithModuleWorker$1 = {
-  __proto__: null,
-  listen: listen$7,
-  signal: signal$8,
-  wrap: wrap$f
+const joinLines$1 = lines => {
+  return lines.join(NewLine$1);
 };
-const waitForFirstMessage$1 = async port => {
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  port.addEventListener('message', resolve, {
-    once: true
-  });
-  const event = await promise;
-  // @ts-ignore
-  return event.data;
+const splitLines$1 = lines => {
+  return lines.split(NewLine$1);
 };
-const listen$6 = async () => {
-  const parentIpcRaw = listen$7();
-  signal$8(parentIpcRaw);
-  const parentIpc = wrap$f(parentIpcRaw);
-  const firstMessage = await waitForFirstMessage$1(parentIpc);
-  if (firstMessage.method !== 'initialize') {
-    throw new IpcError$1('unexpected first message');
+const getCurrentStack = () => {
+  const currentStack = joinLines$1(splitLines$1(new Error().stack || '').slice(2));
+  return currentStack;
+};
+const getNewLineIndex = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$1, startIndex);
+};
+const getParentStack = error => {
+  let parentStack = error.stack || error.data || error.message || '';
+  if (parentStack.startsWith('    at')) {
+    parentStack = error.message + NewLine$1 + parentStack;
+  }
+  return parentStack;
+};
+const MethodNotFound = -32601;
+const Custom = -32001;
+const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
+  if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine$1 + currentStack;
+    }
+    return error;
+  }
+  if (error && error.code && error.code === MethodNotFound) {
+    const restoredError = new JsonRpcError(error.message);
+    const parentStack = getParentStack(error);
+    restoredError.stack = parentStack + NewLine$1 + currentStack;
+    return restoredError;
+  }
+  if (error && error.message) {
+    const restoredError = constructError(error.message, error.type, error.name);
+    if (error.data) {
+      if (error.data.stack && error.data.type && error.message) {
+        restoredError.stack = error.data.type + ': ' + error.message + NewLine$1 + error.data.stack + NewLine$1 + currentStack;
+      } else if (error.data.stack) {
+        restoredError.stack = error.data.stack;
+      }
+      if (error.data.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.data.codeFrame;
+      }
+      if (error.data.code) {
+        // @ts-ignore
+        restoredError.code = error.data.code;
+      }
+      if (error.data.type) {
+        // @ts-ignore
+        restoredError.name = error.data.type;
+      }
+    } else {
+      if (error.stack) {
+        const lowerStack = restoredError.stack || '';
+        // @ts-ignore
+        const indexNewLine = getNewLineIndex(lowerStack);
+        const parentStack = getParentStack(error);
+        // @ts-ignore
+        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+      }
+      if (error.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.codeFrame;
+      }
+    }
+    return restoredError;
   }
-  const type = firstMessage.params[0];
-  if (type === 'message-port') {
-    parentIpc.send({
-      jsonrpc: '2.0',
-      id: firstMessage.id,
-      result: null
-    });
-    parentIpc.dispose();
-    const port = firstMessage.params[1];
-    return port;
+  if (typeof error === 'string') {
+    return new Error(`JsonRpc Error: ${error}`);
   }
-  return globalThis;
+  return new Error(`JsonRpc Error: ${error}`);
 };
-class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
-  send(message) {
-    this._rawIpc.postMessage(message);
+const unwrapJsonRpcResult = responseMessage => {
+  if ('error' in responseMessage) {
+    const restoredError = restoreJsonRpcError(responseMessage.error);
+    throw restoredError;
   }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
+  if ('result' in responseMessage) {
+    return responseMessage.result;
   }
-  dispose() {
-    if (this._rawIpc.close) {
-      this._rawIpc.close();
-    }
+  throw new JsonRpcError('unexpected response message');
+};
+const warn$1 = (...args) => {
+  console.warn(...args);
+};
+const resolve = (id, response) => {
+  const fn = get$7(id);
+  if (!fn) {
+    console.log(response);
+    warn$1(`callback ${id} may already be disposed`);
+    return;
   }
-  onClose(callback) {
-    // ignore
+  fn(response);
+  remove$8(id);
+};
+const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
+const getErrorType = prettyError => {
+  if (prettyError && prettyError.type) {
+    return prettyError.type;
   }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-    this._rawIpc.start();
+  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
+    return prettyError.constructor.name;
   }
-}
-const wrap$e = port => {
-  return new IpcChildWithModuleWorkerAndMessagePort(port);
+  return undefined;
 };
-const IpcChildWithModuleWorkerAndMessagePort$1 = {
-  __proto__: null,
-  listen: listen$6,
-  wrap: wrap$e
+const isAlreadyStack = line => {
+  return line.trim().startsWith('at ');
 };
-const addListener = (emitter, type, callback) => {
-  if ('addEventListener' in emitter) {
-    emitter.addEventListener(type, callback);
-  } else {
-    emitter.on(type, callback);
+const getStack = prettyError => {
+  const stackString = prettyError.stack || '';
+  const newLineIndex = stackString.indexOf('\n');
+  if (newLineIndex !== -1 && !isAlreadyStack(stackString.slice(0, newLineIndex))) {
+    return stackString.slice(newLineIndex + 1);
   }
+  return stackString;
 };
-const removeListener = (emitter, type, callback) => {
-  if ('removeEventListener' in emitter) {
-    emitter.removeEventListener(type, callback);
-  } else {
-    emitter.off(type, callback);
+const getErrorProperty = (error, prettyError) => {
+  if (error && error.code === E_COMMAND_NOT_FOUND) {
+    return {
+      code: MethodNotFound,
+      message: error.message,
+      data: error.stack
+    };
   }
+  return {
+    code: Custom,
+    message: prettyError.message,
+    data: {
+      stack: getStack(prettyError),
+      codeFrame: prettyError.codeFrame,
+      type: getErrorType(prettyError),
+      code: prettyError.code,
+      name: prettyError.name
+    }
+  };
 };
-const getFirstEvent = (eventEmitter, eventMap) => {
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  const listenerMap = Object.create(null);
-  const cleanup = value => {
-    for (const event of Object.keys(eventMap)) {
-      removeListener(eventEmitter, event, listenerMap[event]);
+const create$1$1 = (id, error) => {
+  return {
+    jsonrpc: Two,
+    id,
+    error
+  };
+};
+const getErrorResponse = (id, error, preparePrettyError, logError) => {
+  const prettyError = preparePrettyError(error);
+  logError(error, prettyError);
+  const errorProperty = getErrorProperty(error, prettyError);
+  return create$1$1(id, errorProperty);
+};
+const create$b = (message, result) => {
+  return {
+    jsonrpc: Two,
+    id: message.id,
+    result: result ?? null
+  };
+};
+const getSuccessResponse = (message, result) => {
+  const resultProperty = result ?? null;
+  return create$b(message, resultProperty);
+};
+const getErrorResponseSimple = (id, error) => {
+  return {
+    jsonrpc: Two,
+    id,
+    error: {
+      code: Custom,
+      // @ts-ignore
+      message: error.message,
+      data: error
     }
-    resolve(value);
   };
-  for (const [event, type] of Object.entries(eventMap)) {
-    const listener = event => {
-      cleanup({
-        type,
-        event
-      });
+};
+const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
+  try {
+    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
+    return getSuccessResponse(message, result);
+  } catch (error) {
+    if (ipc.canUseSimpleErrorResponse) {
+      return getErrorResponseSimple(message.id, error);
+    }
+    return getErrorResponse(message.id, error, preparePrettyError, logError);
+  }
+};
+const defaultPreparePrettyError = error => {
+  return error;
+};
+const defaultLogError = () => {
+  // ignore
+};
+const defaultRequiresSocket = () => {
+  return false;
+};
+const defaultResolve = resolve;
+
+// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
+const normalizeParams = args => {
+  if (args.length === 1) {
+    const options = args[0];
+    return {
+      ipc: options.ipc,
+      message: options.message,
+      execute: options.execute,
+      resolve: options.resolve || defaultResolve,
+      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
+      logError: options.logError || defaultLogError,
+      requiresSocket: options.requiresSocket || defaultRequiresSocket
     };
-    addListener(eventEmitter, event, listener);
-    listenerMap[event] = listener;
   }
-  return promise;
+  return {
+    ipc: args[0],
+    message: args[1],
+    execute: args[2],
+    resolve: args[3],
+    preparePrettyError: args[4],
+    logError: args[5],
+    requiresSocket: args[6]
+  };
 };
-const Message$1 = 3;
-const create$5$1 = async ({
-  messagePort,
-  isMessagePortOpen
-}) => {
-  if (!isMessagePort(messagePort)) {
-    throw new IpcError$1('port must be of type MessagePort');
+const handleJsonRpcMessage = async (...args) => {
+  const options = normalizeParams(args);
+  const {
+    message,
+    ipc,
+    execute,
+    resolve,
+    preparePrettyError,
+    logError,
+    requiresSocket
+  } = options;
+  if ('id' in message) {
+    if ('method' in message) {
+      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+      try {
+        ipc.send(response);
+      } catch (error) {
+        const errorResponse = getErrorResponse(message.id, error, preparePrettyError, logError);
+        ipc.send(errorResponse);
+      }
+      return;
+    }
+    resolve(message.id, message);
+    return;
   }
-  if (isMessagePortOpen) {
-    return messagePort;
+  if ('method' in message) {
+    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+    return;
   }
-  const eventPromise = getFirstEvent(messagePort, {
-    message: Message$1
-  });
-  messagePort.start();
+  throw new JsonRpcError('unexpected message');
+};
+const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const {
-    type,
-    event
-  } = await eventPromise;
-  if (type !== Message$1) {
-    throw new IpcError$1('Failed to wait for ipc message');
-  }
-  if (event.data !== readyMessage) {
-    throw new IpcError$1('unexpected first message');
+    message,
+    promise
+  } = create$2$2(method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
   }
-  return messagePort;
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
 };
-const signal$1 = messagePort => {
-  messagePort.start();
+const send = (transport, method, ...params) => {
+  const message = create$4$1(method, params);
+  transport.send(message);
 };
-class IpcParentWithMessagePort extends Ipc {
-  getData = getData$2;
-  send(message) {
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
-  }
-  dispose() {
-    this._rawIpc.close();
-  }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-  }
-  onClose(callback) {}
-}
-const wrap$5 = messagePort => {
-  return new IpcParentWithMessagePort(messagePort);
+const invoke$a = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, false);
 };
-const IpcParentWithMessagePort$1 = {
-  __proto__: null,
-  create: create$5$1,
-  signal: signal$1,
-  wrap: wrap$5
+const invokeAndTransfer$1 = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, true);
+};
+
+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 Error(`command not found ${command}`);
+  }
+  return fn(...args);
 };
 
-const createRpc$1 = ipc => {
+const createRpc = ipc => {
   const rpc = {
     // @ts-ignore
     ipc,
@@ -981,10 +927,10 @@ const createRpc$1 = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$9(ipc, method, ...params);
+      return invoke$a(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$2(ipc, method, ...params);
+      return invokeAndTransfer$1(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -992,27 +938,35 @@ const createRpc$1 = ipc => {
   };
   return rpc;
 };
-const requiresSocket$1 = () => {
+const requiresSocket = () => {
   return false;
 };
-const preparePrettyError$1 = error => {
+const preparePrettyError = error => {
   return error;
 };
-const logError$2 = () => {
+const logError$1 = () => {
   // handled by renderer worker
 };
-const handleMessage$1 = event => {
-  const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket$1;
+const handleMessage = event => {
+  const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute$1;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError$1, logError$2, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError$1, actualRequiresSocket);
 };
-const handleIpc$1 = ipc => {
+const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
-    ipc.addEventListener('message', handleMessage$1);
+    ipc.addEventListener('message', handleMessage);
   } else if ('on' in ipc) {
     // deprecated
-    ipc.on('message', handleMessage$1);
+    ipc.on('message', handleMessage);
+  }
+};
+const listen$1 = async (module, options) => {
+  const rawIpc = await module.listen(options);
+  if (module.signal) {
+    module.signal(rawIpc);
   }
+  const ipc = module.wrap(rawIpc);
+  return ipc;
 };
 const create$9$1 = async ({
   commandMap,
@@ -1026,14 +980,173 @@ const create$9$1 = async ({
     isMessagePortOpen
   });
   const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
-  handleIpc$1(ipc);
-  const rpc = createRpc$1(ipc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
   return rpc;
 };
 const MessagePortRpcParent = {
   __proto__: null,
   create: create$9$1
 };
+const create$3$1 = async ({
+  commandMap,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    messagePort,
+    isMessagePortOpen: true
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  messagePort.start();
+  return rpc;
+};
+const create$2$1 = async ({
+  commandMap,
+  messagePort
+}) => {
+  return create$3$1({
+    commandMap,
+    messagePort
+  });
+};
+const PlainMessagePortRpcParent = {
+  __proto__: null,
+  create: create$2$1
+};
+const create$a = async ({
+  commandMap
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const ipc = await listen$1(IpcChildWithModuleWorkerAndMessagePort$1);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  return rpc;
+};
+const WebWorkerRpcClient = {
+  __proto__: null,
+  create: create$a
+};
+
+const rpcs = Object.create(null);
+const set$c = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get$6 = id => {
+  return rpcs[id];
+};
+
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+
+const create$9 = rpcId => {
+  return {
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get$6(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get$6(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$c(rpcId, rpc);
+    }
+  };
+};
+const DebugWorker = 55;
+const EditorWorker$1 = 99;
+const ExtensionHostWorker = 44;
+const MainProcess$1 = -5;
+const RendererWorker$1 = 1;
+const SearchProcess$1 = 77;
+const SearchProcessElectron = 2;
+const SharedProcess$1 = 1;
+const SourceControlWorker = 66;
+const EmbedsProcess$1 = 207;
+const EmbedsWorker = 208;
+const FileSystemWorker$1 = 209;
+const FileSystemProcess$1 = 210;
+const MarkdownWorker$1 = 300;
+const CompletionWorker = 301;
+const ColorPickerWorker = 302;
+const SourceActionWorker = 303;
+const ErrorWorker$1 = 3308;
+const SyntaxHighlightingWorker$1 = 3309;
+const RpcId = {
+  __proto__: null,
+  ColorPickerWorker,
+  CompletionWorker,
+  DebugWorker,
+  EditorWorker: EditorWorker$1,
+  EmbedsProcess: EmbedsProcess$1,
+  EmbedsWorker,
+  ErrorWorker: ErrorWorker$1,
+  ExtensionHostWorker,
+  FileSystemProcess: FileSystemProcess$1,
+  FileSystemWorker: FileSystemWorker$1,
+  MainProcess: MainProcess$1,
+  MarkdownWorker: MarkdownWorker$1,
+  RendererWorker: RendererWorker$1,
+  SearchProcess: SearchProcess$1,
+  SearchProcessElectron,
+  SharedProcess: SharedProcess$1,
+  SourceActionWorker,
+  SourceControlWorker,
+  SyntaxHighlightingWorker: SyntaxHighlightingWorker$1
+};
+const {
+  invoke: invoke$8,
+  set: set$8$1
+} = create$9(ExtensionHostWorker);
+const ExtensionHost = {
+  __proto__: null,
+  invoke: invoke$8,
+  set: set$8$1
+};
+const {
+  invoke: invoke$3$1,
+  invokeAndTransfer: invokeAndTransfer$3,
+  set: set$3$1
+} = create$9(RendererWorker$1);
+const RendererWorker = {
+  __proto__: null,
+  invoke: invoke$3$1,
+  invokeAndTransfer: invokeAndTransfer$3,
+  set: set$3$1
+};
+const {
+  invoke: invoke$9,
+  set: set$9
+} = create$9(MarkdownWorker$1);
+const SyntaxHighlightingWorker = {
+  __proto__: null,
+  invoke: invoke$9,
+  set: set$9
+};
+
+const {
+  set: set$8,
+  invoke: invoke$7,
+  invokeAndTransfer
+} = RendererWorker;
+
+// TODO add tests for this
+const activateByEvent = async event => {
+  await invoke$7('ExtensionHostManagement.activateByEvent', event);
+};
+
+const codeGeneratorAccept = state => {
+  // TODO close code generator widget
+  return state;
+};
 
 const getPortTuple = () => {
   const {
@@ -1048,15 +1161,15 @@ const getPortTuple = () => {
 
 const ModuleWorkerAndWorkaroundForChromeDevtoolsBug = 6;
 
-const launchColorPickerWorker = async () => {
-  const name = 'Color Picker Worker';
+const launchWorker = async (name, url) => {
   const {
     port1,
     port2
   } = getPortTuple();
+  // @ts-ignore
   await invokeAndTransfer('IpcParent.create', {
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    url: 'colorPickerWorkerMain.js',
+    url,
     name: name,
     raw: true,
     port: port1
@@ -1070,15 +1183,21 @@ const launchColorPickerWorker = async () => {
   return rpc;
 };
 
+const launchColorPickerWorker = async () => {
+  const name = 'Color Picker Worker';
+  const url = 'colorPickerWorkerMain.js';
+  return launchWorker(name, url);
+};
+
 let workerPromise$3;
-const getOrCreate$4 = () => {
+const getOrCreate$5 = () => {
   if (!workerPromise$3) {
     workerPromise$3 = launchColorPickerWorker();
   }
   return workerPromise$3;
 };
 const invoke$6 = async (method, ...params) => {
-  const worker = await getOrCreate$4();
+  const worker = await getOrCreate$5();
   return await worker.invoke(method, ...params);
 };
 
@@ -1118,19 +1237,19 @@ const LineComment = 'lineComment';
 const ToggleBlockComment$1 = 'toggleBlockComment';
 
 const map$1 = Object.create(null);
-const set$5 = (id, widget) => {
+const set$7 = (id, widget) => {
   map$1[id] = widget;
 };
 const get$5 = id => {
   return map$1[id];
 };
 
-const getModule$2 = id => {
+const getModule = id => {
   return get$5(id);
 };
 
 const applyWidgetChange = async (editor, widget, changes) => {
-  const module = getModule$2(widget.id);
+  const module = getModule(widget.id);
   if (changes.length === 1 && changes[0].origin === EditorType && module.handleEditorType) {
     const newState = await module.handleEditorType(widget.newState);
     return {
@@ -1168,7 +1287,7 @@ const get$4 = id => {
   number(id);
   return editors[id];
 };
-const set$4 = (id, oldEditor, newEditor) => {
+const set$6 = (id, oldEditor, newEditor) => {
   object(oldEditor);
   object(newEditor);
   editors[id] = {
@@ -1498,7 +1617,7 @@ const createMeasureContext = () => {
 const state$8 = {
   ctx: undefined
 };
-const getOrCreate$3 = createCtx => {
+const getOrCreate$4 = createCtx => {
   if (state$8.ctx) {
     return state$8.ctx;
   }
@@ -1507,7 +1626,7 @@ const getOrCreate$3 = createCtx => {
 };
 
 const getContext = () => {
-  const ctx = getOrCreate$3(createMeasureContext);
+  const ctx = getOrCreate$4(createMeasureContext);
   return ctx;
 };
 
@@ -1908,7 +2027,7 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
     invalidStartIndex,
     autoClosingRanges
   };
-  set$4(editor.uid, editor, newEditor);
+  set$6(editor.uid, editor, newEditor);
   const newWidgets = await applyWidgetChanges(newEditor, changes);
   const newEditor2 = {
     ...newEditor,
@@ -1979,336 +2098,58 @@ const hasSelection = editor => {
   // TODO editor.selections should always be defined
   return editor.selections && editor.selections.length > 0;
 };
-const setBounds = (editor, x, y, width, height, columnWidth) => {
-  const {
-    itemHeight
-  } = editor;
-  const numberOfVisibleLines = Math.floor(height / itemHeight);
-  const total = editor.lines.length;
-  const maxLineY = Math.min(numberOfVisibleLines, total);
-  const finalY = Math.max(total - numberOfVisibleLines, 0);
-  const finalDeltaY = finalY * itemHeight;
-  return {
-    ...editor,
-    x,
-    y,
-    width,
-    height,
-    columnWidth,
-    numberOfVisibleLines,
-    maxLineY,
-    finalY,
-    finalDeltaY
-  };
-};
-const setText = (editor, text) => {
-  const lines = splitLines(text);
-  const {
-    itemHeight,
-    numberOfVisibleLines,
-    minimumSliderSize
-  } = editor;
-  const total = lines.length;
-  const maxLineY = Math.min(numberOfVisibleLines, total);
-  const finalY = Math.max(total - numberOfVisibleLines, 0);
-  const finalDeltaY = finalY * itemHeight;
-  const contentHeight = lines.length * editor.rowHeight;
-  const scrollBarHeight = getScrollBarSize(editor.height, contentHeight, minimumSliderSize);
-  return {
-    ...editor,
-    lines,
-    maxLineY,
-    finalY,
-    finalDeltaY,
-    scrollBarHeight
-  };
-};
-
-const HoverExecute = 'ExtensionHostHover.execute';
-const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompletionProvider';
-const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
-
-const requiresSocket = () => {
-  return false;
-};
-const preparePrettyError = error => {
-  return error;
-};
-const logError$1 = error => {
-  // handled in renderer worker
-};
-const handleMessage = async event => {
-  return handleJsonRpcMessage(event.target, event.data, execute$1, resolve, preparePrettyError, logError$1, requiresSocket);
-};
-
-const handleIpc = ipc => {
-  if ('addEventListener' in ipc) {
-    ipc.addEventListener('message', handleMessage);
-  } else {
-    // deprecated
-    ipc.onmessage = handleMessage;
-  }
-};
-
-const RendererProcess = 9;
-const ExtensionHostWorker = 10;
-const SyntaxHighlightingWorker = 11;
-
-// @ts-ignore
-const getData = event => {
-  return event.data;
-};
-
-class IpcError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'IpcError';
-  }
-}
-
-const sendMessagePortToExtensionHostWorker = async port => {
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, 'HandleMessagePort.handleMessagePort');
-};
-const sendMessagePortToExtensionHostWorker2 = async (port, initialCommand, rpcId) => {
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, initialCommand, rpcId);
-};
-
-const withResolvers = () => {
-  let _resolve;
-  const promise = new Promise(resolve => {
-    _resolve = resolve;
-  });
-  return {
-    resolve: _resolve,
-    promise
-  };
-};
-
-const waitForFirstMessage = async port => {
-  const {
-    resolve,
-    promise
-  } = withResolvers();
-  const cleanup = value => {
-    port.onmessage = null;
-    resolve(value);
-  };
-  const handleMessage = event => {
-    cleanup(event);
-  };
-  port.onmessage = handleMessage;
-  const event = await promise;
-  return event;
-};
-
-const create$c = async () => {
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  await sendMessagePortToExtensionHostWorker(port1);
-  const event = await waitForFirstMessage(port2);
-  if (event.data !== 'ready') {
-    throw new IpcError('unexpected first message');
-  }
-  return port2;
-};
-const wrap$2 = port => {
-  return {
-    port,
-    /**
-     * @type {any}
-     */
-    listener: undefined,
-    get onmessage() {
-      return this.listener;
-    },
-    set onmessage(listener) {
-      this.listener = listener;
-      const wrappedListener = event => {
-        const data = getData(event);
-        // @ts-ignore
-        listener({
-          target: this,
-          data
-        });
-      };
-      this.port.onmessage = wrappedListener;
-    },
-    send(message) {
-      this.port.postMessage(message);
-    },
-    sendAndTransfer(message, transfer) {
-      this.port.postMessage(message, transfer);
-    }
-  };
-};
-
-const IpcParentWithExtensionHostWorker = {
-  __proto__: null,
-  create: create$c,
-  wrap: wrap$2
-};
-
-const sendMessagePortToRendererProcess = async port => {
-  await invokeAndTransfer('SendMessagePortToRendererProcess.sendMessagePortToRendererProcess', port, 'HandleMessagePort.handleMessagePort');
-};
-
-const create$b = async () => {
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  await sendMessagePortToRendererProcess(port1);
-  const event = await waitForFirstMessage(port2);
-  if (event.data !== 'ready') {
-    throw new IpcError('unexpected first message');
-  }
-  return port2;
-};
-const wrap$1 = port => {
-  return {
-    port,
-    /**
-     * @type {any}
-     */
-    listener: undefined,
-    get onmessage() {
-      return this.listener;
-    },
-    set onmessage(listener) {
-      this.listener = listener;
-      const wrappedListener = event => {
-        const data = getData(event);
-        // @ts-ignore
-        listener({
-          target: this,
-          data
-        });
-      };
-      this.port.onmessage = wrappedListener;
-    },
-    send(message) {
-      this.port.postMessage(message);
-    },
-    sendAndTransfer(message, transfer) {
-      this.port.postMessage(message, transfer);
-    }
-  };
-};
-
-const IpcParentWithRendererProcess = {
-  __proto__: null,
-  create: create$b,
-  wrap: wrap$1
-};
-
-const sendMessagePortToSyntaxHighlightingWorker = async port => {
-  await invokeAndTransfer('SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
-};
-
-const create$a = async () => {
+const setBounds = (editor, x, y, width, height, columnWidth) => {
   const {
-    port1,
-    port2
-  } = getPortTuple();
-  await sendMessagePortToSyntaxHighlightingWorker(port1);
-  const event = await waitForFirstMessage(port2);
-  if (event.data !== 'ready') {
-    throw new IpcError('unexpected first message');
-  }
-  return port2;
-};
-const wrap = port => {
+    itemHeight
+  } = editor;
+  const numberOfVisibleLines = Math.floor(height / itemHeight);
+  const total = editor.lines.length;
+  const maxLineY = Math.min(numberOfVisibleLines, total);
+  const finalY = Math.max(total - numberOfVisibleLines, 0);
+  const finalDeltaY = finalY * itemHeight;
   return {
-    port,
-    /**
-     * @type {any}
-     */
-    listener: undefined,
-    get onmessage() {
-      return this.listener;
-    },
-    set onmessage(listener) {
-      this.listener = listener;
-      const wrappedListener = event => {
-        const data = getData(event);
-        // @ts-ignore
-        listener({
-          target: this,
-          data
-        });
-      };
-      this.port.onmessage = wrappedListener;
-    },
-    send(message) {
-      this.port.postMessage(message);
-    },
-    sendAndTransfer(message, transfer) {
-      this.port.postMessage(message, transfer);
-    }
+    ...editor,
+    x,
+    y,
+    width,
+    height,
+    columnWidth,
+    numberOfVisibleLines,
+    maxLineY,
+    finalY,
+    finalDeltaY
   };
 };
-
-const IpcParentWithSyntaxHighlightingWorker = {
-  __proto__: null,
-  create: create$a,
-  wrap
-};
-
-const getModule$1 = method => {
-  switch (method) {
-    case RendererProcess:
-      return IpcParentWithRendererProcess;
-    case ExtensionHostWorker:
-      return IpcParentWithExtensionHostWorker;
-    case SyntaxHighlightingWorker:
-      return IpcParentWithSyntaxHighlightingWorker;
-    default:
-      throw new Error('unexpected ipc type');
-  }
-};
-
-const create$9 = async ({
-  method,
-  ...options
-}) => {
-  const module = getModule$1(method);
-  // @ts-ignore
-  const rawIpc = await module.create(options);
-  // @ts-ignore
-  if (options.raw) {
-    return rawIpc;
-  }
-  const ipc = module.wrap(rawIpc);
-  return ipc;
-};
-
-const createRpc = method => {
-  let _ipc;
-  const listen = async () => {
-    const ipc = await create$9({
-      method
-    });
-    handleIpc(ipc);
-    _ipc = ipc;
-  };
-  const invoke = async (method, ...params) => {
-    return invoke$9(_ipc, method, ...params);
-  };
-  const invokeAndTransfer = async (method, ...params) => {
-    return invokeAndTransfer$2(_ipc, method, ...params);
-  };
+const setText = (editor, text) => {
+  const lines = splitLines(text);
+  const {
+    itemHeight,
+    numberOfVisibleLines,
+    minimumSliderSize
+  } = editor;
+  const total = lines.length;
+  const maxLineY = Math.min(numberOfVisibleLines, total);
+  const finalY = Math.max(total - numberOfVisibleLines, 0);
+  const finalDeltaY = finalY * itemHeight;
+  const contentHeight = lines.length * editor.rowHeight;
+  const scrollBarHeight = getScrollBarSize(editor.height, contentHeight, minimumSliderSize);
   return {
-    listen,
-    invoke,
-    invokeAndTransfer
+    ...editor,
+    lines,
+    maxLineY,
+    finalY,
+    finalDeltaY,
+    scrollBarHeight
   };
 };
 
+const HoverExecute = 'ExtensionHostHover.execute';
+const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompletionProvider';
+const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
+
 const {
-  listen: listen$4,
-  invoke: invoke$5} = createRpc(ExtensionHostWorker);
+  set: set$5,
+  invoke: invoke$5} = ExtensionHost;
 
 const ColorPicker$1 = 41;
 const EditorCompletion = 9;
@@ -2404,6 +2245,7 @@ const updateDiagnostics = async newState => {
 
     // TODO don't really need text document sync response
     // could perhaps save a lot of messages by using send instead of invoke
+    // @ts-ignore
     await invoke$5(TextDocumentSyncFull, newState.uri, newState.id, newState.languageId, content);
     const diagnostics = await executeDiagnosticProvider(newState);
     const latest = get$4(newState.id);
@@ -2416,7 +2258,8 @@ const updateDiagnostics = async newState => {
       diagnostics,
       decorations
     };
-    set$4(newState.id, latest.oldState, newEditor);
+    set$6(newState.id, latest.oldState, newEditor);
+    // @ts-ignore
     await invoke$7('Editor.rerender', newState.id);
     return newEditor;
   } catch (error) {
@@ -2450,7 +2293,9 @@ const emptyEditor = {
   undoStack: [],
   lineCache: [],
   selections: new Uint32Array(),
-  diagnostics: []
+  diagnostics: [],
+  highlightedLine: -1,
+  debugEnabled: false
 };
 const createEditor = async ({
   id,
@@ -2550,7 +2395,8 @@ const createEditor = async ({
     ...newEditor3,
     focused: true
   };
-  set$4(id, emptyEditor, newEditor4);
+  set$6(id, emptyEditor, newEditor4);
+  // @ts-ignore
   await invoke$5(TextDocumentSyncFull, uri, id, languageId, content);
   if (diagnosticsEnabled) {
     updateDiagnostics(newEditor4);
@@ -2620,7 +2466,7 @@ const applyEdit = async (editor, changes) => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-const handleBlur = editor => {
+const handleBlur$1 = editor => {
   if (editor.focusKey !== Empty) {
     return editor;
   }
@@ -2862,6 +2708,7 @@ const editorShowMessage = async (editor, rowIndex, columnIndex, message, isError
   const x$1 = x(editor, rowIndex, columnIndex);
   const y$1 = y(editor, rowIndex);
   const displayErrorMessage = message;
+  // @ts-ignore
   await invoke$7('Editor.showOverlayMessage', editor, 'Viewlet.send', editor.uid, 'showOverlayMessage', x$1, y$1, displayErrorMessage);
   if (!isError) {
     const handleTimeout = () => {
@@ -2918,6 +2765,7 @@ const braceCompletion = async (editor, text) => {
   try {
     // @ts-ignore
     const offset = offsetAt(editor, editor.cursor);
+    // @ts-ignore
     const result = await invoke$7('ExtensionHostBraceCompletion.executeBraceCompletionProvider', editor, offset, text);
     if (result) {
       const closingBrace = getMatchingClosingBrace$1(text);
@@ -3011,35 +2859,19 @@ const closeFind = editor => {
 
 const launchRenameWorker = async () => {
   const name = 'Rename Worker';
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  await invokeAndTransfer('IpcParent.create', {
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    url: 'renameWorkerMain.js',
-    name: name,
-    raw: true,
-    port: port1
-  });
-  const rpc = await MessagePortRpcParent.create({
-    commandMap: {},
-    messagePort: port2,
-    isMessagePortOpen: true
-  });
-  port2.start();
-  return rpc;
+  const url = 'renameWorkerMain.js';
+  return launchWorker(name, url);
 };
 
 let workerPromise$2;
-const getOrCreate$2 = () => {
+const getOrCreate$3 = () => {
   if (!workerPromise$2) {
     workerPromise$2 = launchRenameWorker();
   }
   return workerPromise$2;
 };
 const invoke$4 = async (method, ...params) => {
-  const worker = await getOrCreate$2();
+  const worker = await getOrCreate$3();
   return await worker.invoke(method, ...params);
 };
 
@@ -3093,6 +2925,7 @@ const hasWidget = (widgets, id) => {
 };
 
 const setAdditionalFocus = async focusKey => {
+  // @ts-ignore
   await invoke$7('Focus.setAdditionalFocus', focusKey);
 };
 
@@ -3106,6 +2939,7 @@ const unsetAdditionalFocus = async focusKey => {
   if (!focusKey) {
     return;
   }
+  // @ts-ignore
   await invoke$7('Focus.removeAdditionalFocus', focusKey);
 };
 
@@ -3861,6 +3695,7 @@ const deleteWordRight = editor => {
 };
 
 const findAllReferences = async editor => {
+  // @ts-ignore
   await invoke$7('SideBar.show', 'References', /* focus */true);
   return editor;
 };
@@ -3991,6 +3826,7 @@ const getWordBefore = (editor, rowIndex, columnIndex) => {
 
 // @ts-ignore
 const getDefinition = async (editor, offset) => {
+  // @ts-ignore
   const definition = await invoke$7('ExtensionHostDefinition.executeDefinitionProvider', editor, offset);
   return definition;
 };
@@ -4251,6 +4087,7 @@ const getNoLocationFoundMessage = info => {
 };
 
 const getTypeDefinition = async (editor, offset) => {
+  // @ts-ignore
   const definition = await invoke$7('ExtensionHostTypeDefinition.executeTypeDefinitionProvider', editor, offset);
   return definition;
 };
@@ -4326,7 +4163,7 @@ const handleDoubleClick = (editor, modifier, x, y) => {
 };
 
 const WhenExpressionEditorText = 12;
-const handleFocus = editor => {
+const handleFocus$1 = editor => {
   // TODO make change events functional,
   // when rendering, send focus changes to renderer worker
   invoke$7('Focus.setFocus', WhenExpressionEditorText);
@@ -4492,7 +4329,7 @@ const state$4 = {
 const get$3 = () => {
   return state$4;
 };
-const set$3 = (editor, timeout, x, y) => {
+const set$4 = (editor, timeout, x, y) => {
   state$4.editor = editor;
   state$4.timeout = timeout;
   state$4.x = x;
@@ -4534,7 +4371,7 @@ const handleMouseMove = (editor, x, y) => {
     clearTimeout(oldState.timeout);
   }
   const timeout = setTimeout(onHoverIdle, hoverDelay);
-  set$3(editor, timeout, x, y);
+  set$4(editor, timeout, x, y);
   return editor;
 };
 
@@ -4987,6 +4824,7 @@ const indentMore = editor => {
 };
 
 const getLanguageConfiguration = async editor => {
+  // @ts-ignore
   return invoke$7('Languages.getLanguageConfiguration', {
     uri: editor.uri,
     languageId: editor.languageId
@@ -5331,36 +5169,19 @@ const create$4 = () => {
 
 const launchCompletionWorker = async () => {
   const name = 'Completion Worker';
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  await invokeAndTransfer('IpcParent.create', {
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    url: 'completionWorkerMain.js',
-    name: name,
-    raw: true,
-    port: port1
-  });
-  const rpc = await MessagePortRpcParent.create({
-    commandMap: {},
-    messagePort: port2,
-    isMessagePortOpen: true
-  });
-  port2.start();
-  await rpc.invoke('Completions.initialize');
-  return rpc;
+  const url = 'completionWorkerMain.js';
+  return launchWorker(name, url);
 };
 
 let workerPromise$1;
-const getOrCreate$1 = () => {
+const getOrCreate$2 = () => {
   if (!workerPromise$1) {
     workerPromise$1 = launchCompletionWorker();
   }
   return workerPromise$1;
 };
 const invoke$3 = async (method, ...params) => {
-  const worker = await getOrCreate$1();
+  const worker = await getOrCreate$2();
   return await worker.invoke(method, ...params);
 };
 
@@ -5418,35 +5239,19 @@ const create$3 = () => {
 
 const launchFindWidgetWorker = async () => {
   const name = 'Find Widget Worker';
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  await invokeAndTransfer('IpcParent.create', {
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    url: 'findWidgetWorkerMain.js',
-    name: name,
-    raw: true,
-    port: port1
-  });
-  const rpc = await MessagePortRpcParent.create({
-    commandMap: {},
-    messagePort: port2,
-    isMessagePortOpen: true
-  });
-  port2.start();
-  return rpc;
+  const url = 'findWidgetWorkerMain.js';
+  return launchWorker(name, url);
 };
 
 let workerPromise;
-const getOrCreate = () => {
+const getOrCreate$1 = () => {
   if (!workerPromise) {
     workerPromise = launchFindWidgetWorker();
   }
   return workerPromise;
 };
 const invoke$2 = async (method, ...params) => {
-  const worker = await getOrCreate();
+  const worker = await getOrCreate$1();
   return await worker.invoke(method, ...params);
 };
 
@@ -5481,14 +5286,6 @@ const loadContent$1 = async (state, parentUid) => {
     commands
   };
 };
-const close$1 = async state => {
-  // TODO
-  // await Viewlet.closeWidget(uid)
-  return {
-    ...state,
-    disposed: true
-  };
-};
 
 const newStateGenerator$2 = (state, parentUid) => {
   return loadContent$1(state, parentUid);
@@ -5600,6 +5397,7 @@ const pasteText = (editor, text) => {
 };
 
 const paste = async editor => {
+  // @ts-ignore
   const text = await invoke$7('ClipBoard.readText');
   string(text);
   return pasteText(editor, text);
@@ -6048,6 +5846,7 @@ const selectInsideString = editor => {
 // import * as ExtensionHostSelection from '../ExtensionHost/ExtensionHostSelection.ts'
 
 const getNewSelections = async (editor, selections) => {
+  // @ts-ignore
   const newSelections = await invoke$7('ExtensionHostSelection.executeGrowSelection', editor, selections);
   if (newSelections.length === 0) {
     return selections;
@@ -6301,9 +6100,8 @@ const getEnabled$1 = () => {
 };
 
 const {
-  listen: listen$3,
-  invoke: invoke$1
-} = createRpc(SyntaxHighlightingWorker);
+  set: set$3,
+  invoke: invoke$1} = SyntaxHighlightingWorker;
 
 /**
  * @enum number
@@ -6372,6 +6170,7 @@ const loadTokenizer = async (languageId, tokenizePath) => {
     return;
   }
   if (getEnabled$1()) {
+    // @ts-ignore
     const tokenMap = await invoke$1('Tokenizer.load', languageId, tokenizePath);
     set$1(languageId, tokenMap);
     return;
@@ -6529,20 +6328,10 @@ const getHover = async (editor, offset) => {
   return hover;
 };
 
-let _ipc;
-const listen$2 = async () => {
-  const ipc = await create$9({
-    method: RendererProcess
-  });
-  handleIpc(ipc);
-  _ipc = ipc;
-};
-const invoke = async (method, ...args) => {
-  return invoke$9(_ipc, method, ...args);
-};
-
 const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
-  return invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width);
+  // @ts-ignore
+  // return RendererProcess.invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width)
+  return 100;
 };
 
 const deepCopy = value => {
@@ -6660,16 +6449,6 @@ const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
   return matching;
 };
 const fallbackDisplayStringLanguageId = 'typescript'; // TODO remove this
-
-const hoverDocumentationFontSize = 15;
-const hoverDocumentationFontFamily = 'Fira Code';
-const hoverDocumentationLineHeight = '1.33333';
-const hoverBorderLeft = 1;
-const hoverBorderRight = 1;
-const hoverPaddingLeft = 8;
-const hoverPaddingRight = 8;
-const hovverFullWidth = 400;
-const hoverDocumentationWidth = hovverFullWidth - hoverPaddingLeft - hoverPaddingRight - hoverBorderLeft - hoverBorderRight;
 const getHoverPositionXy = (editor, rowIndex, wordStart, documentationHeight) => {
   const x$1 = x(editor, rowIndex, wordStart);
   const y$1 = editor.height - y(editor, rowIndex) + editor.y + 40;
@@ -6703,7 +6482,7 @@ const getEditorHoverInfo = async (editorUid, position) => {
   const lineInfos = await tokenizeCodeBlock(displayString, displayStringLanguageId || fallbackDisplayStringLanguageId, tokenizerPath);
   const wordPart = getWordBefore(editor, rowIndex, columnIndex);
   const wordStart = columnIndex - wordPart.length;
-  await measureTextBlockHeight(documentation, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, hoverDocumentationWidth);
+  await measureTextBlockHeight();
   const {
     x,
     y
@@ -6759,6 +6538,7 @@ const showHover = async state => {
 
 // TODO ask extension host worker instead
 const getEditorSourceActions = async () => {
+  // @ts-ignore
   const sourceActions = await invoke$7('GetEditorSourceActions.getEditorSourceActions');
   return sourceActions;
 };
@@ -7419,6 +7199,7 @@ const typeWithAutoClosingQuote = (editor, text) => {
 
 const typeWithAutoClosingTag = async (editor, text) => {
   const offset = offsetAt(editor, editor.selections[0], editor.selections[1]);
+  // @ts-ignore
   const result = await invoke$7('ExtensionHostClosingTagCompletion.executeClosingTagProvider', editor, offset, text);
   if (!result) {
     const changes = editorReplaceSelections(editor, [text], EditorType);
@@ -7678,23 +7459,19 @@ const addWidget$1 = (widget, id, render) => {
   return allCommands;
 };
 
-const AppendToBody = 'Viewlet.appendToBody';
-const Focus = 'focus';
-const RegisterEventListeners = 'Viewlet.registerEventListeners';
-const SetSelectionByName = 'Viewlet.setSelectionByName';
-const SetValueByName = 'Viewlet.setValueByName';
-const SetFocusContext = 'Viewlet.setFocusContext';
-const SetBounds = 'setBounds';
-const SetBounds2 = 'Viewlet.setBounds';
-const SetCss = 'Viewlet.setCss';
-const SetDom2 = 'Viewlet.setDom2';
-const SetUid = 'Viewlet.setUid';
-
-const renderFull$4 = (oldState, newState) => {
-  const commands = [...newState.commands];
-  // @ts-ignore
-  newState.commands = [];
-  return commands;
+const getWidgetInvoke = widgetId => {
+  switch (widgetId) {
+    case ColorPicker:
+      return invoke$6;
+    case Completion:
+      return invoke$3;
+    case Find:
+      return invoke$2;
+    case Rename:
+      return invoke$4;
+    default:
+      return undefined;
+  }
 };
 
 const updateWidget = (editor, widgetId, newState) => {
@@ -7720,29 +7497,7 @@ const updateWidget = (editor, widgetId, newState) => {
   };
 };
 
-const render$c = widget => {
-  const commands = renderFull$4(widget.oldState, widget.newState);
-  const wrappedCommands = [];
-  const {
-    uid
-  } = widget.newState;
-  for (const command of commands) {
-    if (command[0] === SetDom2 || command[0] === SetCss || command[0] === AppendToBody || command[0] === SetBounds2 || command[0] === RegisterEventListeners || command[0] === SetSelectionByName || command[0] === SetValueByName || command[0] === SetFocusContext || command[0] === SetUid || command[0] === 'Viewlet.focusSelector') {
-      wrappedCommands.push(command);
-    } else {
-      wrappedCommands.push(['Viewlet.send', uid, ...command]);
-    }
-  }
-  return wrappedCommands;
-};
-const add$7 = widget => {
-  return addWidget$1(widget, 'EditorRename', render$c);
-};
-const remove$7 = widget => {
-  return [['Viewlet.dispose', widget.newState.uid]];
-};
-const createFn = key => {
-  const widgetId = Completion;
+const createFn = (key, name, widgetId) => {
   const isWidget = widget => {
     return widget.id === widgetId;
   };
@@ -7754,9 +7509,10 @@ const createFn = key => {
     const {
       uid
     } = state;
-    await invoke$3(`Completions.${key}`, uid, ...args);
-    const diff = await invoke$3('Completions.diff2', uid);
-    const commands = await invoke$3('Completions.render2', uid, diff);
+    const invoke = getWidgetInvoke(widgetId);
+    await invoke(`${name}.${key}`, uid, ...args);
+    const diff = await invoke(`${name}.diff2`, uid);
+    const commands = await invoke(`${name}.render2`, uid, diff);
     const newState = {
       ...state,
       commands
@@ -7767,19 +7523,60 @@ const createFn = key => {
   };
   return fn;
 };
-const createFns = keys => {
+const createFns = (keys, name, widgetId) => {
   const fns = Object.create(null);
   for (const key of keys) {
-    fns[key] = createFn(key);
+    fns[key] = createFn(key, name, widgetId);
   }
   return fns;
 };
+
+const AppendToBody = 'Viewlet.appendToBody';
+const Focus = 'focus';
+const RegisterEventListeners = 'Viewlet.registerEventListeners';
+const SetSelectionByName = 'Viewlet.setSelectionByName';
+const SetValueByName = 'Viewlet.setValueByName';
+const SetFocusContext = 'Viewlet.setFocusContext';
+const SetBounds = 'setBounds';
+const SetBounds2 = 'Viewlet.setBounds';
+const SetCss = 'Viewlet.setCss';
+const SetDom2 = 'Viewlet.setDom2';
+const SetUid = 'Viewlet.setUid';
+
+const renderFull$4 = (oldState, newState) => {
+  const commands = [...newState.commands];
+  // @ts-ignore
+  newState.commands = [];
+  return commands;
+};
+
+const render$c = widget => {
+  const commands = renderFull$4(widget.oldState, widget.newState);
+  const wrappedCommands = [];
+  const {
+    uid
+  } = widget.newState;
+  for (const command of commands) {
+    if (command[0] === SetDom2 || command[0] === SetCss || command[0] === AppendToBody || command[0] === SetBounds2 || command[0] === RegisterEventListeners || command[0] === SetSelectionByName || command[0] === SetValueByName || command[0] === SetFocusContext || command[0] === SetUid || command[0] === 'Viewlet.focusSelector') {
+      wrappedCommands.push(command);
+    } else {
+      wrappedCommands.push(['Viewlet.send', uid, ...command]);
+    }
+  }
+  return wrappedCommands;
+};
+const add$7 = widget => {
+  return addWidget$1(widget, 'EditorRename', render$c);
+};
+const remove$7 = widget => {
+  return [['Viewlet.dispose', widget.newState.uid]];
+};
 const {
   focusFirst,
   focusIndex: focusIndex$1,
   focusLast,
-  focusNext: focusNext$1,
-  focusPrevious,
+  focusNext: focusNext$2,
+  focusPrevious: focusPrevious$1,
   handleEditorBlur,
   handleEditorClick,
   handleEditorDeleteLeft: handleEditorDeleteLeft$1,
@@ -7790,19 +7587,19 @@ const {
   toggleDetails,
   closeDetails,
   handleWheel,
-  close
-} = createFns(['handleEditorType', 'focusFirst', 'focusNext', 'focusPrevious', 'focusLast', 'handleEditorDeleteLeft', 'openDetails', 'focusIndex', 'handleEditorBlur', 'handleEditorClick', 'openDetails', 'selectCurrent', 'selectIndex', 'toggleDetails', 'closeDetails', 'handleWheel', 'close']);
+  close: close$1
+} = createFns(['handleEditorType', 'focusFirst', 'focusNext', 'focusPrevious', 'focusLast', 'handleEditorDeleteLeft', 'openDetails', 'focusIndex', 'handleEditorBlur', 'handleEditorClick', 'openDetails', 'selectCurrent', 'selectIndex', 'toggleDetails', 'closeDetails', 'handleWheel', 'close'], 'Completions', Completion);
 
 const EditorCompletionWidget = {
   __proto__: null,
   add: add$7,
-  close,
+  close: close$1,
   closeDetails,
   focusFirst,
   focusIndex: focusIndex$1,
   focusLast,
-  focusNext: focusNext$1,
-  focusPrevious,
+  focusNext: focusNext$2,
+  focusPrevious: focusPrevious$1,
   handleEditorBlur,
   handleEditorClick,
   handleEditorDeleteLeft: handleEditorDeleteLeft$1,
@@ -7816,6 +7613,80 @@ const EditorCompletionWidget = {
   toggleDetails
 };
 
+const renderFull$3 = (oldState, newState) => {
+  const commands = [...newState.commands];
+  // @ts-ignore
+  newState.commands = [];
+  return commands;
+};
+
+const render$b = widget => {
+  const commands = renderFull$3(widget.oldState, widget.newState);
+  const wrappedCommands = [];
+  const {
+    uid
+  } = widget.newState;
+  for (const command of commands) {
+    if (command[0] === SetDom2 || command[0] === SetCss || command[0] === AppendToBody || command[0] === SetBounds2 || command[0] === RegisterEventListeners || command[0] === SetSelectionByName || command[0] === SetValueByName || command[0] === SetFocusContext || command[0] === SetUid || command[0] === 'Viewlet.focusSelector') {
+      wrappedCommands.push(command);
+    } else {
+      wrappedCommands.push(['Viewlet.send', uid, ...command]);
+    }
+  }
+  return wrappedCommands;
+};
+const add$6 = widget => {
+  return addWidget$1(widget, 'FindWidget', render$b);
+};
+const remove$6 = widget => {
+  return [['Viewlet.dispose', widget.newState.uid]];
+};
+const {
+  close,
+  focusCloseButton,
+  focusFind,
+  focusNext: focusNext$1,
+  focusNextMatchButton,
+  focusPrevious,
+  focusPreviousMatchButton,
+  focusReplace,
+  focusReplaceAllButton,
+  focusReplaceButton,
+  focusToggleReplace,
+  handleBlur,
+  handleFocus,
+  handleInput,
+  handleReplaceFocus,
+  handleReplaceInput,
+  handleToggleReplaceFocus,
+  toggleReplace
+} = createFns(['close', 'focusCloseButton', 'focusFind', 'focusNext', 'focusNextMatchButton', 'focusPrevious', 'focusPreviousMatchButton', 'focusReplace', 'focusReplaceAllButton', 'focusReplaceButton', 'focusToggleReplace', 'handleBlur', 'handleFocus', 'handleInput', 'handleReplaceFocus', 'handleReplaceInput', 'handleToggleReplaceFocus', 'toggleReplace'], 'FindWidget', Find);
+
+const EditorFindWidget = {
+  __proto__: null,
+  add: add$6,
+  close,
+  focusCloseButton,
+  focusFind,
+  focusNext: focusNext$1,
+  focusNextMatchButton,
+  focusPrevious,
+  focusPreviousMatchButton,
+  focusReplace,
+  focusReplaceAllButton,
+  focusReplaceButton,
+  focusToggleReplace,
+  handleBlur,
+  handleFocus,
+  handleInput,
+  handleReplaceFocus,
+  handleReplaceInput,
+  handleToggleReplaceFocus,
+  remove: remove$6,
+  render: render$b,
+  toggleReplace
+};
+
 const loadContent = async (editorUid, state, position) => {
   const hoverInfo = await getEditorHoverInfo(editorUid, position);
   if (!hoverInfo) {
@@ -7865,6 +7736,7 @@ const CompletionDetailContent = 'CompletionDetailContent';
 const Diagnostic = 'Diagnostic';
 const EditorCursor = 'EditorCursor';
 const EditorRow = 'EditorRow';
+const EditorRowHighlighted = 'EditorRowHighlighted';
 const EditorSelection = 'EditorSelection';
 const EditorSourceActions = 'EditorSourceActions';
 const EditorSourceActionsList = 'EditorSourceActionsList';
@@ -8011,10 +7883,10 @@ const renderBounds$3 = {
     return [SetBounds, x, y, width, height];
   }
 };
-const render$b = [renderHoverDom, renderBounds$3];
+const render$a = [renderHoverDom, renderBounds$3];
 const renderHover = (oldState, newState) => {
   const commands = [];
-  for (const item of render$b) {
+  for (const item of render$a) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(item.apply(oldState, newState));
     }
@@ -8040,21 +7912,6 @@ const focusNext = state => {
   return focusIndex(state, nextIndex);
 };
 
-const getWidgetInvoke = widgetId => {
-  switch (widgetId) {
-    case ColorPicker:
-      return invoke$6;
-    case Completion:
-      return invoke$3;
-    case Find:
-      return invoke$2;
-    case Rename:
-      return invoke$4;
-    default:
-      return undefined;
-  }
-};
-
 const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...params) => {
   const invoke = getWidgetInvoke(widgetId);
   const actualMethod = method.slice(name.length + 1);
@@ -8156,6 +8013,14 @@ const getSelections2 = editorUid => {
   } = editor;
   return selections;
 };
+const setSelections2 = (editorUid, selections) => {
+  const editor = getEditor(editorUid);
+  const newEditor = {
+    ...editor,
+    selections
+  };
+  set$6(editorUid, editor, newEditor);
+};
 const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocus$1) => {
   const editor = getEditor(editorUid);
   const invoke = getWidgetInvoke(widgetId);
@@ -8173,7 +8038,7 @@ const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocu
     widgets: newWidgets,
     focused: true
   };
-  set$4(editorUid, editor, newEditor);
+  set$6(editorUid, editor, newEditor);
   await setFocus(FocusEditorText);
   if (unsetAdditionalFocus$1) {
     await unsetAdditionalFocus(unsetAdditionalFocus$1);
@@ -8185,7 +8050,7 @@ const closeFind2 = async editorUid => {
 const applyEdits2 = async (editorUid, edits) => {
   const editor = getEditor(editorUid);
   const newEditor = await applyEdit(editor, edits);
-  set$4(editorUid, editor, newEditor);
+  set$6(editorUid, editor, newEditor);
 };
 
 const pending = Object.create(null);
@@ -8311,6 +8176,10 @@ const getKeyBindings = () => {
     key: Enter,
     command: 'FindWidget.focusNext',
     when: FocusFindWidget
+  }, {
+    key: CtrlCmd | KeyF,
+    command: 'FindWidget.preventDefaultBrowserFind',
+    when: FocusFindWidget
   }, {
     key: Shift | F4,
     command: 'FindWidget.focusPrevious',
@@ -8733,6 +8602,16 @@ const handleBeforeInput = (editor, inputType, data) => {
   }
 };
 
+const handleMessagePort = async (port, rpcId) => {
+  const rpc = await PlainMessagePortRpcParent.create({
+    messagePort: port,
+    commandMap: {}
+  });
+  if (rpcId) {
+    set$c(rpcId, rpc);
+  }
+};
+
 const applyTabCompletion = (editor, result) => {
   return editorSnippet(editor, result);
 };
@@ -8746,6 +8625,68 @@ const handleTab = async editor => {
   return applyTabCompletion(editor, result);
 };
 
+const sendMessagePortToExtensionHostWorker2 = async (port, initialCommand, rpcId) => {
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, initialCommand, rpcId);
+};
+
+const createExtensionHostRpc = async () => {
+  try {
+    const {
+      port1,
+      port2
+    } = getPortTuple();
+    const initialCommand = 'HandleMessagePort.handleMessagePort2';
+    await sendMessagePortToExtensionHostWorker2(port2, initialCommand, RpcId.EditorWorker);
+    const rpc = await PlainMessagePortRpcParent.create({
+      commandMap: {},
+      messagePort: port1
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create extension host rpc`);
+  }
+};
+
+const initializeExtensionHost = async () => {
+  const extensionHostRpc = await createExtensionHostRpc();
+  set$5(extensionHostRpc);
+};
+
+const sendMessagePortToSyntaxHighlightingWorker = async () => {
+  try {
+    const {
+      port1,
+      port2
+    } = getPortTuple();
+    await invokeAndTransfer(
+    // @ts-ignore
+    'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port1, 'HandleMessagePort.handleMessagePort2');
+    return port2;
+  } catch {
+    const {
+      port1,
+      port2
+    } = getPortTuple();
+    await invokeAndTransfer(
+    // @ts-ignore
+    'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port1, 'HandleMessagePort.handleMessagePort');
+    return port2;
+  }
+};
+
+const createSyntaxHighlightingWorkerRpc = async () => {
+  try {
+    const port = await sendMessagePortToSyntaxHighlightingWorker();
+    const rpc = await PlainMessagePortRpcParent.create({
+      commandMap: {},
+      messagePort: port
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create syntax highlighting worker rpc`);
+  }
+};
+
 let enabled = false;
 const setEnabled = value => {
   enabled = value;
@@ -8754,16 +8695,19 @@ const getEnabled = () => {
   return enabled;
 };
 
-const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
-  await listen$2();
+const initializeSyntaxHighlighting = async (syntaxHighlightingEnabled, syncIncremental) => {
   if (syntaxHighlightingEnabled) {
     setEnabled$1(true);
-    await listen$3();
+    const syntaxRpc = await createSyntaxHighlightingWorkerRpc();
+    set$3(syntaxRpc);
   }
   if (syncIncremental) {
     setEnabled(true);
   }
-  await listen$4();
+};
+
+const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
+  await Promise.all([initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental), initializeExtensionHost()]);
 };
 
 // TODO move cursor
@@ -8821,6 +8765,26 @@ const moveLineUp = editor => {
   return editor;
 };
 
+const getOrCreate = async () => {
+  return {};
+};
+const invoke = async (method, ...params) => {
+  const worker = await getOrCreate();
+  return worker.invoke(method, ...params);
+};
+
+const getHighlightedLine = async editor => {
+  if (!editor.debugEnabled) {
+    return -1;
+  }
+  try {
+    return await invoke('Debug.getHighlightedLine', editor.uid);
+  } catch (error) {
+    console.error('Failed to get highlighted line:', error);
+    return -1;
+  }
+};
+
 const Link$1 = 'Link';
 const Function = 'Function';
 const Parameter = 'Parameter';
@@ -9052,9 +9016,12 @@ const getTokensViewport2 = async (editor, startLineIndex, endLineIndex, syncIncr
         languageId,
         invalidStartIndex
       };
-      return invoke$1('GetTokensViewport.getTokensViewport', slimEditor, startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
+      return invoke$1('GetTokensViewport.getTokensViewport', slimEditor,
+      // @ts-ignore
+      startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
     }
     // TODO only send needed lines of text
+    // @ts-ignore
     return invoke$1('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
   }
   return getTokensViewport(editor, startLineIndex, endLineIndex);
@@ -9283,6 +9250,7 @@ const getVisible = async (editor, syncIncremental) => {
     charWidth
   } = editor;
   const maxLineY = Math.min(minLineY + numberOfVisibleLines, lines.length);
+  // @ts-ignore
   const {
     tokens,
     tokenizersToLoad,
@@ -9371,14 +9339,18 @@ const getEditorGutterVirtualDom = gutterInfos => {
   return dom;
 };
 
-const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true) => {
+const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1) => {
   const dom = [];
   for (let i = 0; i < textInfos.length; i++) {
     const textInfo = textInfos[i];
     const difference = differences[i];
+    let className = EditorRow;
+    if (i === highlightedLine) {
+      className += ' ' + EditorRowHighlighted;
+    }
     dom.push({
       type: Div,
-      className: EditorRow,
+      className,
       translate: px(difference),
       childCount: textInfo.length / 2
     });
@@ -9411,7 +9383,9 @@ const getIncrementalEdits = async (oldState, newState) => {
       } = newState;
       const oldLine = oldState.lines[rowIndex];
       const newLine = lines[rowIndex];
-      const incrementalEdits = await invoke$1('TokenizeIncremental.tokenizeIncremental', newState.uid, newState.languageId, oldLine, newLine, rowIndex, newState.minLineY);
+      const incrementalEdits = await invoke$1('TokenizeIncremental.tokenizeIncremental', newState.uid,
+      // @ts-ignore
+      newState.languageId, oldLine, newLine, rowIndex, newState.minLineY);
       if (incrementalEdits && incrementalEdits.length === 1) {
         return incrementalEdits;
       }
@@ -9463,7 +9437,7 @@ const removeWidget$1 = widget => {
 
 const renderLines = {
   isEqual(oldState, newState) {
-    return oldState.lines === newState.lines && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.deltaX === newState.deltaX && oldState.width === newState.width;
+    return oldState.lines === newState.lines && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.debugEnabled === newState.debugEnabled;
   },
   async apply(oldState, newState) {
     const incrementalEdits = await getIncrementalEdits(oldState, newState);
@@ -9476,7 +9450,8 @@ const renderLines = {
       differences
     } = await getVisible(newState, syncIncremental);
     newState.differences = differences;
-    const dom = getEditorRowsVirtualDom(textInfos, differences);
+    const highlightedLine = await getHighlightedLine(newState);
+    const dom = getEditorRowsVirtualDom(textInfos, differences, true, highlightedLine);
     return [/* method */'setText', dom];
   }
 };
@@ -9613,7 +9588,7 @@ const renderWidgets = {
   },
   multiple: true
 };
-const render$a = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets];
+const render$9 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets];
 const renderEditor = async id => {
   const instance = get$4(id);
   if (!instance) {
@@ -9624,8 +9599,8 @@ const renderEditor = async id => {
     newState
   } = instance;
   const commands = [];
-  set$4(id, newState, newState);
-  for (const item of render$a) {
+  set$6(id, newState, newState);
+  for (const item of render$9) {
     if (!item.isEqual(oldState, newState)) {
       const result = await item.apply(oldState, newState);
       // @ts-ignore
@@ -9676,6 +9651,14 @@ const renderEventListeners = () => {
   }];
 };
 
+const setDebugEnabled = (state, enabled) => {
+  return state;
+};
+
+const updateDebugInfo = info => {
+  // TODO query all editors and update them with debug information if needed, then rerender them
+};
+
 const editorDiagnosticEffect = {
   isActive(oldEditor, newEditor) {
     // TODO avoid slow comparison
@@ -9687,13 +9670,12 @@ const editorDiagnosticEffect = {
   }
 };
 
-const keep = [
+const keep = ['ActivateByEvent.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.getSelections2', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
 // 'ColorPicker.handleSliderPointerDown',
 // 'ColorPicker.handleSliderPointerMove',
 // 'ColorPicker.loadContent',
-'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'Editor.getKeyBindings', 'Editor.getPositionAtCursor', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getWordBefore2', 'Editor.getLines2', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.getSelections2', 'Editor.getQuickPickMenuEntries',
 // 'ColorPicker.render',
-'Editor.getText', 'Editor.getSelections', 'Font.ensure', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'ActivateByEvent.activateByEvent'];
+];
 
 const wrapWidgetCommand = (widgetId, fn) => {
   const isWidget = widget => {
@@ -9757,7 +9739,7 @@ const wrapCommand = fn => async (editorUid, ...args) => {
       effect.apply(newEditor);
     }
   }
-  set$4(editorUid, oldInstance.newState, newEditor);
+  set$6(editorUid, oldInstance.newState, newEditor);
   // TODO if possible, rendering should be sync
   const commands = await renderEditor(editorUid);
   newEditor.commands = commands;
@@ -9782,12 +9764,15 @@ const commandMap = {
   'Editor.addCursorAbove': addCursorAbove,
   'Editor.addCursorBelow': addCursorBelow,
   'Editor.applyEdit': applyEdit,
+  'Editor.applyEdit2': applyEdits2,
   'Editor.braceCompletion': braceCompletion,
   'Editor.cancelSelection': cancelSelection,
   'Editor.closeCodeGenerator': closeCodeGenerator,
   'Editor.closeFind': closeFind,
+  'Editor.closeFind2': closeFind2,
   'Editor.closeRename': closeRename,
   'Editor.closeSourceAction': closeSourceAction,
+  'Editor.closeWidget2': closeWidget2,
   'Editor.compositionEnd': compositionEnd,
   'Editor.compositionStart': compositionStart,
   'Editor.compositionUpdate': compositionUpdate,
@@ -9819,9 +9804,6 @@ const commandMap = {
   'Editor.deleteRight': deleteCharacterRight,
   'Editor.deleteWordLeft': deleteWordLeft,
   'Editor.deleteWordPartLeft': deleteWordPartLeft,
-  'Editor.applyEdit2': applyEdits2,
-  'Editor.closeFind2': closeFind2,
-  'Editor.closeWidget2': closeWidget2,
   'Editor.deleteWordPartRight': deleteWordPartRight,
   'Editor.deleteWordRight': deleteWordRight,
   'Editor.executeWidgetCommand': executeWidgetCommand,
@@ -9843,10 +9825,10 @@ const commandMap = {
   'Editor.goToTypeDefinition': goToTypeDefinition,
   'Editor.handleBeforeInput': handleBeforeInput,
   'Editor.handleBeforeInputFromContentEditable': handleBeforeInputFromContentEditable,
-  'Editor.handleBlur': handleBlur,
+  'Editor.handleBlur': handleBlur$1,
   'Editor.handleContextMenu': handleContextMenu,
   'Editor.handleDoubleClick': handleDoubleClick,
-  'Editor.handleFocus': handleFocus,
+  'Editor.handleFocus': handleFocus$1,
   'Editor.handleMouseDown': handleMouseDown,
   'Editor.handleMouseMove': handleMouseMove,
   'Editor.handleMouseMoveWithAltKey': handleMouseMoveWithAltKey,
@@ -9879,21 +9861,6 @@ const commandMap = {
   'Editor.openCodeGenerator': openCodeGenerator,
   'Editor.openColorPicker': openColorPicker,
   'Editor.openCompletion': openCompletion,
-  'EditorCompletion.closeDetails': closeDetails,
-  'EditorCompletion.focusFirst': focusFirst,
-  'EditorCompletion.focusIndex': focusIndex$1,
-  'EditorCompletion.focusNext': focusNext$1,
-  'EditorCompletion.focusPrevious': focusPrevious,
-  'EditorCompletion.handleEditorBlur': handleEditorBlur,
-  'EditorCompletion.handleEditorClick': handleEditorClick,
-  'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft$1,
-  'EditorCompletion.handleEditorType': handleEditorType$1,
-  'EditorCompletion.handleWheel': handleWheel,
-  'EditorCompletion.openDetails': openDetails,
-  'EditorCompletion.selectCurrent': selectCurrent,
-  'EditorCompletion.close': close,
-  'EditorCompletion.selectIndex': selectIndex,
-  'EditorCompletion.toggleDetails': toggleDetails,
   'Editor.openFind': openFind,
   'Editor.openFind2': openFind2,
   'Editor.openRename': openRename,
@@ -9921,11 +9888,13 @@ const commandMap = {
   'Editor.selectWord': selectWord,
   'Editor.selectWordLeft': selectWordLeft,
   'Editor.selectWordRight': selectWordRight,
+  'Editor.setDebugEnabled': setDebugEnabled,
   'Editor.setDecorations': setDecorations,
   'Editor.setDelta': setDelta,
   'Editor.setDeltaY': setDeltaY,
   'Editor.setLanguageId': setLanguageId,
   'Editor.setSelections': setSelections,
+  'Editor.setSelections2': setSelections2,
   'Editor.showHover': showHover,
   'Editor.showHover2': showHover2,
   'Editor.showSourceActions': showSourceActions,
@@ -9939,11 +9908,45 @@ const commandMap = {
   'Editor.typeWithAutoClosing': typeWithAutoClosing,
   'Editor.undo': undo,
   'Editor.unIndent': editorUnindent,
+  'Editor.updateDebugInfo': updateDebugInfo,
   'Editor.updateDiagnostics': updateDiagnostics,
+  'EditorCompletion.close': close$1,
+  'EditorCompletion.closeDetails': closeDetails,
+  'EditorCompletion.focusFirst': focusFirst,
+  'EditorCompletion.focusIndex': focusIndex$1,
+  'EditorCompletion.focusNext': focusNext$2,
+  'EditorCompletion.focusPrevious': focusPrevious$1,
+  'EditorCompletion.handleEditorBlur': handleEditorBlur,
+  'EditorCompletion.handleEditorClick': handleEditorClick,
+  'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft$1,
+  'EditorCompletion.handleEditorType': handleEditorType$1,
+  'EditorCompletion.handleWheel': handleWheel,
+  'EditorCompletion.openDetails': openDetails,
+  'EditorCompletion.selectCurrent': selectCurrent,
+  'EditorCompletion.selectIndex': selectIndex,
+  'EditorCompletion.toggleDetails': toggleDetails,
   'EditorSourceActions.focusNext': focusNext,
-  'FindWidget.close': close$1,
+  'FindWidget.close': close,
+  'FindWidget.focusCloseButton': focusCloseButton,
+  'FindWidget.focusFind': focusFind,
+  'FindWidget.focusNext': focusNext$1,
+  'FindWidget.focusNextMatchButton': focusNextMatchButton,
+  'FindWidget.focusPrevious': focusPrevious,
+  'FindWidget.focusPreviousMatchButton': focusPreviousMatchButton,
+  'FindWidget.focusReplace': focusReplace,
+  'FindWidget.focusReplaceAllButton': focusReplaceAllButton,
+  'FindWidget.focusReplaceButton': focusReplaceButton,
+  'FindWidget.focusToggleReplace': focusToggleReplace,
+  'FindWidget.handleBlur': handleBlur,
+  'FindWidget.handleFocus': handleFocus,
+  'FindWidget.handleInput': handleInput,
+  'FindWidget.handleReplaceFocus': handleReplaceFocus,
+  'FindWidget.handleReplaceInput': handleReplaceInput,
+  'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
   'FindWidget.loadContent': loadContent$1,
+  'FindWidget.toggleReplace': toggleReplace,
   'Font.ensure': ensure,
+  'HandleMessagePort.handleMessagePort': handleMessagePort,
   'Hover.getHoverInfo': getEditorHoverInfo,
   'Hover.handleSashPointerDown': handleSashPointerDown,
   'Hover.handleSashPointerMove': handleSashPointerMove,
@@ -9955,59 +9958,11 @@ const commandMap = {
 };
 wrapCommands(commandMap);
 
-const MessagePort$1 = 1;
-const ModuleWorker = 2;
-const ReferencePort = 3;
-const ModuleWorkerAndMessagePort = 8;
-const Auto = () => {
-  // @ts-ignore
-  if (globalThis.acceptPort) {
-    return MessagePort$1;
-  }
-  // @ts-ignore
-  if (globalThis.acceptReferencePort) {
-    return ReferencePort;
-  }
-  return ModuleWorkerAndMessagePort;
-};
-
-const getModule = method => {
-  switch (method) {
-    case ModuleWorker:
-      return IpcChildWithModuleWorker$1;
-    case ModuleWorkerAndMessagePort:
-      return IpcChildWithModuleWorkerAndMessagePort$1;
-    case MessagePort$1:
-      return IpcChildWithMessagePort$1;
-    default:
-      throw new Error('unexpected ipc type');
-  }
-};
-
-// @ts-ignore
-const listen$1 = async ({
-  method
-}) => {
-  const module = await getModule(method);
-  // @ts-ignore
-  const rawIpc = await module.listen();
-  // @ts-ignore
-  if (module.signal) {
-    // @ts-ignore
-    module.signal(rawIpc);
-  }
-  // @ts-ignore
-  const ipc = module.wrap(rawIpc);
-  return ipc;
-};
-
 const listen = async () => {
-  register(commandMap);
-  const ipc = await listen$1({
-    method: Auto()
+  const rpc = await WebWorkerRpcClient.create({
+    commandMap: commandMap
   });
-  handleIpc(ipc);
-  listen$5(ipc);
+  set$8(rpc);
 };
 
 const removeWidget = widget => {
@@ -10068,10 +10023,10 @@ const renderFocus = {
     return [Focus, '.CodeGeneratorInput', newState.focusSource];
   }
 };
-const render$9 = [renderContent$1, renderBounds$2, renderFocus];
-const renderFull$3 = (oldState, newState) => {
+const render$8 = [renderContent$1, renderBounds$2, renderFocus];
+const renderFull$2 = (oldState, newState) => {
   const commands = [];
-  for (const item of render$9) {
+  for (const item of render$8) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(item.apply(oldState, newState));
     }
@@ -10079,8 +10034,8 @@ const renderFull$3 = (oldState, newState) => {
   return commands;
 };
 
-const render$8 = widget => {
-  const commands = renderFull$3(widget.oldState, widget.newState);
+const render$7 = widget => {
+  const commands = renderFull$2(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
@@ -10095,27 +10050,27 @@ const render$8 = widget => {
   }
   return wrappedCommands;
 };
-const add$6 = widget => {
-  return addWidget$1(widget, 'EditorCodeGenerator', render$8);
+const add$5 = widget => {
+  return addWidget$1(widget, 'EditorCodeGenerator', render$7);
 };
-const remove$6 = removeWidget;
+const remove$5 = removeWidget;
 
 const EditorCodeGeneratorWidget = {
   __proto__: null,
-  add: add$6,
-  remove: remove$6,
-  render: render$8
+  add: add$5,
+  remove: remove$5,
+  render: render$7
 };
 
-const renderFull$2 = (oldState, newState) => {
+const renderFull$1 = (oldState, newState) => {
   const commands = [...newState.commands];
   // @ts-ignore
   newState.commands = [];
   return commands;
 };
 
-const render$7 = widget => {
-  const commands = renderFull$2(widget.oldState, widget.newState);
+const render$6 = widget => {
+  const commands = renderFull$1(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
@@ -10129,18 +10084,18 @@ const render$7 = widget => {
   }
   return wrappedCommands;
 };
-const add$5 = widget => {
-  return addWidget$1(widget, 'ColorPicker', render$7);
+const add$4 = widget => {
+  return addWidget$1(widget, 'ColorPicker', render$6);
 };
-const remove$5 = removeWidget;
-const Commands$1 = {};
+const remove$4 = removeWidget;
+const Commands = {};
 
 const EditorColorPickerWidget = {
   __proto__: null,
-  Commands: Commands$1,
-  add: add$5,
-  remove: remove$5,
-  render: render$7
+  Commands,
+  add: add$4,
+  remove: remove$4,
+  render: render$6
 };
 
 const getCompletionDetailVirtualDom = content => {
@@ -10198,9 +10153,9 @@ const renderBounds$1 = {
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
   }
 };
-const render$6 = [renderContent, renderBounds$1];
-const renderFull$1 = (oldState, newState) => {
-  return renderParts(render$6, oldState, newState);
+const render$5 = [renderContent, renderBounds$1];
+const renderFull = (oldState, newState) => {
+  return renderParts(render$5, oldState, newState);
 };
 
 const getWidgetState = (editor, id) => {
@@ -10219,8 +10174,8 @@ const getCompletionState = editor => {
   return getWidgetState(editor, Completion);
 };
 
-const render$5 = widget => {
-  const commands = renderFull$1(widget.oldState, widget.newState);
+const render$4 = widget => {
+  const commands = renderFull(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
@@ -10234,10 +10189,10 @@ const render$5 = widget => {
   }
   return wrappedCommands;
 };
-const add$4 = widget => {
-  return addWidget$1(widget, 'EditorCompletionDetails', render$5);
+const add$3 = widget => {
+  return addWidget$1(widget, 'EditorCompletionDetails', render$4);
 };
-const remove$4 = removeWidget;
+const remove$3 = removeWidget;
 const handleEditorType = (editor, state) => {
   const completionState = getCompletionState(editor);
   if (!completionState) {
@@ -10269,47 +10224,9 @@ const handleEditorDeleteLeft = (editor, state) => {
 
 const EditorCompletionDetailWidget = {
   __proto__: null,
-  add: add$4,
+  add: add$3,
   handleEditorDeleteLeft,
   handleEditorType,
-  remove: remove$4,
-  render: render$5
-};
-
-const renderFull = (oldState, newState) => {
-  const commands = [...newState.commands];
-  // @ts-ignore
-  newState.commands = [];
-  return commands;
-};
-
-const render$4 = widget => {
-  const commands = renderFull(widget.oldState, widget.newState);
-  const wrappedCommands = [];
-  const {
-    uid
-  } = widget.newState;
-  for (const command of commands) {
-    if (command[0] === SetDom2 || command[0] === SetCss || command[0] === AppendToBody || command[0] === SetBounds2 || command[0] === RegisterEventListeners || command[0] === SetSelectionByName || command[0] === SetValueByName || command[0] === SetFocusContext || command[0] === SetUid || command[0] === 'Viewlet.focusSelector') {
-      wrappedCommands.push(command);
-    } else {
-      wrappedCommands.push(['Viewlet.send', uid, ...command]);
-    }
-  }
-  return wrappedCommands;
-};
-const add$3 = widget => {
-  return addWidget$1(widget, 'FindWidget', render$4);
-};
-const remove$3 = widget => {
-  return [['Viewlet.dispose', widget.newState.uid]];
-};
-const Commands = {};
-
-const EditorFindWidget = {
-  __proto__: null,
-  Commands,
-  add: add$3,
   remove: remove$3,
   render: render$4
 };
@@ -10505,14 +10422,14 @@ const EditorSourceActionWidget = {
 };
 
 const registerWidgets = () => {
-  set$5(ColorPicker, EditorColorPickerWidget);
-  set$5(Completion, EditorCompletionWidget);
-  set$5(CompletionDetail, EditorCompletionDetailWidget);
-  set$5(Find, EditorFindWidget);
-  set$5(Hover, EditorHoverWidget);
-  set$5(Rename, EditorRenameWidget);
-  set$5(SourceAction$1, EditorSourceActionWidget);
-  set$5(CodeGenerator, EditorCodeGeneratorWidget);
+  set$7(ColorPicker, EditorColorPickerWidget);
+  set$7(Completion, EditorCompletionWidget);
+  set$7(CompletionDetail, EditorCompletionDetailWidget);
+  set$7(Find, EditorFindWidget);
+  set$7(Hover, EditorHoverWidget);
+  set$7(Rename, EditorRenameWidget);
+  set$7(SourceAction$1, EditorSourceActionWidget);
+  set$7(CodeGenerator, EditorCodeGeneratorWidget);
 };
 
 const handleUnhandledRejection = event => {