@lvce-editor/editor-worker 19.29.9 → 19.29.11

package/dist/editorWorkerMain.js

@@ -7689,35 +7689,35 @@ const tokenizeCodeBlock = async (codeBlock, languageId, tokenizerPath) => {
   return lineInfos;
 };
 
-const getHoverPosition = (position, selections) => {
-  if (position) {
-    return position;
+const containsPosition = (diagnostic, rowIndex, columnIndex) => {
+  const {
+    columnIndex: startColumnIndex,
+    endColumnIndex,
+    endRowIndex,
+    rowIndex: startRowIndex
+  } = diagnostic;
+  if (rowIndex < startRowIndex || rowIndex > endRowIndex) {
+    return false;
   }
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  return {
-    columnIndex,
-    rowIndex
-  };
+  if (rowIndex === startRowIndex && columnIndex < startColumnIndex) {
+    return false;
+  }
+  if (rowIndex === endRowIndex && columnIndex >= endColumnIndex) {
+    return false;
+  }
+  return true;
 };
 const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
   const matching = [];
   for (const diagnostic of diagnostics) {
-    if (diagnostic.rowIndex === rowIndex) {
+    if (containsPosition(diagnostic, rowIndex, columnIndex)) {
       matching.push(diagnostic);
     }
   }
   return matching;
 };
 const fallbackDisplayStringLanguageId = 'typescript'; // TODO remove this
-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 hoverWidth = 600;
 const getEditorHoverInfo = async (editorUid, position) => {
   number(editorUid);
   const instance = get$8(editorUid);
@@ -7728,34 +7728,41 @@ const getEditorHoverInfo = async (editorUid, position) => {
   const {
     columnIndex,
     rowIndex
-  } = getHoverPosition(position, selections);
+  } = position || {
+    columnIndex: selections[1],
+    rowIndex: selections[0]
+  };
   const offset = offsetAt(editor, rowIndex, columnIndex);
-  const hover = await getHover(editor, offset);
-  if (!hover) {
+  const diagnostics = editor.diagnostics || [];
+  const matchingDiagnostics = getMatchingDiagnostics(diagnostics, rowIndex, columnIndex);
+  let hover;
+  try {
+    hover = await getHover(editor, offset);
+  } catch {}
+  if (!hover && matchingDiagnostics.length === 0) {
     return undefined;
   }
   const {
-    displayString,
-    displayStringLanguageId,
-    documentation
-  } = hover;
+    displayString = '',
+    displayStringLanguageId = '',
+    documentation = ''
+  } = hover || {};
   const tokenizerPath = '';
-  const lineInfos = await tokenizeCodeBlock(displayString, displayStringLanguageId || fallbackDisplayStringLanguageId, tokenizerPath);
+  const lineInfos = displayString ? await tokenizeCodeBlock(displayString, displayStringLanguageId || fallbackDisplayStringLanguageId, tokenizerPath) : [];
   const wordPart = getWordBefore(editor, rowIndex, columnIndex);
   const wordStart = columnIndex - wordPart.length;
-  await measureTextBlockHeight();
-  const {
-    x,
-    y
-  } = getHoverPositionXy(editor, rowIndex, wordStart);
-  const diagnostics = editor.diagnostics || [];
-  const matchingDiagnostics = getMatchingDiagnostics(diagnostics, rowIndex);
+  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 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);
   return {
     documentation,
+    height,
     lineInfos,
     matchingDiagnostics,
-    x,
-    y
+    x: x$1,
+    y: y$1
   };
 };
 
@@ -7766,6 +7773,7 @@ const loadHoverContent = async (state, position) => {
   }
   const {
     documentation,
+    height,
     lineInfos,
     matchingDiagnostics,
     x,
@@ -7775,6 +7783,7 @@ const loadHoverContent = async (state, position) => {
     ...state,
     diagnostics: matchingDiagnostics,
     documentation,
+    height,
     lineInfos,
     width: 600,
     x,
@@ -7782,7 +7791,61 @@ const loadHoverContent = async (state, position) => {
   };
 };
 
+const updateWidget = (editor, widgetId, newState) => {
+  // TODO avoid closure
+  const isWidget = widget => {
+    return widget.id === widgetId;
+  };
+  const childIndex = editor.widgets.findIndex(isWidget);
+  if (childIndex === -1) {
+    return editor;
+  }
+  // TODO scroll up/down if necessary
+  const childWidget = editor.widgets[childIndex];
+  const newWidget = {
+    ...childWidget,
+    newState,
+    oldState: childWidget.newState
+  };
+  const newWidgets = [...editor.widgets.slice(0, childIndex), newWidget, ...editor.widgets.slice(childIndex + 1)];
+  return {
+    ...editor,
+    widgets: newWidgets
+  };
+};
+
+const getHoverWidgetIndex = widgets => {
+  return widgets.findIndex(widget => widget.id === Hover);
+};
+const updateHover = async (editor, widgetIndex, position) => {
+  const widgetRevision = next(editor.uid);
+  const widget = editor.widgets[widgetIndex];
+  const newState = await loadHoverContent(widget.newState, position);
+  if (get$2(editor.uid) !== widgetRevision) {
+    return editor;
+  }
+  if (!newState) {
+    return {
+      ...editor,
+      additionalFocus: Empty,
+      focused: true,
+      widgetRevision,
+      widgets: removeEditorWidget(editor.widgets, Hover)
+    };
+  }
+  return {
+    ...updateWidget(editor, Hover, newState),
+    widgetRevision
+  };
+};
 const showHover$1 = async (editor, position) => {
+  const {
+    widgets = []
+  } = editor;
+  const widgetIndex = getHoverWidgetIndex(widgets);
+  if (widgetIndex !== -1) {
+    return updateHover(editor, widgetIndex, position);
+  }
   const newStateGenerator = async state => {
     return loadHoverContent(state, position);
   };
@@ -7829,7 +7892,7 @@ const onHoverIdle = async token => {
     // Hover providers are optional and should not surface errors from an idle mouse event.
   }
 };
-const hoverDelay = 300;
+const hoverDelay = 200;
 const handleMouseMove = async (editor, x, y, altKey) => {
   if (altKey) {
     return handleMouseMoveWithAltKey(editor, x, y);
@@ -8866,29 +8929,6 @@ const getWidgetInvoke = widgetId => {
 const SearchValue = 'search-value';
 const Close = 'Close';
 
-const updateWidget = (editor, widgetId, newState) => {
-  // TODO avoid closure
-  const isWidget = widget => {
-    return widget.id === widgetId;
-  };
-  const childIndex = editor.widgets.findIndex(isWidget);
-  if (childIndex === -1) {
-    return editor;
-  }
-  // TODO scroll up/down if necessary
-  const childWidget = editor.widgets[childIndex];
-  const newWidget = {
-    ...childWidget,
-    newState,
-    oldState: childWidget.newState
-  };
-  const newWidgets = [...editor.widgets.slice(0, childIndex), newWidget, ...editor.widgets.slice(childIndex + 1)];
-  return {
-    ...editor,
-    widgets: newWidgets
-  };
-};
-
 const getEditorByWidgetUid = (widgetUid, widgetId) => {
   for (const key of getKeys$2()) {
     const editor = get$8(Number(key)).newState;
@@ -10944,6 +10984,7 @@ const loadContent$1 = async (editorUid, state, position) => {
   }
   const {
     documentation,
+    height,
     lineInfos,
     matchingDiagnostics,
     x,
@@ -10953,6 +10994,7 @@ const loadContent$1 = async (editorUid, state, position) => {
     ...state,
     diagnostics: matchingDiagnostics,
     documentation,
+    height,
     lineInfos,
     x,
     y

package/package.json

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