@lvce-editor/editor-worker 19.29.10 → 19.29.12

package/dist/editorWorkerMain.js

@@ -5642,18 +5642,6 @@ const getCursorOffset = editor => {
   return offsetAt(editor, editor.selections[0], editor.selections[1]);
 };
 
-const cancelSelection = editor => {
-  const {
-    selections
-  } = editor;
-  if (selections.length === 4 && selections[0] === selections[2] && selections[1] === selections[3]) {
-    return editor;
-  }
-  const newSelections = alloc(4);
-  moveRangeToPosition$1(newSelections, 0, selections[0], selections[1]);
-  return scheduleSelections(editor, newSelections);
-};
-
 const getIndex = (widgets, id) => {
   for (const [i, widget] of widgets.entries()) {
     if (widget.id === id) {
@@ -5668,6 +5656,28 @@ const removeEditorWidget = (widgets, id) => {
   return newWidgets;
 };
 
+const cancelSelection = editor => {
+  const {
+    selections,
+    widgets = []
+  } = editor;
+  if (widgets.some(widget => widget.id === Hover)) {
+    return {
+      ...editor,
+      additionalFocus: 0,
+      focused: true,
+      widgetRevision: next(editor.uid),
+      widgets: removeEditorWidget(widgets, Hover)
+    };
+  }
+  if (selections.length === 4 && selections[0] === selections[2] && selections[1] === selections[3]) {
+    return editor;
+  }
+  const newSelections = alloc(4);
+  moveRangeToPosition$1(newSelections, 0, selections[0], selections[1]);
+  return scheduleSelections(editor, newSelections);
+};
+
 const isMatchingWidget$2 = widget => {
   return widget.id === CodeGenerator;
 };
@@ -7625,7 +7635,7 @@ const executeHoverProvider = async (editor, offset) => {
   return executeIsolatedHoverProvider(editor, offset);
 };
 
-const getHover$1 = async (editor, offset) => {
+const getHover = async (editor, offset) => {
   object(editor);
   number(offset);
   // TODO invoke extension host worker directly
@@ -7689,17 +7699,6 @@ const tokenizeCodeBlock = async (codeBlock, languageId, tokenizerPath) => {
   return lineInfos;
 };
 
-const getHoverPosition = (position, selections) => {
-  if (position) {
-    return position;
-  }
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  return {
-    columnIndex,
-    rowIndex
-  };
-};
 const containsPosition = (diagnostic, rowIndex, columnIndex) => {
   const {
     columnIndex: startColumnIndex,
@@ -7727,22 +7726,8 @@ const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
   }
   return matching;
 };
-const getHover = async (editor, offset) => {
-  try {
-    return await getHover$1(editor, offset);
-  } catch {
-    return undefined;
-  }
-};
 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);
@@ -7753,11 +7738,17 @@ 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 diagnostics = editor.diagnostics || [];
   const matchingDiagnostics = getMatchingDiagnostics(diagnostics, rowIndex, columnIndex);
-  const hover = await getHover(editor, offset);
+  let hover;
+  try {
+    hover = await getHover(editor, offset);
+  } catch {}
   if (!hover && matchingDiagnostics.length === 0) {
     return undefined;
   }
@@ -7770,17 +7761,18 @@ 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;
-  await measureTextBlockHeight();
-  const {
-    x,
-    y
-  } = getHoverPositionXy(editor, rowIndex, wordStart);
+  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
   };
 };
 
@@ -7791,6 +7783,7 @@ const loadHoverContent = async (state, position) => {
   }
   const {
     documentation,
+    height,
     lineInfos,
     matchingDiagnostics,
     x,
@@ -7800,6 +7793,7 @@ const loadHoverContent = async (state, position) => {
     ...state,
     diagnostics: matchingDiagnostics,
     documentation,
+    height,
     lineInfos,
     width: 600,
     x,
@@ -11000,6 +10994,7 @@ const loadContent$1 = async (editorUid, state, position) => {
   }
   const {
     documentation,
+    height,
     lineInfos,
     matchingDiagnostics,
     x,
@@ -11009,6 +11004,7 @@ const loadContent$1 = async (editorUid, state, position) => {
     ...state,
     diagnostics: matchingDiagnostics,
     documentation,
+    height,
     lineInfos,
     x,
     y
@@ -11513,6 +11509,10 @@ const getKeyBindings = () => {
     command: 'Editor.closeColorPicker',
     key: Escape,
     when: FocusColorPicker
+  }, {
+    command: 'Editor.cancelSelection',
+    key: Escape,
+    when: FocusEditorHover
   }, {
     command: 'Editor.closeSourceAction',
     key: Escape,

package/package.json

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