@lvce-editor/editor-worker 19.68.4 → 19.68.6

package/dist/editorWorkerMain.js

@@ -9825,6 +9825,7 @@ const getDiagnosticHoverInfo = async (editor, diagnostic) => {
   return {
     diagnostics: [diagnostic],
     documentation: '',
+    documentationVirtualDom: [],
     height,
     lineInfos: [],
     width,
@@ -9842,6 +9843,7 @@ const create$5 = () => {
       content: '',
       diagnostics: [],
       documentation: '',
+      documentationVirtualDom: [],
       editorUid: 0,
       height: 0,
       lineInfos: [],
@@ -9855,6 +9857,7 @@ const create$5 = () => {
       content: '',
       diagnostics: [],
       documentation: '',
+      documentationVirtualDom: [],
       editorUid: 0,
       height: 0,
       lineInfos: [],
@@ -9893,6 +9896,15 @@ const getHover = async (editor, offset) => {
   return hover;
 };
 
+const invoke$5 = (...args) => invoke$d(...args);
+
+const getVirtualDomFromMarkdown = async markdown => {
+  const html = await invoke$5('Markdown.renderMarkdown', markdown, {
+    linksExternal: true
+  });
+  return invoke$5('Markdown.getVirtualDom', html);
+};
+
 const getLineInfo = (line, tokens, TokenMap) => {
   const tokensLength = tokens.length;
   let end = 0;
@@ -9990,6 +10002,7 @@ const getEditorHoverInfo = async (editorUid, position) => {
   }
   const tokenizerPath = '';
   const lineInfos = displayString ? await tokenizeCodeBlock(displayString, displayStringLanguageId || fallbackDisplayStringLanguageId, tokenizerPath) : [];
+  const documentationVirtualDom = documentation ? await getVirtualDomFromMarkdown(documentation) : [];
   const wordPart = getWordBefore(editor, rowIndex, columnIndex);
   const wordStart = columnIndex - wordPart.length;
   const documentationHeight = documentation ? await measureTextBlockHeight(documentation, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, hoverDocumentationWidth) : 0;
@@ -10004,6 +10017,7 @@ const getEditorHoverInfo = async (editorUid, position) => {
   const y$1 = rowBottom + height <= editor.y + editor.height ? rowBottom : Math.max(editor.y, rowBottom - editor.rowHeight - height);
   return {
     documentation,
+    documentationVirtualDom,
     height,
     lineInfos,
     matchingDiagnostics,
@@ -10019,6 +10033,7 @@ const loadHoverContent = async (state, position) => {
   }
   const {
     documentation,
+    documentationVirtualDom,
     height,
     lineInfos,
     matchingDiagnostics,
@@ -10029,6 +10044,7 @@ const loadHoverContent = async (state, position) => {
     ...state,
     diagnostics: matchingDiagnostics,
     documentation,
+    documentationVirtualDom,
     height,
     lineInfos,
     width: 600,
@@ -11073,7 +11089,7 @@ const create$3 = () => {
 };
 
 const {
-  invoke: invoke$5,
+  invoke: invoke$4,
   setFactory
 } = createLazyRpc(CompletionWorker);
 
@@ -11092,10 +11108,10 @@ const newStateGenerator$3 = async (state, parentUid) => {
     applicationId,
     languageId
   } = newState;
-  await invoke$5('Completions.create', uid, x, y, width, height, parentUid, languageId, applicationId);
-  await invoke$5('Completions.loadContent', uid);
-  const diff = await invoke$5('Completions.diff2', uid);
-  const commands = await invoke$5('Completions.render2', uid, diff);
+  await invoke$4('Completions.create', uid, x, y, width, height, parentUid, languageId, applicationId);
+  await invoke$4('Completions.loadContent', uid);
+  const diff = await invoke$4('Completions.diff2', uid);
+  const commands = await invoke$4('Completions.render2', uid, diff);
   return {
     ...state,
     commands
@@ -11225,7 +11241,7 @@ const launch = async () => {
   const rpc = await launchFindWidgetWorker();
   set$h(rpcId, rpc);
 };
-const invoke$4 = async (method, ...params) => {
+const invoke$3 = async (method, ...params) => {
   const rpc = get$9(rpcId);
   return await rpc.invoke(method, ...params);
 };
@@ -11256,7 +11272,7 @@ const getOrCreate$1 = () => {
   }
   return state$2.workerPromise;
 };
-const invoke$3 = async (method, ...params) => {
+const invoke$2 = async (method, ...params) => {
   const worker = await getOrCreate$1();
   return await worker.invoke(method, ...params);
 };
@@ -11276,7 +11292,7 @@ const getOrCreate = () => {
   }
   return state$1.workerPromise;
 };
-const invoke$2 = async (method, ...params) => {
+const invoke$1 = async (method, ...params) => {
   const worker = await getOrCreate();
   return await worker.invoke(method, ...params);
 };
@@ -11286,15 +11302,15 @@ const getWidgetInvoke = widgetId => {
     case ColorPicker$2:
       return invoke$7;
     case Completion:
-      return invoke$5;
-    case Find:
       return invoke$4;
-    case Hover:
+    case Find:
       return invoke$3;
+    case Hover:
+      return invoke$2;
     case Rename$1:
       return invoke$6;
     case SourceAction$1:
-      return invoke$2;
+      return invoke$1;
     default:
       return undefined;
   }
@@ -11554,10 +11570,10 @@ const loadContent$2 = async (state, parentUid) => {
     y
   } = editor;
   await launch();
-  await invoke$4('FindWidget.create', uid, x, y, width, height, parentUid);
-  await invoke$4('FindWidget.loadContent', uid);
-  const diff = await invoke$4('FindWidget.diff2', uid);
-  const commands = await invoke$4('FindWidget.render2', uid, diff);
+  await invoke$3('FindWidget.create', uid, x, y, width, height, parentUid);
+  await invoke$3('FindWidget.loadContent', uid);
+  const diff = await invoke$3('FindWidget.diff2', uid);
+  const commands = await invoke$3('FindWidget.render2', uid, diff);
   return {
     ...state,
     commands
@@ -12654,10 +12670,10 @@ const newStateGenerator = async (state, parentUid) => {
   const {
     languageId
   } = newState;
-  await invoke$2('SourceActions.create', uid, x, y, width, height, parentUid, languageId);
-  await invoke$2('SourceActions.loadContent', uid);
-  const diff = await invoke$2('SourceActions.diff2', uid);
-  const commands = await invoke$2('SourceActions.render2', uid, diff);
+  await invoke$1('SourceActions.create', uid, x, y, width, height, parentUid, languageId);
+  await invoke$1('SourceActions.loadContent', uid);
+  const diff = await invoke$1('SourceActions.diff2', uid);
+  const commands = await invoke$1('SourceActions.render2', uid, diff);
   return {
     ...state,
     commands
@@ -13647,6 +13663,7 @@ const loadContent$1 = async (editorUid, state, position) => {
   }
   const {
     documentation,
+    documentationVirtualDom,
     height,
     lineInfos,
     matchingDiagnostics,
@@ -13657,6 +13674,7 @@ const loadContent$1 = async (editorUid, state, position) => {
     ...state,
     diagnostics: matchingDiagnostics,
     documentation,
+    documentationVirtualDom,
     height,
     lineInfos,
     x,
@@ -14062,20 +14080,20 @@ const hoverSashNode = {
   onPointerDown: HandleSashPointerDown,
   type: Div
 };
-const getChildCount = (lineInfos, documentation, diagnostics) => {
-  const documentationCount = documentation ? 1 : 0;
+const getChildCount = (lineInfos, documentationVirtualDom, diagnostics) => {
+  const documentationCount = documentationVirtualDom.length > 0 ? 1 : 0;
   const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
-  return lineInfos.length + documentationCount + diagnosticsCount;
+  return (lineInfos.length > 0 ? 1 : 0) + documentationCount + diagnosticsCount;
 };
-const getEditorHoverClassName = (lineInfos, documentation, diagnostics) => {
-  const isDiagnosticOnly = diagnostics?.length === 1 && lineInfos.length === 0 && !documentation;
+const getEditorHoverClassName = (lineInfos, documentationVirtualDom, diagnostics) => {
+  const isDiagnosticOnly = diagnostics?.length === 1 && lineInfos.length === 0 && documentationVirtualDom.length === 0;
   return mergeClassNames('Viewlet', 'EditorHover', isDiagnosticOnly ? EditorHoverDiagnosticOnly : '');
 };
-const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
+const getHoverVirtualDom = (lineInfos, documentationVirtualDom, diagnostics) => {
   const dom = [];
   dom.push({
-    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1,
-    className: getEditorHoverClassName(lineInfos, documentation, diagnostics),
+    childCount: getChildCount(lineInfos, documentationVirtualDom, diagnostics) + 1,
+    className: getEditorHoverClassName(lineInfos, documentationVirtualDom, diagnostics),
     type: Div
   });
   if (diagnostics && diagnostics.length > 0) {
@@ -14096,8 +14114,8 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
       type: Div
     }, ...lineInfosDom);
   }
-  if (documentation) {
-    dom.push(hoverDocumentationNode, text(documentation));
+  if (documentationVirtualDom.length > 0) {
+    dom.push(hoverDocumentationNode, ...documentationVirtualDom);
   }
   dom.push(hoverSashNode);
   return dom;
@@ -14105,10 +14123,10 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
 
 const renderHoverDom = {
   apply(oldState, newState) {
-    const dom = getHoverVirtualDom(newState.lineInfos, newState.documentation, newState.diagnostics);
+    const dom = getHoverVirtualDom(newState.lineInfos, newState.documentationVirtualDom, newState.diagnostics);
     return [/* method */SetDom2, dom];
   },
-  isEqual: (oldState, newState) => oldState.lineInfos === newState.lineInfos && oldState.documentation === newState.documentation && oldState.diagnostics === newState.diagnostics
+  isEqual: (oldState, newState) => oldState.lineInfos === newState.lineInfos && oldState.documentationVirtualDom === newState.documentationVirtualDom && oldState.diagnostics === newState.diagnostics
 };
 const renderBounds$2 = {
   apply(oldState, newState) {
@@ -15132,7 +15150,11 @@ const isAutoClosingTagsEnabled = async () => {
   return true;
 };
 const getRowHeight = async () => {
-  return (await get$3(kLineHeight)) || 20;
+  const [lineHeight, fontSize] = await Promise.all([get$3(kLineHeight), getFontSize()]);
+  if (typeof lineHeight !== 'number' || !Number.isFinite(lineHeight) || lineHeight < fontSize) {
+    return fontSize;
+  }
+  return lineHeight;
 };
 const getFontSize = async () => {
   return (await get$3(kFontSize)) || 15; // TODO find out if it is possible to use all numeric values for settings for efficiency, maybe settings could be an array
@@ -15236,9 +15258,9 @@ const updateFindWidget = async state => {
   const {
     uid
   } = widget.newState;
-  await invoke$4('FindWidget.handleSettingsChanged', uid);
-  const diff = await invoke$4('FindWidget.diff2', uid);
-  const commands = await invoke$4('FindWidget.render2', uid, diff);
+  await invoke$3('FindWidget.handleSettingsChanged', uid);
+  const diff = await invoke$3('FindWidget.diff2', uid);
+  const commands = await invoke$3('FindWidget.render2', uid, diff);
   return updateWidget(state, Find, {
     ...widget.newState,
     commands
@@ -15333,7 +15355,7 @@ const getWidgetHotReloadDescriptor = widgetId => {
   switch (widgetId) {
     case Find:
       return {
-        invoke: invoke$4,
+        invoke: invoke$3,
         name: 'FindWidget'
       };
     default:
@@ -17224,13 +17246,13 @@ const unregisterListener = (listenerType, rpcId) => {
   unregisterListener$1(listenerType, rpcId);
 };
 
-const invoke$1 = async (method, ...params) => {
+const invoke = async (method, ...params) => {
   const worker = get$9(DebugWorker);
   return worker.invoke(method, ...params);
 };
 
 const getDebugHighlight = async debugId => {
-  const newInfo = await invoke$1('RunAndDebug.getHighlight', debugId);
+  const newInfo = await invoke('RunAndDebug.getHighlight', debugId);
   return newInfo;
 };
 
@@ -17304,8 +17326,6 @@ const executeDiagnosticProvider = async editor => {
   return executeIsolatedDiagnosticProvider(editor);
 };
 
-const invoke = (...args) => invoke$d(...args);
-
 /**
  * Merges link decorations with diagnostic decorations
  * Links should always be present, but we also need to include any diagnostic decorations
@@ -17417,7 +17437,7 @@ const updateDiagnostics = async editor => {
       }
       const newEditor = mergeDiagnostics(latest.newState, editorWithDiagnostics);
       set$8(editor.id, latest.oldState, newEditor);
-      await invoke('Editor.renderPending', newEditor.id);
+      await invoke$5('Editor.renderPending', newEditor.id);
       await notifyDiagnosticsChange(newEditor.uri, newEditor.applicationId);
       return newEditor;
     })) ?? editor;
@@ -17899,6 +17919,7 @@ const commandMap = {
   'Listener.register': registerListener,
   'Listener.registerListener': registerListener,
   'Listener.unregister': unregisterListener,
+  'Markdown.getVirtualDomFromMarkdown': getVirtualDomFromMarkdown,
   'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker': sendDeprecatedExtensionHostPortToExtensionManagementWorker,
   'SendMessagePortToExtensionManagementWorker.sendMessagePortToExtensionManagementWorker': sendMessagePortToExtensionManagementWorker
 };
@@ -18244,7 +18265,7 @@ const render$1 = widget => {
     newState,
     oldState
   } = widget;
-  const commands = newState.commands.length > 0 ? renderFull$3(oldState, newState) : [[SetDom2, newState.uid, getHoverVirtualDom(newState.lineInfos, newState.documentation, newState.diagnostics)], [SetBounds2, newState.uid, newState.x, newState.y, newState.width, newState.height]];
+  const commands = newState.commands.length > 0 ? renderFull$3(oldState, newState) : [[SetDom2, newState.uid, getHoverVirtualDom(newState.lineInfos, newState.documentationVirtualDom, newState.diagnostics)], [SetBounds2, newState.uid, newState.x, newState.y, newState.width, newState.height]];
   const wrappedCommands = [];
   const {
     uid

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "19.68.4",
+  "version": "19.68.6",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"