@lvce-editor/hover-worker 1.5.0 → 2.1.0

package/dist/hoverWorkerMain.js

@@ -225,8 +225,8 @@ const getModuleNotFoundError = stderr => {
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
 const isModuleNotFoundError = stderr => {
@@ -249,14 +249,14 @@ const isUnhelpfulNativeModuleError = stderr => {
 const getNativeModuleErrorMessage = stderr => {
   const message = getMessageCodeBlock(stderr);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
 const getModuleSyntaxError = () => {
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -275,8 +275,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -286,8 +286,8 @@ class IpcError extends VError {
     if (stdout || stderr) {
       // @ts-ignore
       const {
-        message,
         code,
+        message,
         stack
       } = getHelpfulChildProcessError(stdout, stderr);
       const cause = new Error(message);
@@ -348,8 +348,8 @@ const wrap$f = global => {
 };
 const waitForFirstMessage = async port => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
@@ -369,8 +369,8 @@ const listen$6 = async () => {
   const type = firstMessage.params[0];
   if (type === 'message-port') {
     parentIpc.send({
-      jsonrpc: '2.0',
       id: firstMessage.id,
+      jsonrpc: '2.0',
       result: null
     });
     parentIpc.dispose();
@@ -427,8 +427,8 @@ const removeListener = (emitter, type, callback) => {
 };
 const getFirstEvent = (eventEmitter, eventMap) => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   const listenerMap = Object.create(null);
   const cleanup = value => {
@@ -440,8 +440,8 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   for (const [event, type] of Object.entries(eventMap)) {
     const listener = event => {
       cleanup({
-        type,
-        event
+        event,
+        type
       });
     };
     addListener(eventEmitter, event, listener);
@@ -450,9 +450,9 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5$1 = async ({
-  messagePort,
-  isMessagePortOpen
+const create$5 = async ({
+  isMessagePortOpen,
+  messagePort
 }) => {
   if (!isMessagePort(messagePort)) {
     throw new IpcError('port must be of type MessagePort');
@@ -465,8 +465,8 @@ const create$5$1 = async ({
   });
   messagePort.start();
   const {
-    type,
-    event
+    event,
+    type
   } = await eventPromise;
   if (type !== Message$1) {
     throw new IpcError('Failed to wait for ipc message');
@@ -501,61 +501,19 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5$1,
+  create: create$5,
   signal: signal$1,
   wrap: wrap$5
 };
 
-const Two = '2.0';
-const create$4$1 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
+const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const set$6 = (id, fn) => {
-  callbacks[id] = fn;
-};
 const get$2 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = 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);
@@ -706,7 +664,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -749,9 +707,9 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$1 = (id, error) => {
+const create$1$2 = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error
   };
@@ -760,22 +718,22 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(id, errorProperty);
+  return create$1$2(id, errorProperty);
 };
-const create$6 = (message, result) => {
+const create$3 = (message, result) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id: message.id,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$6(message, resultProperty);
+  return create$3(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error: {
       code: Custom,
@@ -862,29 +820,6 @@ const handleJsonRpcMessage = async (...args) => {
   }
   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$4 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer$3 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -907,24 +842,87 @@ const execute$1 = (command, ...args) => {
   return fn(...args);
 };
 
+const Two = '2.0';
+const create$s = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const create$r = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+let id = 0;
+const create$q = () => {
+  return ++id;
+};
+
+/* eslint-disable n/no-unsupported-features/es-syntax */
+
+const registerPromise = map => {
+  const id = create$q();
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
+};
+
+// @ts-ignore
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
+    promise
+  } = registerPromise(callbacks);
+  const message = create$r(id, method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
+};
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$4(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$3(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$s(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
@@ -941,7 +939,7 @@ const logError = () => {
 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, logError, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -959,15 +957,16 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$5 = async ({
+const create$4 = async ({
   commandMap,
+  isMessagePortOpen = true,
   messagePort
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
   const rawIpc = await IpcParentWithMessagePort$1.create({
-    messagePort,
-    isMessagePortOpen: true
+    isMessagePortOpen,
+    messagePort
   });
   const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
   handleIpc(ipc);
@@ -975,20 +974,27 @@ const create$5 = async ({
   messagePort.start();
   return rpc;
 };
-const create$4 = async ({
+const create$2$1 = async ({
   commandMap,
-  messagePort
+  isMessagePortOpen,
+  send
 }) => {
-  return create$5({
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$4({
     commandMap,
-    messagePort
+    isMessagePortOpen,
+    messagePort: port2
   });
 };
-const PlainMessagePortRpcParent = {
+const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$4
+  create: create$2$1
 };
-const create$3 = async ({
+const create$1$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1000,7 +1006,7 @@ const create$3 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$3
+  create: create$1$1
 };
 const createMockRpc = ({
   commandMap
@@ -1015,13 +1021,98 @@ const createMockRpc = ({
     return command(...params);
   };
   const mockRpc = {
+    invocations,
     invoke,
-    invokeAndTransfer: invoke,
-    invocations
+    invokeAndTransfer: invoke
   };
   return mockRpc;
 };
 
+const toCommandId = key => {
+  const dotIndex = key.indexOf('.');
+  return key.slice(dotIndex + 1);
+};
+const create$2 = () => {
+  const states = Object.create(null);
+  const commandMapRef = {};
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    },
+    dispose(uid) {
+      delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          oldState,
+          newState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (oldState === newerState || newState === newerState) {
+          return;
+        }
+        const latest = states[uid];
+        states[uid] = {
+          oldState: latest.oldState,
+          newState: newerState
+        };
+      };
+      return wrapped;
+    },
+    wrapGetter(fn) {
+      const wrapped = (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        return fn(newState, ...args);
+      };
+      return wrapped;
+    },
+    diff(uid, modules, numbers) {
+      const {
+        oldState,
+        newState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    }
+  };
+};
+const terminate = () => {
+  globalThis.close();
+};
+
 const Text = 12;
 
 const EditorWorker$1 = 99;
@@ -1036,9 +1127,17 @@ const set$5 = (id, rpc) => {
 const get$1 = id => {
   return rpcs[id];
 };
+const remove = id => {
+  delete rpcs[id];
+};
 
-const create$2 = rpcId => {
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+const create$1 = rpcId => {
   return {
+    async dispose() {
+      const rpc = get$1(rpcId);
+      await rpc.dispose();
+    },
     // @ts-ignore
     invoke(method, ...params) {
       const rpc = get$1(rpcId);
@@ -1051,25 +1150,34 @@ const create$2 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$5(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$5(rpcId, rpc);
-    },
-    async dispose() {
-      const rpc = get$1(rpcId);
-      await rpc.dispose();
     }
   };
 };
 
 const {
+  dispose: dispose$3,
   invoke: invoke$3,
-  invokeAndTransfer: invokeAndTransfer$2,
-  set: set$4,
-  dispose: dispose$3
-} = create$2(EditorWorker$1);
-const sendMessagePortToExtensionHostWorker$1 = async port => {
+  invokeAndTransfer: invokeAndTransfer$1,
+  registerMockRpc: registerMockRpc$1,
+  set: set$4
+} = create$1(EditorWorker$1);
+const sendMessagePortToExtensionHostWorker$2 = async port => {
   const command = 'HandleMessagePort.handleMessagePort2';
-  await invokeAndTransfer$2(
+  await invokeAndTransfer$1(
   // @ts-ignore
   'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, 0);
 };
@@ -1082,6 +1190,10 @@ const applyEdit = async (editorUid, changes) => {
   // @ts-ignore
   await invoke$3('Editor.applyEdit2', editorUid, changes);
 };
+const applyDocumentEdits = async (editorUid, changes) => {
+  // @ts-ignore
+  await invoke$3('Editor.applyDocumentEdits', editorUid, changes);
+};
 const applyWorkspaceEdit = async (editorUid, changes) => {
   // @ts-ignore
   await invoke$3('Editor.applyWorkspaceEdit', editorUid, changes);
@@ -1114,7 +1226,10 @@ const getSelections = async editorUid => {
 const getWordAtOffset2$1 = async editorUid => {
   return invoke$3('Editor.getWordAtOffset2', editorUid);
 };
-const getWordBefore = async (editorUid, rowIndex, columnIndex) => {
+const closeFind2 = async editorUid => {
+  return invoke$3('Editor.closeFind2', editorUid);
+};
+const getWordBefore$1 = async (editorUid, rowIndex, columnIndex) => {
   return invoke$3('Editor.getWordBefore2', editorUid, rowIndex, columnIndex);
 };
 const updateDebugInfo = async info => {
@@ -1132,19 +1247,14 @@ const getProblems = async () => {
   // @ts-ignore
   return invoke$3('Editor.getProblems');
 };
-const registerMockRpc$1 = commandMap => {
-  const mockRpc = createMockRpc({
-    commandMap
-  });
-  set$4(mockRpc);
-  return mockRpc;
-};
 
 const EditorWorker = {
   __proto__: null,
   activateByEvent: activateByEvent$1,
+  applyDocumentEdits,
   applyEdit,
   applyWorkspaceEdit,
+  closeFind2,
   closeWidget,
   dispose: dispose$3,
   getLanguageId,
@@ -1156,21 +1266,22 @@ const EditorWorker = {
   getUri,
   getWordAt,
   getWordAtOffset2: getWordAtOffset2$1,
-  getWordBefore,
+  getWordBefore: getWordBefore$1,
   invoke: invoke$3,
-  invokeAndTransfer: invokeAndTransfer$2,
+  invokeAndTransfer: invokeAndTransfer$1,
   registerMockRpc: registerMockRpc$1,
-  sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1,
+  sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$2,
   set: set$4,
   updateDebugInfo
 };
 
 const {
+  dispose: dispose$2,
   invoke: invoke$2,
-  invokeAndTransfer: invokeAndTransfer$1,
-  set: set$3,
-  dispose: dispose$2
-} = create$2(ExtensionHostWorker);
+  invokeAndTransfer,
+  registerMockRpc,
+  set: set$3
+} = create$1(ExtensionHostWorker);
 const executeReferenceProvider = async (id, offset) => {
   // @ts-ignore
   return invoke$2('ExtensionHostReference.executeReferenceProvider', id, offset);
@@ -1183,12 +1294,9 @@ const getRuntimeStatus = async extensionId => {
   // @ts-ignore
   return invoke$2('ExtensionHost.getRuntimeStatus', extensionId);
 };
-const registerMockRpc = commandMap => {
-  const mockRpc = createMockRpc({
-    commandMap
-  });
-  set$3(mockRpc);
-  return mockRpc;
+const getEnabledOutputProviderIds = async () => {
+  const channels = await invoke$2('Output.getEnabledProviders');
+  return channels;
 };
 
 const ExtensionHost = {
@@ -1196,18 +1304,20 @@ const ExtensionHost = {
   dispose: dispose$2,
   executeFileReferenceProvider,
   executeReferenceProvider,
+  getEnabledOutputProviderIds,
   getRuntimeStatus,
   invoke: invoke$2,
-  invokeAndTransfer: invokeAndTransfer$1,
+  invokeAndTransfer,
   registerMockRpc,
   set: set$3
 };
 
 const {
+  getWordAtOffset2,
+  getWordBefore,
   invoke: invoke$1,
-  set: set$2,
-  invokeAndTransfer,
-  getWordAtOffset2
+  sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1,
+  set: set$2
 } = EditorWorker;
 
 const FocusEditorHovers = 9;
@@ -1224,119 +1334,39 @@ const close = async state => {
   return state;
 };
 
-const toCommandId = key => {
-  const dotIndex = key.indexOf('.');
-  return key.slice(dotIndex + 1);
-};
-const create$1 = () => {
-  const states = Object.create(null);
-  const commandMapRef = {};
-  return {
-    get(uid) {
-      return states[uid];
-    },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
-    },
-    dispose(uid) {
-      delete states[uid];
-    },
-    getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseInt(key);
-      });
-    },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
-    },
-    wrapCommand(fn) {
-      const wrapped = async (uid, ...args) => {
-        const {
-          newState
-        } = states[uid];
-        const newerState = await fn(newState, ...args);
-        if (newState === newerState) {
-          return;
-        }
-        const latest = states[uid];
-        states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
-        };
-      };
-      return wrapped;
-    },
-    wrapGetter(fn) {
-      const wrapped = (uid, ...args) => {
-        const {
-          newState
-        } = states[uid];
-        return fn(newState, ...args);
-      };
-      return wrapped;
-    },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
-        }
-      }
-      return diffResult;
-    },
-    getCommandIds() {
-      const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId);
-      return ids;
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
-    }
-  };
-};
-
 const {
+  dispose: dispose$1,
   get,
   set: set$1,
-  wrapCommand,
-  dispose: dispose$1
-} = create$1();
+  wrapCommand
+} = create$2();
 
 const create = (uid, x, y, width, height, editorUid, editorLanguageId) => {
   const state = {
-    uid,
-    focusedIndex: -1,
-    x: 0,
-    y: 0,
-    width: 0,
-    height: 0,
-    focused: false,
-    leadingWord: '',
-    version: 0,
-    editorUid,
+    documentation: '',
     editorLanguageId,
+    editorUid,
     fallbackDisplayStringLanguageId: 'typescript',
-    hoverDocumentationFontSize: 15,
-    hoverDocumentationFontFamily: 'Fira Code',
-    hoverDocumentationLineHeight: '1.33333',
+    focused: false,
+    focusedIndex: -1,
+    height: 0,
     hoverBorderLeft: 1,
     hoverBorderRight: 1,
+    hoverDocumentationFontFamily: 'Fira Code',
+    // TODO make it configurable
+    hoverDocumentationFontSize: 15,
+    hoverDocumentationLineHeight: '1.33333',
+    hoverFullWidth: 400,
     hoverPaddingLeft: 8,
     hoverPaddingRight: 8,
-    hoverFullWidth: 400,
-    documentation: '',
+    leadingWord: '',
     lineInfos: [],
-    matchingDiagnostics: []
+    matchingDiagnostics: [],
+    uid,
+    version: 0,
+    width: 0,
+    x: 0,
+    y: 0
   };
   set$1(uid, state, state);
 };
@@ -1384,8 +1414,8 @@ const diff = (oldState, newState) => {
 
 const diff2 = uid => {
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = get(uid);
   const diffResult = diff(oldState, newState);
   return diffResult;
@@ -1413,8 +1443,8 @@ const CtrlCmd = 1 << 11 >>> 0;
 
 const getCommand = shortId => {
   return {
-    command: 'Editor.executeWidgetCommand',
-    args: ['Hovers', `Hovers.${shortId}`, 0, Hover]
+    args: ['Hovers', `Hovers.${shortId}`, 0, Hover],
+    command: 'Editor.executeWidgetCommand'
   };
 };
 const getKeyBindings = () => {
@@ -1461,36 +1491,16 @@ const handleSashPointerUp = (state, eventX, eventY) => {
   return state;
 };
 
-const getPortTuple = () => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  return {
-    port1,
-    port2
-  };
-};
-
 const sendMessagePortToExtensionHostWorker = async port => {
-  const command = 'HandleMessagePort.handleMessagePort2';
   // @ts-ignore
-  await invokeAndTransfer(
-  // @ts-ignore
-  'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, 0 // TODO
-  );
+  await sendMessagePortToExtensionHostWorker$1(port);
 };
 
 const createExtensionHostRpc = async () => {
   try {
-    const {
-      port1,
-      port2
-    } = getPortTuple();
-    await sendMessagePortToExtensionHostWorker(port2);
-    const rpc = await PlainMessagePortRpcParent.create({
+    const rpc = await TransferMessagePortRpcParent.create({
       commandMap: {},
-      messagePort: port1
+      send: sendMessagePortToExtensionHostWorker
     });
     return rpc;
   } catch (error) {
@@ -1508,6 +1518,36 @@ const initialize = async () => {
   set(rpc);
 };
 
+const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
+  // TODO ask editor worker or renderer process
+  return 100;
+};
+
+const tokenizeCodeBlock = async (codeBlock, languageId, tokenizerPath) => {
+  // TODO maybe use syntax highlighting worker for this or another worker
+  return [];
+};
+
+const getHoverDetails = async (hover, error, hoverFullWidth, hoverPaddingLeft, hoverPaddingRight, hoverBorderLeft, hoverBorderRight, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, fallbackDisplayStringLanguageId) => {
+  if (error) {
+    return {
+      documentation: '',
+      documentationHeight: 0,
+      lineInfos: []
+    };
+  }
+  const {
+    documentation
+  } = hover;
+  const lineInfos = await tokenizeCodeBlock();
+  const documentationHeight = await measureTextBlockHeight();
+  return {
+    documentation,
+    documentationHeight,
+    lineInfos
+  };
+};
+
 //  @deprecated this doesn't work for variable width characters (unicode/emoji).
 // Use position computation in renderer process instead
 
@@ -1534,7 +1574,7 @@ const y = (editor, rowIndex) => {
   return offsetY;
 };
 
-const getHoverPositionXy = (editor, rowIndex, wordStart, documentationHeight) => {
+const getHoverPositionXy = (editor, rowIndex, wordStart) => {
   const x$1 = x(editor, rowIndex, wordStart);
   const y$1 = editor.height - y(editor, rowIndex) + editor.y + 40;
   return {
@@ -1564,9 +1604,9 @@ const activateByEvent = async event => {
 };
 
 const execute = async ({
+  args,
   editorLanguageId,
   editorUid,
-  args,
   event,
   method,
   noProviderFoundMessage,
@@ -1582,30 +1622,30 @@ const executeHoverProvider = async (editorUid, editorLanguageId, offset) => {
   number(editorUid);
   number(offset);
   return execute({
-    event: OnHover,
+    args: [offset],
     editorUid,
+    event: OnHover,
     method: HoverExecute,
-    args: [offset],
     noProviderFoundMessage: 'No hover provider found'
   });
 };
 
 const getHover = async (editorUid, editorLanguageId, offset) => {
-  number(editorUid);
-  number(offset);
-  // TODO invoke extension host worker directly
-  const hover = await executeHoverProvider(editorUid, editorLanguageId, offset);
-  return hover;
-};
-
-const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
-  // TODO ask editor worker or renderer process
-  return 100;
-};
-
-const tokenizeCodeBlock = async (codeBlock, languageId, tokenizerPath) => {
-  // TODO maybe use syntax highlighting worker for this or another worker
-  return [];
+  try {
+    number(editorUid);
+    number(offset);
+    // TODO invoke extension host worker directly
+    const hover = await executeHoverProvider(editorUid, editorLanguageId, offset);
+    return {
+      error: undefined,
+      hover
+    };
+  } catch (error) {
+    return {
+      error,
+      hover: undefined
+    };
+  }
 };
 
 const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
@@ -1620,20 +1660,16 @@ const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
 const getEditorHoverInfo = async (editorUid, editorLanguageId, hoverFullWidth, hoverPaddingLeft, hoverPaddingRight, hoverBorderLeft, hoverBorderRight, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, fallbackDisplayStringLanguageId) => {
   number(editorUid);
   const {
-    rowIndex,
-    columnIndex
+    columnIndex,
+    rowIndex
   } = await getPositionAtCursor(editorUid);
   const offset = getOffsetAtCursor();
-  const hover = await getHover(editorUid, editorLanguageId, offset);
-  if (!hover) {
-    return undefined;
-  }
-  const {
-    documentation} = hover;
-  const lineInfos = await tokenizeCodeBlock();
+
+  // @ts-ignore
+  const diagnostics = await invoke$1('Editor.getDiagnostics', editorUid);
   const wordPart = await getWordBefore(editorUid, rowIndex, columnIndex);
   const wordStart = columnIndex - wordPart.length;
-  await measureTextBlockHeight();
+
   // TODO
   const editor = {};
   const {
@@ -1641,14 +1677,30 @@ const getEditorHoverInfo = async (editorUid, editorLanguageId, hoverFullWidth, h
     y
   } = getHoverPositionXy(editor, rowIndex, wordStart);
   // @ts-ignore
-  const diagnostics = editor.diagnostics || [];
   const matchingDiagnostics = getMatchingDiagnostics(diagnostics, rowIndex);
+  const {
+    error,
+    hover
+  } = await getHover(editorUid, editorLanguageId, offset);
+  if (!hover) {
+    return {
+      documentation: '',
+      lineInfos: [],
+      matchingDiagnostics,
+      x,
+      y
+    };
+  }
+  const {
+    documentation,
+    lineInfos
+  } = await getHoverDetails(hover, error);
   return {
-    lineInfos,
     documentation,
+    lineInfos,
+    matchingDiagnostics,
     x,
-    y,
-    matchingDiagnostics
+    y
   };
 };
 
@@ -1676,13 +1728,13 @@ const loadContent = async state => {
   } = info;
   return {
     ...state,
-    leadingWord: wordAtOffset,
-    x,
-    y,
     documentation,
+    leadingWord: wordAtOffset,
     lineInfos,
     matchingDiagnostics,
-    width: 300
+    width: 300,
+    x,
+    y
   };
 };
 
@@ -1693,11 +1745,11 @@ const SetEventListeners = 'Viewlet.registerEventListeners';
 
 const renderBounds = (oldState, newState) => {
   const {
-    x,
-    y,
-    width,
     height,
-    uid
+    uid,
+    width,
+    x,
+    y
   } = newState;
   return [SetBounds, uid, x, y, width, height];
 };
@@ -1745,25 +1797,25 @@ const Span = 8;
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
   };
 };
 
 const getLineInfoVirtualDom = lineInfo => {
   const dom = [{
-    type: Div,
+    childCount: lineInfo.length / 2,
     className: HoverEditorRow,
-    childCount: lineInfo.length / 2
+    type: Div
   }];
   for (let i = 0; i < lineInfo.length; i += 2) {
     const tokenText = lineInfo[i];
     const tokenClass = lineInfo[i + 1];
     dom.push({
-      type: Span,
+      childCount: 1,
       className: tokenClass,
-      childCount: 1
+      type: Span
     }, text(tokenText));
   }
   return dom;
@@ -1773,15 +1825,17 @@ const getLineInfosVirtualDom = lineInfos => {
   return dom;
 };
 
+/* eslint-disable unicorn/no-immediate-mutation */
+
 const hoverProblemMessage = {
-  type: Span,
+  childCount: 1,
   className: HoverProblemMessage,
-  childCount: 1
+  type: Span
 };
 const hoverProblemDetail = {
-  type: Span,
+  childCount: 1,
   className: HoverProblemDetail,
-  childCount: 1
+  type: Span
 };
 const getChildCount = (lineInfos, documentation, diagnostics) => {
   const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
@@ -1790,15 +1844,15 @@ const getChildCount = (lineInfos, documentation, diagnostics) => {
 const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
   const dom = [];
   dom.push({
-    type: Div,
+    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1,
     className: 'Viewlet EditorHover',
-    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1
+    type: Div
   });
   if (diagnostics && diagnostics.length > 0) {
     dom.push({
-      type: Div,
+      childCount: diagnostics.length * 2,
       className: `${HoverDisplayString} ${HoverProblem}`,
-      childCount: diagnostics.length * 2
+      type: Div
     });
     for (const diagnostic of diagnostics) {
       dom.push(hoverProblemMessage, text(diagnostic.message), hoverProblemDetail, text(`${diagnostic.source} (${diagnostic.code})`));
@@ -1807,33 +1861,33 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
   if (lineInfos.length > 0) {
     const lineInfosDom = getLineInfosVirtualDom(lineInfos);
     dom.push({
-      type: Div,
+      childCount: lineInfos.length,
       className: HoverDisplayString,
-      childCount: lineInfos.length
+      type: Div
     }, ...lineInfosDom);
   }
   if (documentation) {
     dom.push({
-      type: Div,
+      childCount: 1,
       className: HoverDocumentation,
-      childCount: 1
+      type: Div
     }, text(documentation));
   }
   dom.push({
-    type: Div,
-    className: 'Sash SashVertical SashResize',
     childCount: 0,
-    onPointerDown: HandleSashPointerDown
+    className: 'Sash SashVertical SashResize',
+    onPointerDown: HandleSashPointerDown,
+    type: Div
   });
   return dom;
 };
 
 const renderItems = (oldState, newState) => {
   const {
-    uid,
-    matchingDiagnostics,
     documentation,
-    lineInfos
+    lineInfos,
+    matchingDiagnostics,
+    uid
   } = newState;
   const dom = getHoverVirtualDom(lineInfos, documentation, matchingDiagnostics);
   return [/* method */'Viewlet.setDom2', uid, dom];
@@ -1841,26 +1895,26 @@ const renderItems = (oldState, newState) => {
 
 const renderUid = (oldState, newState) => {
   const {
-    uid,
-    editorUid
+    editorUid,
+    uid
   } = newState;
   return [SetUid, uid, editorUid];
 };
 
 const getRenderer = diffType => {
   switch (diffType) {
-    case RenderContent:
-      return renderContent;
     case RenderBounds:
       return renderBounds;
+    case RenderContent:
+      return renderContent;
     case RenderEventListeners:
       return renderEventListeners;
-    case RenderUid:
-      return renderUid;
     case RenderFocusContext:
       return renderFocusContext;
     case RenderItems:
       return renderItems;
+    case RenderUid:
+      return renderUid;
     default:
       throw new Error('unknown renderer');
   }
@@ -1877,18 +1931,14 @@ const applyRender = (oldState, newState, diffResult) => {
 
 const render2 = (uid, diffResult) => {
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = get(uid);
   set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
 
-const terminate = () => {
-  globalThis.close();
-};
-
 const commandMap = {
   'Hover.close': wrapCommand(close),
   'Hover.create': create,
@@ -1896,12 +1946,12 @@ const commandMap = {
   'Hover.dispose': dispose,
   'Hover.getCommandIds': getCommandIds,
   'Hover.getKeyBindings': getKeyBindings,
+  'Hover.handleSashPointerDown': wrapCommand(handleSashPointerDown),
+  'Hover.handleSashPointerMove': wrapCommand(handleSashPointerMove),
+  'Hover.handleSashPointerUp': wrapCommand(handleSashPointerUp),
   'Hover.initialize': initialize,
   'Hover.loadContent': wrapCommand(loadContent),
   'Hover.render2': render2,
-  'Hover.handleSashPointerUp': wrapCommand(handleSashPointerUp),
-  'Hover.handleSashPointerDown': wrapCommand(handleSashPointerDown),
-  'Hover.handleSashPointerMove': wrapCommand(handleSashPointerMove),
   'Hover.terminate': terminate
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/hover-worker",
-  "version": "1.5.0",
+  "version": "2.1.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",