@lvce-editor/editor-worker 4.4.0 → 4.6.0

package/dist/editorWorkerMain.js

@@ -1736,9 +1736,26 @@ 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';
 
+const ColorPicker$2 = 41;
+const CompletionDetail$1 = 999;
+const EditorCompletion = 9;
+const Empty = 0;
+const FindWidget = 16;
+const FocusEditorHover = 51;
+const FocusEditorRename = 11;
+const FocusFindWidgetCloseButton = 48;
+const FocusFindWidgetNextMatchButton = 49;
+const FocusFindWidgetPreviousMatchButton = 50;
+const FocusFindWidgetReplace = 43;
+const FocusFindWidgetReplaceAllButton = 47;
+const FocusFindWidgetReplaceButton = 46;
+const FocusFindWidgetToggleReplace = 42;
+const SourceActions = 38;
+
 const measureCharacterWidth = (fontWeight, fontSize, fontFamily, letterSpacing) => {
   return measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
 };
@@ -1852,7 +1869,8 @@ const createEditor = async ({
     charWidth,
     uid: id,
     id,
-    widgets: []
+    widgets: [],
+    focusKey: Empty
   };
   // TODO avoid creating intermediate editors here
   const newEditor1 = setBounds(editor, x, y, width, height, 9);
@@ -1930,14 +1948,13 @@ const applyEdit = async (editor, changes) => {
 };
 
 const handleBlur$2 = editor => {
-  // for (const listener of state.blurListeners) {
-  //   listener(editor)
-  // }
-  // TODO save on blur
-  // Command.execute(/* Main.save */ 89)
+  if (editor.focusKey !== Empty) {
+    return editor;
+  }
   const newEditor = {
     ...editor,
-    focused: false
+    focused: false,
+    focusKey: Empty
   };
   return newEditor;
 };
@@ -2257,10 +2274,25 @@ 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$2 = 'colorPicker';
+const ColorPicker$1 = 'colorPicker';
 const Completion = 'completion';
-const CompletionDetail$1 = 'completionDetail';
+const CompletionDetail = 'completionDetail';
 const Find = 'find';
 const Hover = 'hover';
 const Rename = 'rename';
@@ -2277,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
@@ -2295,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
@@ -2314,9 +2346,10 @@ 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,
     widgets: newWidgets
   };
 };
@@ -2332,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
@@ -2383,9 +2416,12 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
   } else {
     await setAdditionalFocus(focusKey);
   }
+  const newFocus = fullFocus ? false : true;
   const newEditor = {
     ...editor,
-    widgets: newWidgets
+    widgets: newWidgets,
+    focusKey,
+    focused: newFocus
   };
   return newEditor;
 };
@@ -2397,7 +2433,7 @@ const create$7 = () => {
 const create$6 = () => {
   const completionUid = create$7();
   const widget = {
-    id: ColorPicker$2,
+    id: ColorPicker$1,
     oldState: {
       color: '',
       offsetX: 0,
@@ -2424,27 +2460,11 @@ const create$6 = () => {
   return widget;
 };
 
-const ColorPicker$1 = 41;
-const CompletionDetail = 999;
-const EditorCompletion = 9;
-const Empty = 0;
-const FindWidget = 16;
-const FocusEditorHover = 51;
-const FocusEditorRename = 11;
-const FocusFindWidgetCloseButton = 48;
-const FocusFindWidgetNextMatchButton = 49;
-const FocusFindWidgetPreviousMatchButton = 50;
-const FocusFindWidgetReplace = 43;
-const FocusFindWidgetReplaceAllButton = 47;
-const FocusFindWidgetReplaceButton = 46;
-const FocusFindWidgetToggleReplace = 42;
-const SourceActions = 38;
-
 const newStateGenerator$1 = state => {
   return loadContent$3(state);
 };
 const openColorPicker = async editor => {
-  return addWidgetToEditor(ColorPicker$2, ColorPicker$1, editor, create$6, newStateGenerator$1);
+  return addWidgetToEditor(ColorPicker$1, ColorPicker$2, editor, create$6, newStateGenerator$1);
 };
 
 const state$6 = {
@@ -4542,6 +4562,7 @@ const create$5 = () => {
   return completionWidget;
 };
 
+const OnRename = 'onRename';
 const OnCompletion = 'onCompletion';
 const OnHover = 'onHover';
 const OnTabCompletion = 'onTabCompletion';
@@ -4565,7 +4586,7 @@ const execute = async ({
   return result;
 };
 
-const combineResults$1 = results => {
+const combineResults$2 = results => {
   return results[0] ?? [];
 };
 const executeCompletionProvider = (editor, offset) => {
@@ -4576,7 +4597,7 @@ const executeCompletionProvider = (editor, offset) => {
     args: [offset],
     noProviderFoundMessage: 'no completion provider found',
     noProviderFoundResult: [],
-    combineResults: combineResults$1
+    combineResults: combineResults$2
   });
 };
 const combineResultsResolve = items => {
@@ -5181,7 +5202,7 @@ const isFind = widget => {
 };
 // TODO don't call renderer worker, set editor state
 // TODO this function should be synchronous
-const focusIndex$1 = (editor, index) => {
+const focusIndex$2 = (editor, index) => {
   const findState = getFindState(editor);
   if (!findState) {
     return editor;
@@ -5224,7 +5245,7 @@ const focusFirst$1 = editor => {
   if (!findState) {
     return editor;
   }
-  return focusIndex$1(editor, 0);
+  return focusIndex$2(editor, 0);
 };
 const focusLast = editor => {
   const findState = getFindState(editor);
@@ -5234,9 +5255,9 @@ const focusLast = editor => {
   const {
     matchCount
   } = findState;
-  return focusIndex$1(editor, matchCount - 1);
+  return focusIndex$2(editor, matchCount - 1);
 };
-const focusNext$1 = editor => {
+const focusNext$2 = editor => {
   const findState = getFindState(editor);
   if (!findState) {
     return editor;
@@ -5248,7 +5269,7 @@ const focusNext$1 = editor => {
   if (matchIndex === matchCount - 1) {
     return focusFirst$1(editor);
   }
-  return focusIndex$1(editor, matchIndex + 1);
+  return focusIndex$2(editor, matchIndex + 1);
 };
 const focusPrevious$1 = editor => {
   const findState = getFindState(editor);
@@ -5261,7 +5282,7 @@ const focusPrevious$1 = editor => {
   if (matchIndex === 0) {
     return focusLast(editor);
   }
-  return focusIndex$1(editor, matchIndex - 1);
+  return focusIndex$2(editor, matchIndex - 1);
 };
 
 const focusNextMatchButton = state => {
@@ -6831,7 +6852,7 @@ const sortLinesAscending = editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-const combineResults = results => {
+const combineResults$1 = results => {
   return results[0];
 };
 const executeTabCompletionProvider = (editor, offset) => {
@@ -6841,7 +6862,7 @@ const executeTabCompletionProvider = (editor, offset) => {
     method: TabCompletionExecuteTabCompletionProvider,
     args: [offset],
     noProviderFoundMessage: 'No tab completion provider found',
-    combineResults,
+    combineResults: combineResults$1,
     noProviderFoundResult: undefined
   });
 };
@@ -7561,7 +7582,7 @@ const editorUnindent = editor => {
 // editor.lines //?
 
 const isCompletionDetailWidget = widget => {
-  return widget.id === CompletionDetail$1;
+  return widget.id === CompletionDetail;
 };
 const closeDetails = editor => {
   const {
@@ -7578,7 +7599,7 @@ const closeDetails = editor => {
   };
 };
 
-const focusIndex = (state, index) => {
+const focusIndex$1 = (state, index) => {
   const newState = {
     ...state,
     focusedIndex: index,
@@ -7589,17 +7610,17 @@ const focusIndex = (state, index) => {
 
 const focusFirst = state => {
   const firstIndex = 0;
-  return focusIndex(state, firstIndex);
+  return focusIndex$1(state, firstIndex);
 };
 
-const focusNext = state => {
+const focusNext$1 = state => {
   const nextIndex = state.focusedIndex + 1;
-  return focusIndex(state, nextIndex);
+  return focusIndex$1(state, nextIndex);
 };
 
 const focusPrevious = state => {
   const previousIndex = state.focusedIndex - 1;
-  return focusIndex(state, previousIndex);
+  return focusIndex$1(state, previousIndex);
 };
 
 // TODO optimize this function to return the minimum number
@@ -7649,7 +7670,7 @@ const handelWheel = (state, deltaMode, deltaY) => {
 const create = () => {
   const completionUid = create$7();
   const completionWidget = {
-    id: CompletionDetail$1,
+    id: CompletionDetail,
     oldState: {
       content: '',
       uid: completionUid,
@@ -7700,7 +7721,7 @@ const openDetails = editor => {
     };
     return newestState;
   };
-  return addWidgetToEditor(CompletionDetail$1, CompletionDetail, editor, create, newStateGenerator);
+  return addWidgetToEditor(CompletionDetail, CompletionDetail$1, editor, create, newStateGenerator);
 };
 
 const getEdits = async (editor, completionItem) => {
@@ -7723,9 +7744,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
@@ -7742,8 +7760,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,
@@ -7781,7 +7798,7 @@ const selectCurrent = editor => {
 };
 
 const getCompletionDetailState = editor => {
-  return getWidgetState(editor, CompletionDetail$1);
+  return getWidgetState(editor, CompletionDetail);
 };
 
 const toggleDetails = editor => {
@@ -8017,10 +8034,67 @@ 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);
 };
 
+const focusIndex = (state, index) => {
+  const newState = {
+    ...state,
+    focusedIndex: index
+  };
+  return newState;
+};
+
+const focusNext = state => {
+  const nextIndex = state.focusedIndex + 1;
+  return focusIndex(state, nextIndex);
+};
+
 const replaceTextOccurrences = (editor, matches, oldValue, newValue) => {
   const ranges = [];
   const oldValueLength = oldValue.length;
@@ -9076,8 +9150,8 @@ const wrapWidgetCommand = (widgetId, fn) => {
 };
 
 const widgetCommands = {
-  'ColorPicker.handleSliderPointerDown': ColorPicker$2,
-  'ColorPicker.handleSliderPointerMove': ColorPicker$2,
+  'ColorPicker.handleSliderPointerDown': ColorPicker$1,
+  'ColorPicker.handleSliderPointerMove': ColorPicker$1,
   // 'FindWidget.focusNext': WidgetId.Find,
   // 'FindWidget.focusPrevious': WidgetId.Find,
   'FindWidget.close': Find,
@@ -9267,8 +9341,8 @@ const commandMap = {
   'EditorCompletion.advance': advance,
   'EditorCompletion.closeDetails': closeDetails,
   'EditorCompletion.focusFirst': focusFirst,
-  'EditorCompletion.focusIndex': focusIndex,
-  'EditorCompletion.focusNext': focusNext,
+  'EditorCompletion.focusIndex': focusIndex$1,
+  'EditorCompletion.focusNext': focusNext$1,
   'EditorCompletion.focusPrevious': focusPrevious,
   'EditorCompletion.handleEditorBlur': handleEditorBlur,
   'EditorCompletion.handleEditorClick': handleEditorClick,
@@ -9280,14 +9354,16 @@ const commandMap = {
   'EditorCompletion.selectCurrent': selectCurrent,
   'EditorCompletion.selectIndex': selectIndex,
   'EditorCompletion.toggleDetails': toggleDetails,
+  'EditorRename.accept': accept,
   'EditorRename.handleBlur': handleBlur,
+  'EditorSourceActions.focusNext': focusNext,
   'FindWidget.close': close$1,
   'FindWidget.focusCloseButton': focusCloseButton,
   'FindWidget.focusFind': focusFind,
   'FindWidget.focusFirst': focusFirst$1,
-  'FindWidget.focusIndex': focusIndex$1,
+  'FindWidget.focusIndex': focusIndex$2,
   'FindWidget.focusLast': focusLast,
-  'FindWidget.focusNext': focusNext$1,
+  'FindWidget.focusNext': focusNext$2,
   'FindWidget.focusNextMatchButton': focusNextMatchButton,
   'FindWidget.focusPrevious': focusPrevious$1,
   'FindWidget.focusPreviousMatchButton': focusPreviousMatchButton,
@@ -10783,9 +10859,9 @@ const add$3 = widget => {
 const remove$3 = removeWidget;
 const Commands = {
   'FindWidget.close': close$1,
-  'FindWidget.focusNext': focusNext$1,
+  'FindWidget.focusNext': focusNext$2,
   'FindWidget.focusPrevious': focusPrevious$1,
-  'FindWidget.focusIndex': focusIndex$1,
+  'FindWidget.focusIndex': focusIndex$2,
   'FindWidget.focusLast': focusLast,
   'FindWidget.toggleReplace': toggleReplace,
   'FindWidget.handleFocus': focusFind,
@@ -11012,9 +11088,9 @@ const EditorSourceActionWidget = {
 };
 
 const registerWidgets = () => {
-  set$7(ColorPicker$2, EditorColorPickerWidget);
+  set$7(ColorPicker$1, EditorColorPickerWidget);
   set$7(Completion, EditorCompletionWidget);
-  set$7(CompletionDetail$1, EditorCompletionDetailWidget);
+  set$7(CompletionDetail, EditorCompletionDetailWidget);
   set$7(Find, EditorFindWidget);
   set$7(Hover, EditorHoverWidget);
   set$7(Rename, EditorRenameWidget);

package/package.json

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