@lvce-editor/hover-worker 1.0.0 → 1.2.0

package/dist/hoverWorkerMain.js

@@ -979,6 +979,8 @@ const createMockRpc = ({
   return mockRpc;
 };
 
+const Text = 12;
+
 const EditorWorker$1 = 99;
 const ExtensionHostWorker = 44;
 
@@ -1052,7 +1054,7 @@ const getLines = async editorUid => {
   const lines = await invoke$2('Editor.getLines2', editorUid);
   return lines;
 };
-const getPositionAtCursor = async parentUid => {
+const getPositionAtCursor$1 = async parentUid => {
   const position = await invoke$2('Editor.getPositionAtCursor', parentUid);
   return position;
 };
@@ -1064,7 +1066,7 @@ const getSelections = async editorUid => {
   const selections = await invoke$2('Editor.getSelections2', editorUid);
   return selections;
 };
-const getWordAtOffset2 = async editorUid => {
+const getWordAtOffset2$1 = async editorUid => {
   return invoke$2('Editor.getWordAtOffset2', editorUid);
 };
 const getWordBefore = async (editorUid, rowIndex, columnIndex) => {
@@ -1103,12 +1105,12 @@ const EditorWorker = {
   getLanguageId,
   getLines,
   getOffsetAtCursor,
-  getPositionAtCursor,
+  getPositionAtCursor: getPositionAtCursor$1,
   getProblems,
   getSelections,
   getUri,
   getWordAt,
-  getWordAtOffset2,
+  getWordAtOffset2: getWordAtOffset2$1,
   getWordBefore,
   invoke: invoke$2,
   invokeAndTransfer: invokeAndTransfer$2,
@@ -1159,7 +1161,8 @@ const ExtensionHost = {
 const {
   invoke,
   set: set$2,
-  invokeAndTransfer
+  invokeAndTransfer,
+  getWordAtOffset2
 } = EditorWorker;
 
 const FocusEditorHovers = 9;
@@ -1276,35 +1279,49 @@ const create = (uid, x, y, width, height, editorUid, editorLanguageId) => {
     leadingWord: '',
     version: 0,
     editorUid,
-    editorLanguageId
+    editorLanguageId,
+    fallbackDisplayStringLanguageId: 'typescript',
+    hoverDocumentationFontSize: 15,
+    hoverDocumentationFontFamily: 'Fira Code',
+    hoverDocumentationLineHeight: '1.33333',
+    hoverBorderLeft: 1,
+    hoverBorderRight: 1,
+    hoverPaddingLeft: 8,
+    hoverPaddingRight: 8,
+    hovverFullWidth: 400
   };
   set$1(uid, state, state);
 };
 
-const isEqual$3 = (oldState, newState) => {
+const isEqual$4 = (oldState, newState) => {
   return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
 };
 
+const isEqual$3 = (oldState, newState) => {
+  return oldState.version === newState.version;
+};
+
 const isEqual$2 = (oldState, newState) => {
   return oldState.version === newState.version;
 };
 
 const isEqual$1 = (oldState, newState) => {
-  return oldState.version === newState.version;
+  return oldState.leadingWord === newState.leadingWord && oldState.x === newState.x && oldState.y === newState.y;
 };
 
 const isEqual = (oldState, newState) => {
   return oldState.version === newState.version;
 };
 
+const RenderItems = 1;
 const RenderBounds = 8;
 const RenderEventListeners = 11;
 const RenderUid = 12;
 const RenderContent = 13;
 const RenderFocusContext = 14;
 
-const modules = [isEqual$2, isEqual$3, isEqual, isEqual$1];
-const numbers = [RenderEventListeners, RenderBounds, RenderUid, RenderFocusContext];
+const modules = [isEqual$3, isEqual$1, isEqual$4, isEqual, isEqual$2];
+const numbers = [RenderEventListeners, RenderItems, RenderBounds, RenderUid, RenderFocusContext];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1384,6 +1401,18 @@ const getKeyBindings = () => {
   }];
 };
 
+const handleSashPointerDown = (state, eventX, eventY) => {
+  return state;
+};
+
+const handleSashPointerMove = (state, eventX, eventY) => {
+  return state;
+};
+
+const handleSashPointerUp = (state, eventX, eventY) => {
+  return state;
+};
+
 const getPortTuple = () => {
   const {
     port1,
@@ -1430,9 +1459,27 @@ const initialize = async () => {
   set(rpc);
 };
 
+const getPositionAtCursor = async editorUid => {
+  const position = await invoke('Editor.getPositionAtCursor', editorUid);
+  return position;
+};
+
+const getWordAtOffset = getWordAtOffset2;
+
 const loadContent = async state => {
+  const {
+    editorUid
+  } = state;
+  const wordAtOffset = await getWordAtOffset(editorUid);
+  const {
+    x,
+    y
+  } = await getPositionAtCursor(editorUid);
   return {
-    ...state
+    ...state,
+    leadingWord: wordAtOffset,
+    x,
+    y
   };
 };
 
@@ -1460,6 +1507,7 @@ const renderContent = (oldState, newState) => {
   return [SetDom2, uid, dom];
 };
 
+const HandleSashPointerDown = 'handleSashPointerDown';
 const HandleWheel = 'handleWheel';
 
 const getEventListeners = () => {
@@ -1482,6 +1530,109 @@ const renderFocusContext = (oldState, newState) => {
   return [/* method */'Viewlet.setFocusContext', FocusEditorRename];
 };
 
+const HoverDisplayString = 'HoverDisplayString';
+const HoverDocumentation = 'HoverDocumentation';
+const HoverEditorRow = 'HoverEditorRow';
+const HoverProblem = 'HoverProblem';
+const HoverProblemDetail = 'HoverProblemDetail';
+const HoverProblemMessage = 'HoverProblemMessage';
+
+const Div = 4;
+const Span = 8;
+
+const text = data => {
+  return {
+    type: Text,
+    text: data,
+    childCount: 0
+  };
+};
+
+const getLineInfoVirtualDom = lineInfo => {
+  const dom = [{
+    type: Div,
+    className: HoverEditorRow,
+    childCount: lineInfo.length / 2
+  }];
+  for (let i = 0; i < lineInfo.length; i += 2) {
+    const tokenText = lineInfo[i];
+    const tokenClass = lineInfo[i + 1];
+    dom.push({
+      type: Span,
+      className: tokenClass,
+      childCount: 1
+    }, text(tokenText));
+  }
+  return dom;
+};
+const getLineInfosVirtualDom = lineInfos => {
+  const dom = lineInfos.flatMap(getLineInfoVirtualDom);
+  return dom;
+};
+
+const hoverProblemMessage = {
+  type: Span,
+  className: HoverProblemMessage,
+  childCount: 1
+};
+const hoverProblemDetail = {
+  type: Span,
+  className: HoverProblemDetail,
+  childCount: 1
+};
+const getChildCount = (lineInfos, documentation, diagnostics) => {
+  const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
+  return lineInfos.length + documentation ? 1 : 0 + diagnosticsCount;
+};
+const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
+  const dom = [];
+  dom.push({
+    type: Div,
+    className: 'Viewlet EditorHover',
+    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1
+  });
+  if (diagnostics && diagnostics.length > 0) {
+    dom.push({
+      type: Div,
+      className: `${HoverDisplayString} ${HoverProblem}`,
+      childCount: diagnostics.length * 2
+    });
+    for (const diagnostic of diagnostics) {
+      dom.push(hoverProblemMessage, text(diagnostic.message), hoverProblemDetail, text(`${diagnostic.source} (${diagnostic.code})`));
+    }
+  }
+  if (lineInfos.length > 0) {
+    const lineInfosDom = getLineInfosVirtualDom(lineInfos);
+    dom.push({
+      type: Div,
+      className: HoverDisplayString,
+      childCount: lineInfos.length
+    }, ...lineInfosDom);
+  }
+  if (documentation) {
+    dom.push({
+      type: Div,
+      className: HoverDocumentation,
+      childCount: 1
+    }, text(documentation));
+  }
+  dom.push({
+    type: Div,
+    className: 'Sash SashVertical SashResize',
+    childCount: 0,
+    onPointerDown: HandleSashPointerDown
+  });
+  return dom;
+};
+
+const renderItems = (oldState, newState) => {
+  const {
+    uid
+  } = newState;
+  const dom = getHoverVirtualDom([], {}, {});
+  return [/* method */'Viewlet.setDom2', uid, dom];
+};
+
 const renderUid = (oldState, newState) => {
   const {
     uid,
@@ -1502,6 +1653,8 @@ const getRenderer = diffType => {
       return renderUid;
     case RenderFocusContext:
       return renderFocusContext;
+    case RenderItems:
+      return renderItems;
     default:
       throw new Error('unknown renderer');
   }
@@ -1531,16 +1684,19 @@ const terminate = () => {
 };
 
 const commandMap = {
-  'Hovers.close': wrapCommand(close),
-  'Hovers.create': create,
-  'Hovers.diff2': diff2,
-  'Hovers.dispose': dispose,
-  'Hovers.getCommandIds': getCommandIds,
-  'Hovers.getKeyBindings': getKeyBindings,
-  'Hovers.initialize': initialize,
-  'Hovers.loadContent': wrapCommand(loadContent),
-  'Hovers.render2': render2,
-  'Hovers.terminate': terminate
+  'Hover.close': wrapCommand(close),
+  'Hover.create': create,
+  'Hover.diff2': diff2,
+  'Hover.dispose': dispose,
+  'Hover.getCommandIds': getCommandIds,
+  'Hover.getKeyBindings': getKeyBindings,
+  'Hover.initialize': initialize,
+  'Hover.loadContent': wrapCommand(loadContent),
+  'Hover.render2': render2,
+  'Hover.handleSashPointerUp': wrapCommand(handleSashPointerUp),
+  'Hover.handleSashPointerDown': wrapCommand(handleSashPointerDown),
+  'Hover.handleSashPointerMove': wrapCommand(handleSashPointerMove),
+  'Hover.terminate': terminate
 };
 
 const listen = async () => {

package/package.json

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