@lvce-editor/editor-worker 19.29.2 → 19.29.3

package/dist/editorWorkerMain.js

@@ -1903,9 +1903,9 @@ const codeGeneratorAccept = state => {
 
 const ModuleWorkerAndWorkaroundForChromeDevtoolsBug = 6;
 
-const launchWorker = async (name, url, intializeCommand) => {
+const launchWorker = async (name, url, intializeCommand, commandMap = {}) => {
   const rpc = await create$e({
-    commandMap: {},
+    commandMap,
     isMessagePortOpen: true,
     async send(port) {
       await invokeAndTransfer('IpcParent.create', {
@@ -1985,6 +1985,14 @@ const Empty = 0;
 const FindWidget = 16;
 const FocusEditorHover = 51;
 const FocusEditorRename$1 = 11;
+const FocusFindWidgetCloseButton = 48;
+const FocusFindWidgetNextMatchButton = 49;
+const FocusFindWidgetOptions = 44;
+const FocusFindWidgetPreviousMatchButton = 50;
+const FocusFindWidgetReplace$1 = 43;
+const FocusFindWidgetReplaceAllButton = 47;
+const FocusFindWidgetReplaceButton = 46;
+const FocusFindWidgetToggleReplace = 42;
 const SourceActions = 38;
 const FocusCodeGenerator = 52;
 
@@ -4069,7 +4077,7 @@ const getSelectionFromChange = change => {
     start: newPosition
   };
 };
-const setSelections$1 = (editor, selections) => {
+const setSelections$2 = (editor, selections) => {
   object(editor);
   const {
     foldingRanges = []
@@ -4187,7 +4195,7 @@ const applyAutoClosingRangesEdit = (editor, changes) => {
   return newAutoClosingRanges;
 };
 const scheduleSelections = (editor, selectionEdits) => {
-  return setSelections$1(editor, selectionEdits);
+  return setSelections$2(editor, selectionEdits);
 };
 const updateLines = (editor, lines) => {
   const newEditor = {
@@ -4868,7 +4876,7 @@ const renderWidgets$1 = (oldState, newState) => {
   record(newState.uid, declaredRevision);
   const widgetUids = newWidgets.map(widget => widget.newState.uid);
   const allCommands = [...addCommands, ...changeCommands, ['Viewlet.setWidgets', newState.uid, declaredRevision, widgetUids]];
-  return allCommands.filter(item => item[0] !== 'Viewlet.setFocusContext' && item[0] !== 'Viewlet.appendToBody');
+  return allCommands.filter(item => item[0] !== 'Viewlet.appendToBody' && (item[0] !== 'Viewlet.setFocusContext' || item.length >= 3));
 };
 
 const disposeEditor = async editorUid => {
@@ -4978,7 +4986,7 @@ const error = (...args) => {
   console.error(...args);
 };
 
-const applyDocumentEdits = (editor, edits) => {
+const applyDocumentEdits$1 = (editor, edits) => {
   if (!Array.isArray(edits)) {
     warn('something is wrong with format on save', edits);
     return editor;
@@ -5354,7 +5362,7 @@ const expectedErrorMessage = 'Failed to execute formatting provider: FormattingE
 const format = async editor => {
   try {
     const edits = await getFormattingEdits(editor);
-    return applyDocumentEdits(editor, edits);
+    return applyDocumentEdits$1(editor, edits);
   } catch (error) {
     if (isFormattingError(error)) {
       console.error('Formatting Error:',
@@ -5683,7 +5691,7 @@ const closeCompletion = editor => {
 const isMatchingWidget$1 = widget => {
   return widget.id === Find;
 };
-const closeFind = editor => {
+const closeFind$1 = editor => {
   const {
     widgets
   } = editor;
@@ -8671,10 +8679,83 @@ const addWidget = (widget, id, render) => {
   return allCommands;
 };
 
+const getEditor$1 = editorUid => {
+  const instance = get$8(editorUid);
+  if (!instance) {
+    throw new Error(`editor ${editorUid} not found`);
+  }
+  const {
+    newState
+  } = instance;
+  return newState;
+};
+
+const setFocus = async focusKey => {
+  await invoke$a('Focus.setFocus', focusKey);
+};
+const unsetAdditionalFocus = async focusKey => {
+  if (!focusKey) {
+    return;
+  }
+  // @ts-ignore
+  await invoke$a('Focus.removeAdditionalFocus', focusKey);
+};
+
+const FocusEditor = 12;
+const FocusEditorCompletions = 9;
+const FocusEditorRename = 11;
+const FocusEditorText = 12;
+const FocusFindWidget = 16;
+const FocusSourceActions = 38;
+const FocusFindWidgetReplace = 43;
+const FocusEditorCodeGenerator = 52;
+const FocusColorPicker = 41;
+
+const updateEditor = async (editorUid, editor, newEditor) => {
+  if (newEditor === editor) {
+    return;
+  }
+  const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
+  set$8(editorUid, editor, newEditorWithDerivedState);
+};
+const applyDocumentEdits = async (editorUid, edits) => {
+  const editor = getEditor$1(editorUid);
+  const newEditor = await applyDocumentEdits$1(editor, edits);
+  await updateEditor(editorUid, editor, newEditor);
+};
+const closeFind = async editorUid => {
+  const editor = getEditor$1(editorUid);
+  const newEditor = closeFind$1(editor);
+  await updateEditor(editorUid, editor, newEditor);
+  await setFocus(FocusEditorText);
+};
+const getLines = editorUid => {
+  return getEditor$1(editorUid).lines;
+};
+const getSelections$1 = editorUid => {
+  return getEditor$1(editorUid).selections;
+};
+const setSelections$1 = async (editorUid, selections) => {
+  const editor = getEditor$1(editorUid);
+  const newEditor = {
+    ...editor,
+    selections
+  };
+  await updateEditor(editorUid, editor, newEditor);
+};
+
+const getFindWidgetWorkerCommandMap = () => ({
+  'Editor.applyDocumentEdits': applyDocumentEdits,
+  'Editor.closeFind2': closeFind,
+  'Editor.getLines2': getLines,
+  'Editor.getSelections2': getSelections$1,
+  'Editor.setSelections2': setSelections$1
+});
+
 const launchFindWidgetWorker = async () => {
   const name = 'Find Widget Worker';
   const url = 'findWidgetWorkerMain.js';
-  return launchWorker(name, url);
+  return launchWorker(name, url, undefined, getFindWidgetWorkerCommandMap());
 };
 
 const rpcId = 9002;
@@ -8799,7 +8880,7 @@ const getEditorByWidgetUid = (widgetUid, widgetId) => {
   }
   return undefined;
 };
-const getEditor$1 = (editorOrUid, widgetId) => {
+const getEditor = (editorOrUid, widgetId) => {
   if (editorOrUid && editorOrUid.widgets) {
     return editorOrUid;
   }
@@ -8817,7 +8898,7 @@ const createFn = (key, name, widgetId) => {
     return key === 'close' || key === 'handleClickButton' && args.includes(Close);
   };
   const fn = async (editorOrUid, ...args) => {
-    const editor = getEditor$1(editorOrUid, widgetId);
+    const editor = getEditor(editorOrUid, widgetId);
     if (!editor) {
       return editorOrUid;
     }
@@ -8858,7 +8939,7 @@ const createFn = (key, name, widgetId) => {
       commands
     };
     const newEditor = updateWidget(latest, widgetId, newState);
-    set$8(editor.uid, latest, newEditor);
+    set$8(editor.uid, editor, newEditor);
     return newEditor;
   };
   return fn;
@@ -8895,10 +8976,13 @@ const render$c = widget => {
   const commands = renderFull$4(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
+    editorUid,
     uid
   } = widget.newState;
   for (const command of commands) {
-    if (commandsToForward$5.includes(command[0])) {
+    if (command[0] === SetFocusContext) {
+      wrappedCommands.push([command[0], editorUid, ...command.slice(1)]);
+    } else if (commandsToForward$5.includes(command[0])) {
       wrappedCommands.push(command);
     } else {
       wrappedCommands.push(['Viewlet.send', uid, ...command]);
@@ -9017,22 +9101,11 @@ const create$2 = () => {
   return widget;
 };
 
-const getEditor = editorUid => {
-  const instance = get$8(editorUid);
-  if (!instance) {
-    throw new Error(`editor ${editorUid} not found`);
-  }
-  const {
-    newState
-  } = instance;
-  return newState;
-};
-
 const loadContent$2 = async (state, parentUid) => {
   const {
     uid
   } = state;
-  const editor = getEditor(parentUid);
+  const editor = getEditor$1(parentUid);
   const {
     height,
     width,
@@ -9176,7 +9249,7 @@ const getOrganizeImportEdits = async editor => {
 
 const organizeImports = async editor => {
   const edits = await getOrganizeImportEdits(editor);
-  return applyDocumentEdits(editor, edits);
+  return applyDocumentEdits$1(editor, edits);
 };
 
 // @ts-ignore
@@ -11185,7 +11258,7 @@ const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...par
   const isWidget = widget => {
     return widget.id === widgetId;
   };
-  const latestEditor = getEditor(editor.uid);
+  const latestEditor = getEditor$1(editor.uid);
   const childIndex1 = latestEditor.widgets.findIndex(isWidget);
   if (childIndex1 === -1) {
     return latestEditor;
@@ -11235,81 +11308,55 @@ const getWordAtOffset = editor => {
   return '';
 };
 
-const setFocus = async focusKey => {
-  await invoke$a('Focus.setFocus', focusKey);
-};
-const unsetAdditionalFocus = async focusKey => {
-  if (!focusKey) {
-    return;
-  }
-  // @ts-ignore
-  await invoke$a('Focus.removeAdditionalFocus', focusKey);
-};
-
-const FocusEditor = 12;
-const FocusEditorCompletions = 9;
-const FocusEditorRename = 11;
-const FocusEditorText = 12;
-const FocusFindWidget = 16;
-const FocusSourceActions = 38;
-const FocusFindWidgetReplace = 43;
-const FocusFindWidgetReplaceButton = 46;
-const FocusFindWidgetReplaceAllButton = 47;
-const FocusFindWidgetCloseButton = 48;
-const FocusFindWidgetNextMatchButton = 49;
-const FocusFindWidgetPreviousMatchButton = 50;
-const FocusEditorCodeGenerator = 52;
-const FocusColorPicker = 41;
-
 const getPositionAtCursor = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return getPositionAtCursor$1(editor);
 };
 const getUri = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return editor.uri;
 };
 const getLanguageId = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return editor.languageId;
 };
 const getOffsetAtCursor = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return getOffsetAtCursor$1(editor);
 };
 const getWordAt = (editorUid, rowIndex, columnIndex) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     word
   } = getWordAt$1(editor, rowIndex, columnIndex);
   return word;
 };
 const getWordAtOffset2 = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const word = getWordAtOffset(editor);
   return word;
 };
 const getWordBefore2 = (editorUid, rowIndex, columnIndex) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const word = getWordBefore(editor, rowIndex, columnIndex);
   return word;
 };
 const getLines2 = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     lines
   } = editor;
   return lines;
 };
 const getSelections2 = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     selections
   } = editor;
   return selections;
 };
 const setSelections2 = async (editorUid, selections) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const newEditor = {
     ...editor,
     selections
@@ -11318,7 +11365,7 @@ const setSelections2 = async (editorUid, selections) => {
   set$8(editorUid, editor, newEditorWithDerivedState);
 };
 const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocus$1) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const widgetRevision = next(editorUid);
   const invoke = getWidgetInvoke(widgetId);
   const {
@@ -11348,7 +11395,7 @@ const closeFind2 = async editorUid => {
   await closeWidget2(editorUid, Find, 'FindWidget', 0);
 };
 const applyEdits2 = async (editorUid, edits) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const newEditor = await applyEdit(editor, edits);
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
   set$8(editorUid, editor, newEditorWithDerivedState);
@@ -11358,7 +11405,7 @@ const getSourceActions = async editorUid => {
   return actions;
 };
 const getDiagnostics$1 = async editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     diagnostics
   } = editor;
@@ -11369,6 +11416,18 @@ const ensure = async (fontName, fontUrl) => {
   await invoke$b('TextMeasurement.ensureFont', fontName, fontUrl);
 };
 
+const findWidgetFocusContexts = [FindWidget, FocusFindWidgetReplace$1, FocusFindWidgetOptions, FocusFindWidgetToggleReplace, FocusFindWidgetPreviousMatchButton, FocusFindWidgetNextMatchButton, FocusFindWidgetCloseButton, FocusFindWidgetReplaceButton, FocusFindWidgetReplaceAllButton];
+const getFindWidgetFocusKeyBindings = () => {
+  return findWidgetFocusContexts.flatMap(focusContext => [{
+    command: 'FindWidget.focusNextElement',
+    key: Tab$1,
+    when: focusContext
+  }, {
+    command: 'FindWidget.focusPreviousElement',
+    key: Shift | Tab$1,
+    when: focusContext
+  }]);
+};
 const getKeyBindings = () => {
   return [{
     command: 'Editor.closeColorPicker',
@@ -11398,6 +11457,10 @@ const getKeyBindings = () => {
     command: 'EditorSourceActions.selectCurrent',
     key: Enter,
     when: FocusSourceActions
+  }, {
+    command: 'FindWidget.replace',
+    key: Enter,
+    when: FocusFindWidgetReplace
   }, {
     command: 'FindWidget.focusNext',
     key: Enter,
@@ -11418,62 +11481,10 @@ const getKeyBindings = () => {
     command: 'FindWidget.focusNext',
     key: F4,
     when: FocusFindWidget
-  }, {
-    command: 'FindWidget.focusToggleReplace',
-    key: Shift | Tab$1,
-    when: FocusFindWidget
-  }, {
-    command: 'FindWidget.focusReplace',
-    key: Tab$1,
-    when: FocusFindWidget
-  }, {
-    command: 'FindWidget.focusPreviousMatchButton',
-    key: Tab$1,
-    when: FocusFindWidgetReplace
-  }, {
+  }, ...getFindWidgetFocusKeyBindings(), {
     command: 'FindWidget.replaceAll',
     key: Alt$1 | CtrlCmd | Enter,
     when: FocusFindWidgetReplace
-  }, {
-    command: 'FindWidget.focusNextMatchButton',
-    key: Tab$1,
-    when: FocusFindWidgetPreviousMatchButton
-  }, {
-    command: 'FindWidget.focusReplace',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetPreviousMatchButton
-  }, {
-    command: 'FindWidget.focusPreviousMatchButton',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetNextMatchButton
-  }, {
-    command: 'FindWidget.focusCloseButton',
-    key: Tab$1,
-    when: FocusFindWidgetNextMatchButton
-  }, {
-    command: 'FindWidget.focusNextMatchButton',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetCloseButton
-  }, {
-    command: 'FindWidget.focusReplaceButton',
-    key: Tab$1,
-    when: FocusFindWidgetCloseButton
-  }, {
-    command: 'FindWidget.focusFind',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetReplace
-  }, {
-    command: 'FindWidget.focusReplaceAllButton',
-    key: Tab$1,
-    when: FocusFindWidgetReplaceButton
-  }, {
-    command: 'FindWidget.focusCloseButton',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetReplaceButton
-  }, {
-    command: 'FindWidget.focusReplaceButton',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetReplaceAllButton
   }, {
     command: 'EditorCompletion.focusNext',
     key: DownArrow,
@@ -11951,7 +11962,7 @@ const getQuickPickMenuEntries = () => {
 };
 
 const getSelections = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     selections
   } = editor;
@@ -11960,7 +11971,7 @@ const getSelections = editorUid => {
 
 const getText = editorUid => {
   number(editorUid);
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     lines
   } = editor;
@@ -13720,7 +13731,7 @@ const commandMap = {
   'ColorPicker.loadContent': loadContent$3,
   'Editor.addCursorAbove': wrapCommand(addCursorAbove),
   'Editor.addCursorBelow': wrapCommand(addCursorBelow),
-  'Editor.applyDocumentEdits': wrapCommand(applyDocumentEdits),
+  'Editor.applyDocumentEdits': wrapCommand(applyDocumentEdits$1),
   'Editor.applyEdit': wrapCommand(applyEdit),
   'Editor.applyEdit2': applyEdits2,
   'Editor.applyWorkspaceEdit': wrapCommand(applyWorkspaceEdit),
@@ -13729,7 +13740,7 @@ const commandMap = {
   'Editor.closeCodeGenerator': wrapCommand(closeCodeGenerator),
   'Editor.closeColorPicker': wrapCommand(closeColorPicker),
   'Editor.closeCompletion': wrapCommand(closeCompletion),
-  'Editor.closeFind': wrapCommand(closeFind),
+  'Editor.closeFind': wrapCommand(closeFind$1),
   'Editor.closeFind2': closeFind2,
   'Editor.closeRename': wrapCommand(closeRename),
   'Editor.closeSourceAction': wrapCommand(closeSourceAction),

package/package.json

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