@lvce-editor/hover-worker 2.18.3 → 2.19.2

package/README.md

@@ -1,3 +1,12 @@
-# hover-worker
+# Hover Worker
 
-Hover Worker
+> A Web Worker for the hover functionality in Lvce Editor.
+
+## Contributing
+
+```sh
+git clone git@github.com:lvce-editor/hover-worker.git &&
+cd hover-worker &&
+npm ci &&
+npm test
+```

package/dist/hoverWorkerMain.js

@@ -1714,9 +1714,20 @@ const initialize = async () => {
   set(rpc);
 };
 
+const invoke = (...args) => invoke$2(...args);
+
 const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
-  // TODO ask editor worker or renderer process
-  return 100;
+  return invoke('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, lineHeight, width);
+};
+
+const getDiagnosticHeight = async (diagnostics, fontFamily, fontSize, lineHeight, width) => {
+  const text = diagnostics.map(value => {
+    const diagnostic = value;
+    return `${diagnostic.message} ${diagnostic.source} (${diagnostic.code})`;
+  }).join('\n');
+  const textHeight = await measureTextBlockHeight(text, fontFamily, fontSize, lineHeight, width);
+  // Include the hover's two-pixel border; keep the widget's CSS minimum height.
+  return Math.max(20, textHeight + 2);
 };
 
 const tokenizeCodeBlock = async (codeBlock, languageId, tokenizerPath) => {
@@ -1734,8 +1745,9 @@ const getHoverDetails = async (hover, error, hoverFullWidth, hoverPaddingLeft, h
   }
   const hoverText = typeof hover.text === 'string' && hover.text.trim() ? hover.text : '';
   const documentation = typeof hover.documentation === 'string' && hover.documentation.trim() ? hover.documentation : hoverText;
+  const hoverDocumentationWidth = hoverFullWidth - hoverPaddingLeft - hoverPaddingRight - hoverBorderLeft - hoverBorderRight;
   const lineInfos = await tokenizeCodeBlock();
-  const documentationHeight = await measureTextBlockHeight();
+  const documentationHeight = await measureTextBlockHeight(documentation, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, hoverDocumentationWidth);
   return {
     documentation,
     documentationHeight,
@@ -1868,7 +1880,7 @@ const getEditorHoverInfo = async (editorUid, editorLanguageId, hoverFullWidth, h
   const {
     documentation,
     lineInfos
-  } = await getHoverDetails(hover, error);
+  } = await getHoverDetails(hover, error, hoverFullWidth, hoverPaddingLeft, hoverPaddingRight, hoverBorderLeft, hoverBorderRight, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight);
   if (!documentation && lineInfos.length === 0 && matchingDiagnostics.length === 0) {
     return undefined;
   }
@@ -1883,18 +1895,26 @@ const getEditorHoverInfo = async (editorUid, editorLanguageId, hoverFullWidth, h
 
 const getWordAtOffset = getWordAtOffset2;
 
-const invoke = (...args) => invoke$2(...args);
-
 const loadContent = async state => {
   const {
     editorLanguageId,
-    editorUid} = state;
+    editorUid,
+    height: currentHeight,
+    hoverBorderLeft,
+    hoverBorderRight,
+    hoverDocumentationFontFamily,
+    hoverDocumentationFontSize,
+    hoverDocumentationLineHeight,
+    hoverFullWidth,
+    hoverPaddingLeft,
+    hoverPaddingRight
+  } = state;
   const wordAtOffset = await getWordAtOffset(editorUid);
   const {
     x,
     y
   } = await getPositionAtCursor(editorUid);
-  const info = await getEditorHoverInfo(editorUid, editorLanguageId);
+  const info = await getEditorHoverInfo(editorUid, editorLanguageId, hoverFullWidth, hoverPaddingLeft, hoverPaddingRight, hoverBorderLeft, hoverBorderRight, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight);
   if (!info) {
     return close(state);
   }
@@ -1906,15 +1926,18 @@ const loadContent = async state => {
   if (!documentation && lineInfos.length === 0 && matchingDiagnostics.length === 0) {
     return close(state);
   }
+  const width = 300;
+  const height = matchingDiagnostics.length > 0 ? Math.min(300, await getDiagnosticHeight(matchingDiagnostics, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, width - hoverBorderLeft - hoverBorderRight)) : currentHeight;
   const documentationVirtualDom = documentation ? await invoke('Markdown.getVirtualDomFromMarkdown', documentation) : [];
   return {
     ...state,
     documentation,
     documentationVirtualDom,
+    height,
     leadingWord: wordAtOffset,
     lineInfos,
     matchingDiagnostics,
-    width: 300,
+    width,
     x,
     y
   };
@@ -2188,4 +2211,4 @@ const main = async () => {
   await listen();
 };
 
-main();
+await main();

package/package.json

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