@lvce-editor/editor-worker 4.5.0 → 4.7.0

package/dist/editorWorkerMain.js

@@ -1736,6 +1736,7 @@ const {
 const CompletionExecute = 'ExtensionHostCompletion.execute';
 const CompletionResolveExecute = 'ExtensionHostCompletion.executeResolve';
 const HoverExecute = 'ExtensionHostHover.execute';
+const RenameExecuteRename = 'ExtensionHostRename.executeRenameProvider';
 const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompletionProvider';
 const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
 
@@ -2273,6 +2274,21 @@ const cancelSelection = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
+const getIndex = (widgets, id) => {
+  for (let i = 0; i < widgets.length; i++) {
+    const widget = widgets[i];
+    if (widget.id === id) {
+      return i;
+    }
+  }
+  return -1;
+};
+const removeEditorWidget = (widgets, id) => {
+  const index = getIndex(widgets, id);
+  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
+  return newWidgets;
+};
+
 // TODO use numeric widget id
 const ColorPicker$1 = 'colorPicker';
 const Completion = 'completion';
@@ -2293,7 +2309,7 @@ const closeCompletion = editor => {
   if (completionWidgetIndex === -1) {
     return editor;
   }
-  const newWidgets = [...widgets.slice(0, completionWidgetIndex), ...widgets.slice(completionWidgetIndex + 1)];
+  const newWidgets = removeEditorWidget(widgets, Completion);
   return {
     ...editor,
     widgets: newWidgets
@@ -2311,7 +2327,7 @@ const closeFind = editor => {
   if (index === -1) {
     return editor;
   }
-  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
+  const newWidgets = removeEditorWidget(widgets, Find);
   return {
     ...editor,
     widgets: newWidgets
@@ -2330,7 +2346,7 @@ const closeRename = editor => {
   if (renameWidgetIndex === -1) {
     return editor;
   }
-  const newWidgets = [...widgets.slice(0, renameWidgetIndex), ...widgets.slice(renameWidgetIndex + 1)];
+  const newWidgets = removeEditorWidget(widgets, Rename);
   return {
     ...editor,
     focused: true,
@@ -2349,7 +2365,7 @@ const closeSourceAction = editor => {
   if (index === -1) {
     return editor;
   }
-  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
+  const newWidgets = removeEditorWidget(widgets, SourceAction);
   return {
     ...editor,
     widgets: newWidgets
@@ -3341,7 +3357,8 @@ const UiStrings$1 = {
   Replace: 'Replace',
   SourceAction: 'Source Action',
   OrganizeImports: 'Organize Imports',
-  SortImports: 'Sort Imports'
+  SortImports: 'Sort Imports',
+  NoCodeActionsAvailable: 'No code actions available'
 };
 const noDefinitionFound = () => {
   return i18nString(UiStrings$1.NoDefinitionFound);
@@ -3365,6 +3382,9 @@ const noResults$1 = () => {
 const sourceAction = () => {
   return i18nString(UiStrings$1.SourceAction);
 };
+const noCodeActionsAvailable = () => {
+  return i18nString(UiStrings$1.NoCodeActionsAvailable);
+};
 
 // @ts-ignore
 const goTo = async ({
@@ -4546,6 +4566,7 @@ const create$5 = () => {
   return completionWidget;
 };
 
+const OnRename = 'onRename';
 const OnCompletion = 'onCompletion';
 const OnHover = 'onHover';
 const OnTabCompletion = 'onTabCompletion';
@@ -4569,7 +4590,7 @@ const execute = async ({
   return result;
 };
 
-const combineResults$1 = results => {
+const combineResults$2 = results => {
   return results[0] ?? [];
 };
 const executeCompletionProvider = (editor, offset) => {
@@ -4580,7 +4601,7 @@ const executeCompletionProvider = (editor, offset) => {
     args: [offset],
     noProviderFoundMessage: 'no completion provider found',
     noProviderFoundResult: [],
-    combineResults: combineResults$1
+    combineResults: combineResults$2
   });
 };
 const combineResultsResolve = items => {
@@ -6704,12 +6725,19 @@ const getEditorSourceActions = async () => {
   return sourceActions;
 };
 
-const getSourceActionWidgetPosition = editor => {
+const getHeight = sourceActionCount => {
+  if (sourceActionCount === 0) {
+    return 45;
+  }
+  return 150;
+};
+const getSourceActionWidgetPosition = (editor, sourceActionCount) => {
   const width = 300;
-  const height = 150;
+  const height = getHeight(sourceActionCount);
   const cursor = getPositionAtCursor(editor);
   const x = cursor.x;
   const y = cursor.y;
+  // TODO support virtual list
   return {
     x,
     y,
@@ -6728,7 +6756,7 @@ const loadSourceActions = async (editor, state) => {
     y,
     width,
     height
-  } = getSourceActionWidgetPosition(editor);
+  } = getSourceActionWidgetPosition(editor, sourceActions.length);
   return {
     ...state,
     sourceActions,
@@ -6835,7 +6863,7 @@ const sortLinesAscending = editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-const combineResults = results => {
+const combineResults$1 = results => {
   return results[0];
 };
 const executeTabCompletionProvider = (editor, offset) => {
@@ -6845,7 +6873,7 @@ const executeTabCompletionProvider = (editor, offset) => {
     method: TabCompletionExecuteTabCompletionProvider,
     args: [offset],
     noProviderFoundMessage: 'No tab completion provider found',
-    combineResults,
+    combineResults: combineResults$1,
     noProviderFoundResult: undefined
   });
 };
@@ -7727,9 +7755,6 @@ const getEdits = async (editor, completionItem) => {
   const changes = replaceRange(editor, replaceRange$1, [inserted], '');
   return changes;
 };
-const isCompletion = widget => {
-  return widget.id === Completion;
-};
 const select = async (editor, completionItem) => {
   const changes = await getEdits(editor, completionItem);
   const index = editor.widgets.indexOf
@@ -7746,8 +7771,7 @@ const select = async (editor, completionItem) => {
   const {
     widgets
   } = editor;
-  const completionWidgetIndex = editor.widgets.findIndex(isCompletion);
-  const newWidgets = [...widgets.slice(0, completionWidgetIndex), ...widgets.slice(completionWidgetIndex + 1)];
+  const newWidgets = removeEditorWidget(widgets, Completion);
   const intermediateEditor = await applyEdit(editor, changes);
   return {
     ...intermediateEditor,
@@ -7848,6 +7872,7 @@ const ColorPickerSliderThumb = 'ColorPickerSliderThumb';
 const SourceActionItem = 'SourceActionItem';
 const SourceActionItemFocused = 'SourceActionItemFocused';
 const CompletionDetailCloseButton = 'CompletionDetailCloseButton';
+const EditorSourceActionsList = 'EditorSourceActionsList';
 const IconButtonDisabled = 'IconButtonDisabled';
 const IconButton = 'IconButton';
 const SourceActionHeading = 'SourceActionHeading';
@@ -8021,6 +8046,50 @@ const renderHover = (oldState, newState) => {
   return commands;
 };
 
+const combineResults = results => {
+  return results[0] ?? [];
+};
+const executeRenameProvider = (editor, offset, newName) => {
+  return execute({
+    editor,
+    event: OnRename,
+    method: RenameExecuteRename,
+    args: [offset, newName],
+    noProviderFoundMessage: 'no rename provider found',
+    noProviderFoundResult: [],
+    combineResults
+  });
+};
+
+const getRenameState = editor => {
+  return getWidgetState(editor, Rename);
+};
+
+const accept = async editor => {
+  const child = getRenameState(editor);
+  if (!child) {
+    return editor;
+  }
+  const {
+    widgets
+  } = editor;
+  const newWidgets = removeEditorWidget(widgets, Rename);
+  // TODO
+  const offset = getOffsetAtCursor(editor);
+  const result = await executeRenameProvider(editor, offset, child.newValue);
+  console.log({
+    result
+  });
+  // 1. ask extension host for rename edits
+  // 2. apply rename edit across editor (and whole workspace)
+  // 3. close rename widget
+  return {
+    ...editor,
+    focused: true,
+    widgets: newWidgets
+  };
+};
+
 const handleBlur = editor => {
   return closeRename(editor);
 };
@@ -9297,6 +9366,7 @@ const commandMap = {
   'EditorCompletion.selectCurrent': selectCurrent,
   'EditorCompletion.selectIndex': selectIndex,
   'EditorCompletion.toggleDetails': toggleDetails,
+  'EditorRename.accept': accept,
   'EditorRename.handleBlur': handleBlur,
   'EditorSourceActions.focusNext': focusNext,
   'FindWidget.close': close$1,
@@ -10942,7 +11012,32 @@ const getSourceActionListItemVirtualDom = sourceAction => {
   }, text(name)];
 };
 
+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 getSourceActionsVirtualDom = sourceActions => {
+  if (sourceActions.length === 0) {
+    return getEmptySourceActionsVirtualDom();
+  }
   const dom = [{
     type: Div,
     className: 'Viewlet EditorSourceActions',
@@ -10955,7 +11050,7 @@ const getSourceActionsVirtualDom = sourceActions => {
     childCount: 1
   }, text(sourceAction()), {
     type: Div,
-    className: 'EditorSourceActionsList',
+    className: EditorSourceActionsList,
     childCount: sourceActions.length,
     onClick: HandleClick
   }, ...sourceActions.flatMap(getSourceActionListItemVirtualDom)];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "4.5.0",
+  "version": "4.7.0",
   "description": "",
   "main": "dist/editorWorkerMain.js",
   "type": "module",