@lvce-editor/hover-worker 1.4.0 → 2.0.0

package/dist/hoverWorkerMain.js

@@ -882,7 +882,7 @@ const send = (transport, method, ...params) => {
 const invoke$4 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer$3 = (ipc, method, ...params) => {
+const invokeAndTransfer$2 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -921,7 +921,7 @@ const createRpc = ipc => {
       return invoke$4(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$3(ipc, method, ...params);
+      return invokeAndTransfer$2(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -975,20 +975,25 @@ const create$5 = async ({
   messagePort.start();
   return rpc;
 };
-const create$4 = async ({
+const create$3 = async ({
   commandMap,
-  messagePort
+  send
 }) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
   return create$5({
     commandMap,
-    messagePort
+    messagePort: port2
   });
 };
-const PlainMessagePortRpcParent = {
+const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$4
+  create: create$3
 };
-const create$3 = async ({
+const create$4 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1000,7 +1005,7 @@ const create$3 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$3
+  create: create$4
 };
 const createMockRpc = ({
   commandMap
@@ -1022,6 +1027,90 @@ const createMockRpc = ({
   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 {
+          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 terminate = () => {
+  globalThis.close();
+};
+
 const Text = 12;
 
 const EditorWorker$1 = 99;
@@ -1037,7 +1126,7 @@ const get$1 = id => {
   return rpcs[id];
 };
 
-const create$2 = rpcId => {
+const create$1 = rpcId => {
   return {
     // @ts-ignore
     invoke(method, ...params) {
@@ -1063,13 +1152,13 @@ const create$2 = rpcId => {
 
 const {
   invoke: invoke$3,
-  invokeAndTransfer: invokeAndTransfer$2,
+  invokeAndTransfer: invokeAndTransfer$1,
   set: set$4,
   dispose: dispose$3
-} = create$2(EditorWorker$1);
-const sendMessagePortToExtensionHostWorker$1 = async port => {
+} = 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);
 };
@@ -1114,7 +1203,7 @@ const getSelections = async editorUid => {
 const getWordAtOffset2$1 = async editorUid => {
   return invoke$3('Editor.getWordAtOffset2', editorUid);
 };
-const getWordBefore = async (editorUid, rowIndex, columnIndex) => {
+const getWordBefore$1 = async (editorUid, rowIndex, columnIndex) => {
   return invoke$3('Editor.getWordBefore2', editorUid, rowIndex, columnIndex);
 };
 const updateDebugInfo = async info => {
@@ -1156,21 +1245,21 @@ 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 {
   invoke: invoke$2,
-  invokeAndTransfer: invokeAndTransfer$1,
+  invokeAndTransfer,
   set: set$3,
   dispose: dispose$2
-} = create$2(ExtensionHostWorker);
+} = create$1(ExtensionHostWorker);
 const executeReferenceProvider = async (id, offset) => {
   // @ts-ignore
   return invoke$2('ExtensionHostReference.executeReferenceProvider', id, offset);
@@ -1198,7 +1287,7 @@ const ExtensionHost = {
   executeReferenceProvider,
   getRuntimeStatus,
   invoke: invoke$2,
-  invokeAndTransfer: invokeAndTransfer$1,
+  invokeAndTransfer,
   registerMockRpc,
   set: set$3
 };
@@ -1206,8 +1295,9 @@ const ExtensionHost = {
 const {
   invoke: invoke$1,
   set: set$2,
-  invokeAndTransfer,
-  getWordAtOffset2
+  getWordAtOffset2,
+  getWordBefore,
+  sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1
 } = EditorWorker;
 
 const FocusEditorHovers = 9;
@@ -1224,93 +1314,12 @@ 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 {
   get,
   set: set$1,
   wrapCommand,
   dispose: dispose$1
-} = create$1();
+} = create$2();
 
 const create = (uid, x, y, width, height, editorUid, editorLanguageId) => {
   const state = {
@@ -1461,36 +1470,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 +1497,35 @@ 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 {
+      lineInfos: [],
+      documentation: '',
+      documentationHeight: 0
+    };
+  }
+  const {
+    documentation} = hover;
+  const lineInfos = await tokenizeCodeBlock();
+  const documentationHeight = await measureTextBlockHeight();
+  return {
+    lineInfos,
+    documentation,
+    documentationHeight
+  };
+};
+
 //  @deprecated this doesn't work for variable width characters (unicode/emoji).
 // Use position computation in renderer process instead
 
@@ -1534,6 +1552,15 @@ const y = (editor, rowIndex) => {
   return offsetY;
 };
 
+const getHoverPositionXy = (editor, rowIndex, wordStart) => {
+  const x$1 = x(editor, rowIndex, wordStart);
+  const y$1 = editor.height - y(editor, rowIndex) + editor.y + 40;
+  return {
+    x: x$1,
+    y: y$1
+  };
+};
+
 const getOffsetAtCursor = editorUid => {
   // TODO ask editor worker
   return 0;
@@ -1582,21 +1609,21 @@ const executeHoverProvider = async (editorUid, editorLanguageId, offset) => {
 };
 
 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 {
+      hover,
+      error: undefined
+    };
+  } catch (error) {
+    return {
+      hover: undefined,
+      error
+    };
+  }
 };
 
 const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
@@ -1608,14 +1635,6 @@ const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
   }
   return matching;
 };
-const getHoverPositionXy = (editor, rowIndex, wordStart, documentationHeight) => {
-  const x$1 = x(editor, rowIndex, wordStart);
-  const y$1 = editor.height - y(editor, rowIndex) + editor.y + 40;
-  return {
-    x: x$1,
-    y: y$1
-  };
-};
 const getEditorHoverInfo = async (editorUid, editorLanguageId, hoverFullWidth, hoverPaddingLeft, hoverPaddingRight, hoverBorderLeft, hoverBorderRight, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, fallbackDisplayStringLanguageId) => {
   number(editorUid);
   const {
@@ -1623,16 +1642,12 @@ const getEditorHoverInfo = async (editorUid, editorLanguageId, hoverFullWidth, h
     columnIndex
   } = 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 {
@@ -1640,8 +1655,24 @@ const getEditorHoverInfo = async (editorUid, editorLanguageId, hoverFullWidth, h
     y
   } = getHoverPositionXy(editor, rowIndex, wordStart);
   // @ts-ignore
-  const diagnostics = editor.diagnostics || [];
   const matchingDiagnostics = getMatchingDiagnostics(diagnostics, rowIndex);
+  const {
+    hover,
+    error
+  } = await getHover(editorUid, editorLanguageId, offset);
+  if (!hover) {
+    return {
+      lineInfos: [],
+      documentation: '',
+      x,
+      y,
+      matchingDiagnostics
+    };
+  }
+  const {
+    documentation,
+    lineInfos
+  } = await getHoverDetails(hover, error);
   return {
     lineInfos,
     documentation,
@@ -1675,13 +1706,13 @@ const loadContent = async state => {
   } = info;
   return {
     ...state,
-    leadingWord: wordAtOffset,
-    x,
-    y,
     documentation,
+    leadingWord: wordAtOffset,
     lineInfos,
     matchingDiagnostics,
-    width: 300
+    width: 300,
+    x,
+    y
   };
 };
 
@@ -1884,10 +1915,6 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
-const terminate = () => {
-  globalThis.close();
-};
-
 const commandMap = {
   'Hover.close': wrapCommand(close),
   'Hover.create': create,

package/package.json

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