@lvce-editor/editor-worker 7.21.0 → 8.0.0

package/dist/editorWorkerMain.js

@@ -3957,7 +3957,6 @@ const EscapeToClose = 'Escape to close';
 const FormatDocument = 'Format Document';
 const MoveLineDown = 'Move Line Down';
 const MoveLineUp = 'Move Line Up';
-const NoCodeActionsAvailable = 'No code actions available';
 const NoDefinitionFound = 'No definition found';
 const NoDefinitionFoundFor = "No definition found for '{PH1}'";
 const NoTypeDefinitionFound = 'No type definition found';
@@ -3984,9 +3983,6 @@ const noTypeDefinitionFound = () => {
 const sourceAction = () => {
   return i18nString(SourceAction);
 };
-const noCodeActionsAvailable = () => {
-  return i18nString(NoCodeActionsAvailable);
-};
 const escapeToClose = () => {
   return i18nString(EscapeToClose);
 };
@@ -6637,75 +6633,6 @@ const showHover = async state => {
   return state;
 };
 
-const filterActions = (sourceActions, languageId) => {
-  return sourceActions.filter(action => action.languageId === languageId);
-};
-
-// TODO ask extension host worker instead
-const getEditorSourceActions = async editorId => {
-  if (!editorId) {
-    return [];
-  }
-  const {
-    newState
-  } = get$4(editorId);
-  const {
-    languageId
-  } = newState;
-  // @ts-ignore
-  const allActions = await invoke$8('GetEditorSourceActions.getEditorSourceActions');
-  const filtered = filterActions(allActions, languageId);
-  return filtered;
-};
-
-const getHeight = sourceActionCount => {
-  if (sourceActionCount === 0) {
-    return 45;
-  }
-  return 150;
-};
-const getSourceActionWidgetPosition = (editor, sourceActionCount) => {
-  const width = 300;
-  const height = getHeight(sourceActionCount);
-  const cursor = getPositionAtCursor$1(editor);
-  const {
-    x
-  } = cursor;
-  const {
-    y
-  } = cursor;
-  // TODO support virtual list
-  return {
-    x,
-    y,
-    width,
-    height
-  };
-};
-
-const loadSourceActions = async (editor, state) => {
-  // const editor = GetEditor.getEditor(editorUid)
-  // TODO request source actions information from extensions
-  const sourceActions = await getEditorSourceActions();
-  // TODO avoid side effect
-  const {
-    x,
-    y,
-    width,
-    height
-  } = getSourceActionWidgetPosition(editor, sourceActions.length);
-  return {
-    ...state,
-    sourceActions,
-    x,
-    y,
-    width,
-    height,
-    maxHeight: 150,
-    focusedIndex: 0
-  };
-};
-
 const create = () => {
   const completionUid = create$7();
   const widget = {
@@ -6736,13 +6663,6 @@ const create = () => {
   return widget;
 };
 
-const showSourceActions$1 = async editor => {
-  const newStateGenerator = async state => {
-    return loadSourceActions(editor, state);
-  };
-  return addWidgetToEditor(SourceAction$1, SourceActions, editor, create, newStateGenerator);
-};
-
 const launchSourceActionWorker = async () => {
   const name = 'Source Action Worker';
   const url = 'sourceActionWorkerMain.js';
@@ -7586,6 +7506,7 @@ const isFunctional = widgetId => {
     case Rename:
     case Completion:
     case Find:
+    case SourceAction$1:
       return true;
     default:
       return false;
@@ -7716,7 +7637,7 @@ const renderFull$4 = (oldState, newState) => {
   return commands;
 };
 
-const render$c = widget => {
+const render$b = widget => {
   const commands = renderFull$4(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
@@ -7732,7 +7653,7 @@ const render$c = widget => {
   return wrappedCommands;
 };
 const add$7 = widget => {
-  return addWidget$1(widget, 'EditorCompletion', render$c);
+  return addWidget$1(widget, 'EditorCompletion', render$b);
 };
 const remove$7 = widget => {
   return [['Viewlet.dispose', widget.newState.uid]];
@@ -7773,7 +7694,7 @@ const EditorCompletionWidget = {
   handleWheel: handleWheel$1,
   openDetails,
   remove: remove$7,
-  render: render$c,
+  render: render$b,
   selectCurrent: selectCurrent$1,
   selectIndex: selectIndex$1,
   toggleDetails: toggleDetails$1
@@ -7786,7 +7707,7 @@ const renderFull$3 = (oldState, newState) => {
   return commands;
 };
 
-const render$b = widget => {
+const render$a = widget => {
   const commands = renderFull$3(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
@@ -7802,7 +7723,7 @@ const render$b = widget => {
   return wrappedCommands;
 };
 const add$6 = widget => {
-  return addWidget$1(widget, 'FindWidget', render$b);
+  return addWidget$1(widget, 'FindWidget', render$a);
 };
 const remove$6 = widget => {
   return [['Viewlet.dispose', widget.newState.uid]];
@@ -7849,7 +7770,7 @@ const EditorFindWidget = {
   handleReplaceInput,
   handleToggleReplaceFocus,
   remove: remove$6,
-  render: render$b,
+  render: render$a,
   toggleReplace
 };
 
@@ -7904,8 +7825,6 @@ const EditorCursor = 'EditorCursor';
 const EditorRow = 'EditorRow';
 const EditorRowHighlighted = 'EditorRowHighlighted';
 const EditorSelection = 'EditorSelection';
-const EditorSourceActions = 'EditorSourceActions';
-const EditorSourceActionsList = 'EditorSourceActionsList';
 const HoverDisplayString = 'HoverDisplayString';
 const HoverDocumentation = 'HoverDocumentation';
 const HoverEditorRow = 'HoverEditorRow';
@@ -7915,16 +7834,10 @@ const HoverProblemMessage = 'HoverProblemMessage';
 const IconClose = 'IconClose';
 const InputBox = 'InputBox';
 const MaskIcon = 'MaskIcon';
-const MaskIconSymbolFile = 'MaskIconSymbolFile';
-const SourceActionHeading = 'SourceActionHeading';
-const SourceActionIcon = 'SourceActionIcon';
-const SourceActionItem = 'SourceActionItem';
-const SourceActionItemFocused = 'SourceActionItemFocused';
 const Viewlet = 'Viewlet';
 
 const HandleBeforeInput = 'handleBeforeInput';
 const HandleBlur = 'handleBlur';
-const HandleClick = 'handleClick';
 const HandleClose = 'handleClose';
 const HandleCompositionEnd = 'handleCompositionEnd';
 const HandleCompositionStart = 'handleCompositionStart';
@@ -7932,7 +7845,6 @@ const HandleCompositionUpdate = 'handleCompositionUpdate';
 const HandleContextMenu = 'handleContextMenu';
 const HandleCut = 'handleCut';
 const HandleFocus = 'handleFocus';
-const HandleFocusIn = 'handleFocusIn';
 const HandleMouseMove = 'handleMouseMove';
 const HandleSashPointerDown = 'handleSashPointerDown';
 const HandleWheel = 'handleWheel';
@@ -8035,7 +7947,7 @@ const renderHoverDom = {
     return [/* method */SetDom2, dom];
   }
 };
-const renderBounds$3 = {
+const renderBounds$2 = {
   isEqual(oldState, newState) {
     return oldState.x === newState.x && oldState.y === newState.y;
   },
@@ -8049,10 +7961,10 @@ const renderBounds$3 = {
     return [SetBounds, x, y, width, height];
   }
 };
-const render$a = [renderHoverDom, renderBounds$3];
+const render$9 = [renderHoverDom, renderBounds$2];
 const renderHover = (oldState, newState) => {
   const commands = [];
-  for (const item of render$a) {
+  for (const item of render$9) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(item.apply(oldState, newState));
     }
@@ -8060,7 +7972,7 @@ const renderHover = (oldState, newState) => {
   return commands;
 };
 
-const render$9 = widget => {
+const render$8 = widget => {
   const commands = renderFull$4(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
@@ -8076,7 +7988,7 @@ const render$9 = widget => {
   return wrappedCommands;
 };
 const add$5 = widget => {
-  return addWidget$1(widget, 'EditorRename', render$9);
+  return addWidget$1(widget, 'EditorRename', render$8);
 };
 const remove$5 = widget => {
   return [['Viewlet.dispose', widget.newState.uid]];
@@ -8094,7 +8006,7 @@ const EditorRenameWidget = {
   close: close$1,
   handleInput,
   remove: remove$5,
-  render: render$9
+  render: render$8
 };
 
 const rerender = editor => {
@@ -8120,127 +8032,14 @@ const removeWidget$1 = widget => {
   return [['Viewlet.send', widget.newState.uid, 'dispose']];
 };
 
-const getEditorMessageVirtualDom = message => {
-  const dom = [{
-    type: Div,
-    className: 'Viewlet EditorMessage',
-    tabIndex: -1,
-    childCount: 2
-  }, {
-    type: Div,
-    className: 'EditorMessageText',
-    childCount: 1
-  }, text(message), {
-    type: Div,
-    className: 'EditorMessageTriangle',
-    childCount: 0
-  }];
-  return dom;
-};
-
-const getEmptySourceActionsVirtualDom = () => {
-  return getEditorMessageVirtualDom(noCodeActionsAvailable());
-};
-
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
-const getActionClassName = isFocused => {
-  if (isFocused) {
-    return mergeClassNames(SourceActionItem, SourceActionItemFocused);
-  }
-  return SourceActionItem;
-};
-const getSourceActionListItemVirtualDom = sourceAction => {
-  const {
-    name,
-    isFocused
-  } = sourceAction;
-  const actionClassName = getActionClassName(isFocused);
-  return [{
-    type: Div,
-    className: actionClassName,
-    childCount: 2
-  }, {
-    type: Div,
-    className: mergeClassNames(SourceActionIcon, MaskIcon, MaskIconSymbolFile)
-  }, text(name)];
-};
-
-const getSourceActionsVirtualDom = sourceActions => {
-  if (sourceActions.length === 0) {
-    return getEmptySourceActionsVirtualDom();
-  }
-  const dom = [{
-    type: Div,
-    className: mergeClassNames(Viewlet, EditorSourceActions),
-    tabIndex: -1,
-    childCount: 2,
-    onFocusIn: HandleFocusIn
-  }, {
-    type: Div,
-    className: SourceActionHeading,
-    childCount: 1
-  }, text(sourceAction()), {
-    type: Div,
-    className: EditorSourceActionsList,
-    childCount: sourceActions.length,
-    onClick: HandleClick
-  }, ...sourceActions.flatMap(getSourceActionListItemVirtualDom)];
-  return dom;
-};
-
-const getVisibleSourceActions = (sourceActions, focusedIndex) => {
-  const visible = [];
-  for (let i = 0; i < sourceActions.length; i++) {
-    const isFocused = i === focusedIndex;
-    const sourceAction = sourceActions[i];
-    visible.push({
-      ...sourceAction,
-      isFocused
-    });
-  }
-  return visible;
-};
-
-const renderSourceActions = {
-  isEqual(oldState, newState) {
-    return oldState.sourceActions === newState.sourceActions && oldState.focusedIndex === newState.focusedIndex;
-  },
-  apply(oldStatem, newState) {
-    const visible = getVisibleSourceActions(newState.sourceActions, newState.focusedIndex);
-    const dom = getSourceActionsVirtualDom(visible);
-    return [SetDom2, newState.uid, dom];
-  }
-};
-const renderBounds$2 = {
-  isEqual(oldState, newState) {
-    return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
-  },
-  apply(oldState, newState) {
-    return [SetBounds, newState.x, newState.y, newState.width, newState.height];
-  }
-};
-const render$8 = [renderSourceActions, renderBounds$2];
-const doRender = (oldState, newState) => {
-  const commands = [];
-  for (const item of render$8) {
-    if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
-    }
-  }
-  return commands;
-};
-
 const render$7 = widget => {
-  const commands = doRender(widget.oldState, widget.newState);
+  const commands = renderFull$4(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
   } = widget.newState;
   for (const command of commands) {
-    if (command[0] === SetDom2) {
+    if (command[0] === SetDom2 || command[0] === SetCss || command[0] === AppendToBody || command[0] === SetBounds2 || command[0] === RegisterEventListeners || command[0] === SetSelectionByName || command[0] === SetValueByName || command[0] === SetFocusContext || command[0] === SetUid || command[0] === 'Viewlet.focusSelector') {
       wrappedCommands.push(command);
     } else {
       wrappedCommands.push(['Viewlet.send', uid, ...command]);
@@ -8321,6 +8120,27 @@ const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...par
   return newEditor;
 };
 
+const filterActions = (sourceActions, languageId) => {
+  return sourceActions.filter(action => action.languageId === languageId);
+};
+
+// TODO ask extension host worker instead
+const getEditorSourceActions = async editorId => {
+  if (!editorId) {
+    return [];
+  }
+  const {
+    newState
+  } = get$4(editorId);
+  const {
+    languageId
+  } = newState;
+  // @ts-ignore
+  const allActions = await invoke$8('GetEditorSourceActions.getEditorSourceActions');
+  const filtered = filterActions(allActions, languageId);
+  return filtered;
+};
+
 const RE_WORD = /[\w\-]+$/;
 const getWordAtOffset = editor => {
   const {
@@ -8696,7 +8516,7 @@ const getKeyBindings = () => {
     when: FocusEditorText
   }, {
     key: CtrlCmd | Period,
-    command: 'Editor.showSourceActions2',
+    command: 'Editor.showSourceActions3',
     when: FocusEditorText
   }, {
     key: Tab,
@@ -9691,6 +9511,10 @@ const getDiagnosticClassName = type => {
   }
 };
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
 const getDiagnosticVirtualDom = diagnostic => {
   const {
     x,
@@ -10332,8 +10156,8 @@ const commandMap = {
   'Editor.setSelections2': setSelections2,
   'Editor.showHover': showHover,
   'Editor.showHover2': showHover2,
-  'Editor.showSourceActions': showSourceActions$1,
-  'Editor.showSourceActions2': showSourceActions$1,
+  'Editor.showSourceActions': showSourceActions,
+  'Editor.showSourceActions2': showSourceActions,
   'Editor.showSourceActions3': showSourceActions,
   'Editor.sortLinesAscending': sortLinesAscending,
   'Editor.tabCompletion': tabCompletion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "7.21.0",
+  "version": "8.0.0",
   "license": "MIT",
   "author": "Lvce Editor",
   "type": "module",