@lvce-editor/hover-worker 2.18.0 → 2.18.2

package/dist/hoverWorkerMain.js

@@ -1470,11 +1470,12 @@ const Text = 12;
 const EditorWorker = 99;
 const ExtensionHostWorker = 44;
 const ExtensionManagementWorker = 9006;
+const RendererWorker = 1;
 
 const SetFocusContext = 'Viewlet.setFocusContext';
 
 const {
-  invoke: invoke$2,
+  invoke: invoke$4,
   invokeAndTransfer,
   set: set$5
 } = create$1(EditorWorker);
@@ -1482,18 +1483,18 @@ const sendMessagePortToExtensionManagementWorker$1 = async port => {
   await invokeAndTransfer('SendMessagePortToExtensionManagementWorker.sendMessagePortToExtensionManagementWorker', port, 0);
 };
 const getLines$1 = async editorUid => {
-  const lines = await invoke$2('Editor.getLines2', editorUid);
+  const lines = await invoke$4('Editor.getLines2', editorUid);
   return lines;
 };
 const getWordAtOffset2$1 = async editorUid => {
-  return invoke$2('Editor.getWordAtOffset2', editorUid);
+  return invoke$4('Editor.getWordAtOffset2', editorUid);
 };
 const getWordBefore$1 = async (editorUid, rowIndex, columnIndex) => {
-  return invoke$2('Editor.getWordBefore2', editorUid, rowIndex, columnIndex);
+  return invoke$4('Editor.getWordBefore2', editorUid, rowIndex, columnIndex);
 };
 const getUri$1 = async editorUid => {
   // @ts-ignore
-  return invoke$2('Editor.getUri', editorUid);
+  return invoke$4('Editor.getUri', editorUid);
 };
 
 const {
@@ -1501,15 +1502,18 @@ const {
 } = create$1(ExtensionHostWorker);
 
 const {
-  invoke: invoke$1,
+  invoke: invoke$3,
   set: set$3
 } = create$1(ExtensionManagementWorker);
 
+const {
+  invoke: invoke$2} = create$1(RendererWorker);
+
 const getLines = (...args) => getLines$1(...args);
 const getUri = (...args) => getUri$1(...args);
 const getWordAtOffset2 = (...args) => getWordAtOffset2$1(...args);
 const getWordBefore = (...args) => getWordBefore$1(...args);
-const invoke = (...args) => invoke$2(...args);
+const invoke$1 = (...args) => invoke$4(...args);
 const sendMessagePortToExtensionManagementWorker = (...args) => sendMessagePortToExtensionManagementWorker$1(...args);
 const set$2 = (...args) => set$5(...args);
 
@@ -1523,7 +1527,7 @@ const close = async state => {
     editorUid
   } = state;
   // @ts-ignore
-  await invoke('Editor.closeWidget2', editorUid, Hover, 'Hovers', FocusEditorHovers);
+  await invoke$1('Editor.closeWidget2', editorUid, Hover, 'Hovers', FocusEditorHovers);
   return state;
 };
 
@@ -1537,6 +1541,7 @@ const {
 const create = (uid, x, y, width, height, editorUid, editorLanguageId) => {
   const state = {
     documentation: '',
+    documentationVirtualDom: [],
     editorLanguageId,
     editorUid,
     fallbackDisplayStringLanguageId: 'typescript',
@@ -1577,7 +1582,7 @@ const isEqual$2 = (oldState, newState) => {
 };
 
 const isEqual$1 = (oldState, newState) => {
-  return oldState.leadingWord === newState.leadingWord && oldState.x === newState.x && oldState.y === newState.y;
+  return oldState.documentation === newState.documentation && oldState.leadingWord === newState.leadingWord && oldState.x === newState.x && oldState.y === newState.y;
 };
 
 const isEqual = (oldState, newState) => {
@@ -1777,7 +1782,7 @@ const getOffsetAtCursor = editorUid => {
 };
 
 const getPositionAtCursor = async editorUid => {
-  const position = await invoke('Editor.getPositionAtCursor', editorUid);
+  const position = await invoke$1('Editor.getPositionAtCursor', editorUid);
   return position;
 };
 
@@ -1792,7 +1797,7 @@ const getTextDocument = async (editorUid, languageId) => {
 };
 const executeHoverProvider = async (editorUid, editorLanguageId, offset) => {
   const textDocument = await getTextDocument(editorUid, editorLanguageId);
-  return invoke$1('Extensions.executeHoverProvider', textDocument, offset);
+  return invoke$3('Extensions.executeHoverProvider', textDocument, offset);
 };
 
 const getHover = async (editorUid, editorLanguageId, offset) => {
@@ -1830,7 +1835,7 @@ const getEditorHoverInfo = async (editorUid, editorLanguageId, hoverFullWidth, h
   const offset = getOffsetAtCursor();
 
   // @ts-ignore
-  const diagnostics = await invoke('Editor.getDiagnostics', editorUid);
+  const diagnostics = await invoke$1('Editor.getDiagnostics', editorUid);
   const wordPart = await getWordBefore(editorUid, rowIndex, columnIndex);
   const wordStart = columnIndex - wordPart.length;
 
@@ -1876,6 +1881,8 @@ const getEditorHoverInfo = async (editorUid, editorLanguageId, hoverFullWidth, h
 
 const getWordAtOffset = getWordAtOffset2;
 
+const invoke = (...args) => invoke$2(...args);
+
 const loadContent = async state => {
   const {
     editorLanguageId,
@@ -1897,9 +1904,11 @@ const loadContent = async state => {
   if (!documentation && lineInfos.length === 0 && matchingDiagnostics.length === 0) {
     return close(state);
   }
+  const documentationVirtualDom = documentation ? await invoke('Markdown.getVirtualDomFromMarkdown', documentation) : [];
   return {
     ...state,
     documentation,
+    documentationVirtualDom,
     leadingWord: wordAtOffset,
     lineInfos,
     matchingDiagnostics,
@@ -2007,6 +2016,7 @@ const getLineInfosVirtualDom = lineInfos => {
 
 const hoverClassName = mergeClassNames(Viewlet, EditorHover);
 const problemClassName = mergeClassNames(HoverDisplayString, HoverProblem);
+const hoverDocumentationClassName = mergeClassNames(HoverDocumentation, 'Markdown');
 const hoverProblemMessage = {
   childCount: 1,
   className: HoverProblemMessage,
@@ -2017,30 +2027,36 @@ const hoverProblemDetail = {
   className: HoverProblemDetail,
   type: Span
 };
-const hoverDocumentation = {
-  childCount: 1,
-  className: HoverDocumentation,
-  type: Div
-};
 const sash = {
   childCount: 0,
   className: mergeClassNames('Sash', 'SashVertical', 'SashResize'),
   onPointerDown: HandleSashPointerDown,
   type: Div
 };
-const getChildCount = (lineInfos, documentation, diagnostics) => {
+const getChildCount = (lineInfos, documentationVirtualDom, diagnostics) => {
   const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
   const lineInfosCount = lineInfos.length > 0 ? 1 : 0;
-  const documentationCount = documentation ? 1 : 0;
+  const documentationCount = documentationVirtualDom.length > 0 ? 1 : 0;
   return lineInfosCount + documentationCount + diagnosticsCount;
 };
-const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
-  if (lineInfos.length === 0 && !documentation && diagnostics.length === 0) {
+const getDocumentationChildCount = documentationVirtualDom => {
+  let stack = [];
+  for (let i = documentationVirtualDom.length - 1; i >= 0; i--) {
+    const node = documentationVirtualDom[i];
+    if (node.childCount > 0) {
+      stack = stack.slice(node.childCount);
+    }
+    stack.unshift(node);
+  }
+  return stack.length;
+};
+const getHoverVirtualDom = (lineInfos, documentationVirtualDom, diagnostics) => {
+  if (lineInfos.length === 0 && documentationVirtualDom.length === 0 && diagnostics.length === 0) {
     return [];
   }
   const dom = [];
   dom.push({
-    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1,
+    childCount: getChildCount(lineInfos, documentationVirtualDom, diagnostics) + 1,
     className: hoverClassName,
     type: Div
   });
@@ -2062,8 +2078,12 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
       type: Div
     }, ...lineInfosDom);
   }
-  if (documentation) {
-    dom.push(hoverDocumentation, text(documentation));
+  if (documentationVirtualDom.length > 0) {
+    dom.push({
+      childCount: getDocumentationChildCount(documentationVirtualDom),
+      className: hoverDocumentationClassName,
+      type: Div
+    }, ...documentationVirtualDom);
   }
   dom.push(sash);
   return dom;
@@ -2071,12 +2091,12 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
 
 const renderItems = (oldState, newState) => {
   const {
-    documentation,
+    documentationVirtualDom,
     lineInfos,
     matchingDiagnostics,
     uid
   } = newState;
-  const dom = getHoverVirtualDom(lineInfos, documentation, matchingDiagnostics);
+  const dom = getHoverVirtualDom(lineInfos, documentationVirtualDom, matchingDiagnostics);
   return [/* method */'Viewlet.setDom2', uid, dom];
 };
 

package/package.json

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