@lvce-editor/editor-worker 19.30.7 → 19.30.9

package/dist/editorWorkerMain.js

@@ -7708,8 +7708,7 @@ const getHover = async (editor, offset) => {
 
 const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
   // @ts-ignore
-  // return RendererProcess.invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width)
-  return 100;
+  return invoke$a('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, lineHeight, width);
 };
 
 const getLineInfo = (line, tokens, TokenMap) => {
@@ -7790,7 +7789,12 @@ const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
   return matching;
 };
 const fallbackDisplayStringLanguageId = 'typescript'; // TODO remove this
+
+const hoverDocumentationFontSize = 15;
+const hoverDocumentationFontFamily = 'Fira Code';
+const hoverDocumentationLineHeight = '1.33333';
 const hoverWidth = 600;
+const hoverDocumentationWidth = hoverWidth - 18;
 const getEditorHoverInfo = async (editorUid, position) => {
   number(editorUid);
   const instance = get$8(editorUid);
@@ -7824,8 +7828,13 @@ const getEditorHoverInfo = async (editorUid, position) => {
   const lineInfos = displayString ? await tokenizeCodeBlock(displayString, displayStringLanguageId || fallbackDisplayStringLanguageId, tokenizerPath) : [];
   const wordPart = getWordBefore(editor, rowIndex, columnIndex);
   const wordStart = columnIndex - wordPart.length;
-  const documentationHeight = await measureTextBlockHeight();
-  const height = Math.min((matchingDiagnostics.length > 0 ? 30 : 0) + (lineInfos.length > 0 ? lineInfos.length * editor.rowHeight + 12 : 0) + (documentation ? documentationHeight + 11 : 0) || 20, editor.height);
+  const documentationHeight = documentation ? await measureTextBlockHeight(documentation, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, hoverDocumentationWidth) : 0;
+  let diagnosticText = '';
+  for (const diagnostic of matchingDiagnostics) {
+    diagnosticText += `${diagnosticText ? '\n' : ''}${diagnostic.message} ${diagnostic.source} (${diagnostic.code})`;
+  }
+  const diagnosticsHeight = diagnosticText ? (await measureTextBlockHeight(diagnosticText, editor.fontFamily, editor.fontSize, `${editor.rowHeight}px`, hoverDocumentationWidth)) + 10 : 0;
+  const height = Math.min(diagnosticsHeight + (lineInfos.length > 0 ? lineInfos.length * editor.rowHeight + 12 : 0) + (documentation ? documentationHeight + 11 : 0) || 20, editor.height);
   const x$1 = Math.max(editor.x, Math.min(x(editor, rowIndex, wordStart), editor.x + editor.width - hoverWidth));
   const rowBottom = y(editor, rowIndex);
   const y$1 = rowBottom + height <= editor.y + editor.height ? rowBottom : Math.max(editor.y, rowBottom - editor.rowHeight - height);
@@ -10101,6 +10110,13 @@ const getSignatureHelp = async (editor, offset) => {
   return executeSignatureHelpProvider(editor, offset);
 };
 
+const documentationFontSize = 15;
+const documentationFontFamily = 'Fira Code';
+const documentationLineHeight = '1.33333';
+const borderLeft = 1;
+const borderRight = 1;
+const paddingLeft = 8;
+const paddingRight = 8;
 const getSignatureHelpInfo = async editorUid => {
   number(editorUid);
   const instance = get$8(editorUid);
@@ -10124,7 +10140,9 @@ const getSignatureHelpInfo = async editorUid => {
     documentation
   } = content;
   const lineInfos = await tokenizeCodeBlock(displayString, editor.languageId || 'typescript', '');
-  const documentationHeight = await measureTextBlockHeight();
+  const fullWidth = Math.min(600, editor.width);
+  const documentationWidth = fullWidth - paddingLeft - paddingRight - borderLeft - borderRight;
+  const documentationHeight = await measureTextBlockHeight(documentation, documentationFontFamily, documentationFontSize, documentationLineHeight, documentationWidth);
   const bounds = getSignatureHelpWidgetBounds(editor, rowIndex, columnIndex, lineInfos.length, documentationHeight, Boolean(documentation));
   return {
     ...bounds,
@@ -11154,6 +11172,7 @@ const CompletionDetailCloseButton = 'CompletionDetailCloseButton';
 const CompletionDetailContent = 'CompletionDetailContent';
 const Diagnostic = 'Diagnostic';
 const EditorCursor = 'EditorCursor';
+const EditorHoverDiagnosticOnly = 'EditorHoverDiagnosticOnly';
 const EditorRow = 'EditorRow';
 const EditorRowHighlighted = 'EditorRowHighlighted';
 const EditorSelection = 'EditorSelection';
@@ -11272,11 +11291,15 @@ const getChildCount = (lineInfos, documentation, diagnostics) => {
   const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
   return lineInfos.length + documentationCount + diagnosticsCount;
 };
+const getEditorHoverClassName = (lineInfos, documentation, diagnostics) => {
+  const isDiagnosticOnly = diagnostics?.length === 1 && lineInfos.length === 0 && !documentation;
+  return mergeClassNames('Viewlet', 'EditorHover', isDiagnosticOnly ? EditorHoverDiagnosticOnly : '');
+};
 const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
   const dom = [];
   dom.push({
     childCount: getChildCount(lineInfos, documentation, diagnostics) + 1,
-    className: mergeClassNames('Viewlet', 'EditorHover'),
+    className: getEditorHoverClassName(lineInfos, documentation, diagnostics),
     type: Div
   });
   if (diagnostics && diagnostics.length > 0) {

package/package.json

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