@lvce-editor/editor-worker 7.15.0 → 7.17.0

package/dist/editorWorkerMain.js

@@ -1188,7 +1188,8 @@ const getPortTuple = () => {
 
 const ModuleWorkerAndWorkaroundForChromeDevtoolsBug = 6;
 
-const launchWorker = async (name, url) => {
+const launchWorker = async (name, url, intializeCommand) => {
+  // TODO use transferMessagePortRpc
   const {
     port1,
     port2
@@ -1207,6 +1208,9 @@ const launchWorker = async (name, url) => {
     isMessagePortOpen: true
   });
   port2.start();
+  if (intializeCommand) {
+    await rpc.invoke(intializeCommand);
+  }
   return rpc;
 };
 
@@ -1261,6 +1265,7 @@ const IndentLess = 'indentLess';
 const IndentMore = 'indentMore';
 const InsertLineBreak = 'insertLineBreak';
 const LineComment = 'lineComment';
+const Rename$1 = 'rename';
 const ToggleBlockComment$1 = 'toggleBlockComment';
 
 const map$1 = Object.create(null);
@@ -1314,7 +1319,7 @@ const get$4 = id => {
   number(id);
   return editors[id];
 };
-const getKeys = () => {
+const getKeys$1 = () => {
   return Object.keys(editors);
 };
 const set$6 = (id, oldEditor, newEditor) => {
@@ -2505,6 +2510,48 @@ const applyEdit = async (editor, changes) => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
+// TODO maybe use a separate worker for bulk edits and bulk edit history
+
+const getTextChanges = (editor, changes) => {
+  const textChanges = [];
+  for (const change of changes) {
+    if (change.uri === editor.uri) {
+      for (const edit of change.edits) {
+        const startPosition = positionAt(editor, edit.offset);
+        const endPosition = positionAt(editor, edit.offset + edit.deleted);
+        const deleted = getSelectionText(editor, {
+          start: startPosition,
+          end: endPosition
+        });
+        const textChange = {
+          start: startPosition,
+          end: endPosition,
+          inserted: [edit.inserted],
+          deleted,
+          origin: Rename$1
+        };
+        textChanges.push(textChange);
+      }
+    }
+  }
+  return textChanges;
+};
+const applyWorkspaceEdit = async (editor, changes) => {
+  object(editor);
+  array(changes);
+  const textChanges = getTextChanges(editor, changes);
+  if (textChanges.length === 0) {
+    return;
+  }
+  // TODO
+  // for now only apply edits to single file, if it matches the uri
+  //
+  // in the future:
+  // 1. if a change targets the current editor, apply an edit to this editor
+  // 2. else, use file system worker to write file change
+  return scheduleDocumentAndCursorsSelections(editor, textChanges);
+};
+
 const handleBlur$1 = editor => {
   if (editor.focusKey !== Empty) {
     return editor;
@@ -2900,11 +2947,7 @@ const launchRenameWorker = async () => {
   const name = 'Rename Worker';
   const url = 'renameWorkerMain.js';
   const rpc = await launchWorker(name, url);
-  try {
-    await rpc.invoke('Rename.initialize');
-  } catch {
-    // ignore
-  }
+  await rpc.invoke('Rename.initialize');
   return rpc;
 };
 
@@ -5217,8 +5260,8 @@ const create$4 = () => {
 const launchCompletionWorker = async () => {
   const name = 'Completion Worker';
   const url = 'completionWorkerMain.js';
-  const rpc = await launchWorker(name, url);
-  await rpc.invoke('Completions.initialize');
+  const intializeCommand = 'Completions.initialize';
+  const rpc = await launchWorker(name, url, intializeCommand);
   return rpc;
 };
 
@@ -5389,7 +5432,6 @@ const create$2 = () => {
 };
 
 const newStateGenerator$1 = async (state, parentUid) => {
-  // const editor: any = {}
   const {
     uid,
     x,
@@ -5397,7 +5439,11 @@ const newStateGenerator$1 = async (state, parentUid) => {
     width,
     height
   } = state;
-  await invoke$4('Rename.create', uid, x, y, width, height, parentUid);
+  const editor = get$4(parentUid);
+  const {
+    languageId
+  } = editor;
+  await invoke$4('Rename.create', uid, x, y, width, height, parentUid, languageId);
   await invoke$4('Rename.loadContent', uid);
   const diff = await invoke$4('Rename.diff2', uid);
   const commands = await invoke$4('Rename.render2', uid, diff);
@@ -7615,7 +7661,7 @@ const render$c = widget => {
   return wrappedCommands;
 };
 const add$7 = widget => {
-  return addWidget$1(widget, 'EditorRename', render$c);
+  return addWidget$1(widget, 'EditorCompletion', render$c);
 };
 const remove$7 = widget => {
   return [['Viewlet.dispose', widget.newState.uid]];
@@ -7636,13 +7682,13 @@ const {
   toggleDetails,
   closeDetails,
   handleWheel,
-  close: close$1
+  close: close$2
 } = createFns(['handleEditorType', 'focusFirst', 'focusNext', 'focusPrevious', 'focusLast', 'handleEditorDeleteLeft', 'openDetails', 'focusIndex', 'handleEditorBlur', 'handleEditorClick', 'openDetails', 'selectCurrent', 'selectIndex', 'toggleDetails', 'closeDetails', 'handleWheel', 'close'], 'Completions', Completion);
 
 const EditorCompletionWidget = {
   __proto__: null,
   add: add$7,
-  close: close$1,
+  close: close$2,
   closeDetails,
   focusFirst,
   focusIndex: focusIndex$1,
@@ -7691,7 +7737,7 @@ const remove$6 = widget => {
   return [['Viewlet.dispose', widget.newState.uid]];
 };
 const {
-  close,
+  close: close$1,
   focusCloseButton,
   focusFind,
   focusNext: focusNext$1,
@@ -7704,7 +7750,7 @@ const {
   focusToggleReplace,
   handleBlur,
   handleFocus,
-  handleInput,
+  handleInput: handleInput$1,
   handleReplaceFocus,
   handleReplaceInput,
   handleToggleReplaceFocus,
@@ -7714,7 +7760,7 @@ const {
 const EditorFindWidget = {
   __proto__: null,
   add: add$6,
-  close,
+  close: close$1,
   focusCloseButton,
   focusFind,
   focusNext: focusNext$1,
@@ -7727,7 +7773,7 @@ const EditorFindWidget = {
   focusToggleReplace,
   handleBlur,
   handleFocus,
-  handleInput,
+  handleInput: handleInput$1,
   handleReplaceFocus,
   handleReplaceInput,
   handleToggleReplaceFocus,
@@ -7943,6 +7989,46 @@ const renderHover = (oldState, newState) => {
   return commands;
 };
 
+const removeWidget$1 = widget => {
+  // @ts-ignore
+  return [['Viewlet.send', widget.newState.uid, 'dispose']];
+};
+
+const render$9 = widget => {
+  const commands = renderFull$4(widget.oldState, widget.newState);
+  const wrappedCommands = [];
+  const {
+    uid
+  } = widget.newState;
+  for (const command of commands) {
+    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]);
+    }
+  }
+  return wrappedCommands;
+};
+const add$5 = widget => {
+  return addWidget$1(widget, 'EditorRename', render$9);
+};
+const remove$5 = removeWidget$1;
+const {
+  handleInput,
+  close,
+  accept
+} = createFns(['handleInput', 'close', 'accept'], 'Rename', Rename);
+
+const EditorRenameWidget = {
+  __proto__: null,
+  accept,
+  add: add$5,
+  close,
+  handleInput,
+  remove: remove$5,
+  render: render$9
+};
+
 const rerender = editor => {
   // TODO avoid slow clone
   return structuredClone(editor);
@@ -8564,13 +8650,17 @@ const getKeyBindings = () => {
   }];
 };
 
+const getKeys = () => {
+  return getKeys$1();
+};
+
 const getDiagnostics = editor => {
   return executeDiagnosticProvider(editor);
 };
 const getProblems = async () => {
   // TODO maybe combine querying diagnostics for problems view with diagnostics for editor
   // or query the diagnostics for the problems view directtly from the extension host worker
-  const keys = getKeys();
+  const keys = getKeys$1();
   const editors = keys.map(key => {
     const numericKey = parseInt(key);
     const editor = get$4(numericKey);
@@ -9490,7 +9580,7 @@ const renderWidget = widget => {
   }
   return module.render(widget);
 };
-const removeWidget$1 = widget => {
+const removeWidget = widget => {
   const module = get$5(widget.id);
   if (!module) {
     throw new Error('unsupported widget');
@@ -9645,7 +9735,7 @@ const renderWidgets = {
     }
     const removeCommands = [];
     for (const removedWidget of removedWidgets) {
-      const childCommands = removeWidget$1(removedWidget);
+      const childCommands = removeWidget(removedWidget);
       if (childCommands.length > 0) {
         removeCommands.push(...childCommands);
       }
@@ -9655,7 +9745,7 @@ const renderWidgets = {
   },
   multiple: true
 };
-const render$9 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets];
+const render$8 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets];
 const renderEditor = async id => {
   const instance = get$4(id);
   if (!instance) {
@@ -9667,7 +9757,7 @@ const renderEditor = async id => {
   } = instance;
   const commands = [];
   set$6(id, newState, newState);
-  for (const item of render$9) {
+  for (const item of render$8) {
     if (!item.isEqual(oldState, newState)) {
       const result = await item.apply(oldState, newState);
       // @ts-ignore
@@ -9733,7 +9823,7 @@ const getDebugHighlight = async debugId => {
 };
 
 const getKey = () => {
-  const keys = getKeys();
+  const keys = getKeys$1();
   return parseInt(keys[0]);
 };
 const updateDebugInfo = async debugId => {
@@ -9767,7 +9857,7 @@ const editorDiagnosticEffect = {
   }
 };
 
-const keep = ['ActivateByEvent.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getOffsetAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.getSelections2', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getUri', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Editor.getLanguageId', 'Editor.getProblems', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
+const keep = ['ActivateByEvent.activateByEvent', 'ExtensionHostManagement.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getOffsetAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.getSelections2', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getUri', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Editor.getLanguageId', 'Editor.getProblems', 'Editor.getKeys', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
 // 'ColorPicker.handleSliderPointerDown',
 // 'ColorPicker.handleSliderPointerMove',
 // 'ColorPicker.loadContent',
@@ -9856,12 +9946,14 @@ const wrapCommands = commands => {
 
 const commandMap = {
   'ActivateByEvent.activateByEvent': activateByEvent,
+  'ExtensionHostManagement.activateByEvent': activateByEvent,
   'CodeGenerator.accept': codeGeneratorAccept,
   'ColorPicker.loadContent': loadContent$2,
   'Editor.addCursorAbove': addCursorAbove,
   'Editor.addCursorBelow': addCursorBelow,
   'Editor.applyEdit': applyEdit,
   'Editor.applyEdit2': applyEdits2,
+  'Editor.applyWorkspaceEdit': applyWorkspaceEdit,
   'Editor.braceCompletion': braceCompletion,
   'Editor.cancelSelection': cancelSelection,
   'Editor.closeCodeGenerator': closeCodeGenerator,
@@ -9907,15 +9999,17 @@ const commandMap = {
   'Editor.findAllReferences': findAllReferences,
   'Editor.format': format,
   'Editor.getKeyBindings': getKeyBindings,
+  'Editor.getKeys': getKeys,
+  'Editor.getLanguageId': getLanguageId,
   'Editor.getLines2': getLines2,
   'Editor.getOffsetAtCursor': getOffsetAtCursor,
   'Editor.getPositionAtCursor': getPositionAtCursor,
+  'Editor.getProblems': getProblems,
   'Editor.getQuickPickMenuEntries': getQuickPickMenuEntries,
   'Editor.getSelections': getSelections,
   'Editor.getSelections2': getSelections2,
-  'Editor.getLanguageId': getLanguageId,
-  'Editor.getUri': getUri,
   'Editor.getText': getText,
+  'Editor.getUri': getUri,
   'Editor.getWordAt': getWordAt$1,
   'Editor.getWordAt2': getWordAt,
   'Editor.getWordAtOffset2': getWordAtOffset2,
@@ -9968,7 +10062,6 @@ const commandMap = {
   'Editor.paste': paste,
   'Editor.pasteText': pasteText,
   'Editor.render': renderEditor,
-  'Editor.getProblems': getProblems,
   'Editor.renderEventListeners': renderEventListeners,
   'Editor.replaceRange': replaceRange,
   'Editor.rerender': rerender,
@@ -10011,7 +10104,7 @@ const commandMap = {
   'Editor.unIndent': editorUnindent,
   'Editor.updateDebugInfo': updateDebugInfo,
   'Editor.updateDiagnostics': updateDiagnostics,
-  'EditorCompletion.close': close$1,
+  'EditorCompletion.close': close$2,
   'EditorCompletion.closeDetails': closeDetails,
   'EditorCompletion.focusFirst': focusFirst,
   'EditorCompletion.focusIndex': focusIndex$1,
@@ -10026,8 +10119,11 @@ const commandMap = {
   'EditorCompletion.selectCurrent': selectCurrent,
   'EditorCompletion.selectIndex': selectIndex,
   'EditorCompletion.toggleDetails': toggleDetails,
+  'EditorRename.accept': accept,
+  'EditorRename.close': close,
+  'EditorRename.handleInput': handleInput,
   'EditorSourceActions.focusNext': focusNext,
-  'FindWidget.close': close,
+  'FindWidget.close': close$1,
   'FindWidget.focusCloseButton': focusCloseButton,
   'FindWidget.focusFind': focusFind,
   'FindWidget.focusNext': focusNext$1,
@@ -10040,7 +10136,7 @@ const commandMap = {
   'FindWidget.focusToggleReplace': focusToggleReplace,
   'FindWidget.handleBlur': handleBlur,
   'FindWidget.handleFocus': handleFocus,
-  'FindWidget.handleInput': handleInput,
+  'FindWidget.handleInput': handleInput$1,
   'FindWidget.handleReplaceFocus': handleReplaceFocus,
   'FindWidget.handleReplaceInput': handleReplaceInput,
   'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
@@ -10066,11 +10162,6 @@ const listen = async () => {
   set$8(rpc);
 };
 
-const removeWidget = widget => {
-  // @ts-ignore
-  return [['Viewlet.send', widget.newState.uid, 'dispose']];
-};
-
 const CodeGeneratorInput = 'CodeGeneratorInput';
 
 const getCodeGeneratorVirtualDom = state => {
@@ -10124,10 +10215,10 @@ const renderFocus = {
     return [Focus, '.CodeGeneratorInput', newState.focusSource];
   }
 };
-const render$8 = [renderContent$1, renderBounds$2, renderFocus];
+const render$7 = [renderContent$1, renderBounds$2, renderFocus];
 const renderFull$2 = (oldState, newState) => {
   const commands = [];
-  for (const item of render$8) {
+  for (const item of render$7) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(item.apply(oldState, newState));
     }
@@ -10135,7 +10226,7 @@ const renderFull$2 = (oldState, newState) => {
   return commands;
 };
 
-const render$7 = widget => {
+const render$6 = widget => {
   const commands = renderFull$2(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
@@ -10151,16 +10242,16 @@ const render$7 = widget => {
   }
   return wrappedCommands;
 };
-const add$5 = widget => {
-  return addWidget$1(widget, 'EditorCodeGenerator', render$7);
+const add$4 = widget => {
+  return addWidget$1(widget, 'EditorCodeGenerator', render$6);
 };
-const remove$5 = removeWidget;
+const remove$4 = removeWidget$1;
 
 const EditorCodeGeneratorWidget = {
   __proto__: null,
-  add: add$5,
-  remove: remove$5,
-  render: render$7
+  add: add$4,
+  remove: remove$4,
+  render: render$6
 };
 
 const renderFull$1 = (oldState, newState) => {
@@ -10170,7 +10261,7 @@ const renderFull$1 = (oldState, newState) => {
   return commands;
 };
 
-const render$6 = widget => {
+const render$5 = widget => {
   const commands = renderFull$1(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
@@ -10185,18 +10276,18 @@ const render$6 = widget => {
   }
   return wrappedCommands;
 };
-const add$4 = widget => {
-  return addWidget$1(widget, 'ColorPicker', render$6);
+const add$3 = widget => {
+  return addWidget$1(widget, 'ColorPicker', render$5);
 };
-const remove$4 = removeWidget;
+const remove$3 = removeWidget$1;
 const Commands = {};
 
 const EditorColorPickerWidget = {
   __proto__: null,
   Commands,
-  add: add$4,
-  remove: remove$4,
-  render: render$6
+  add: add$3,
+  remove: remove$3,
+  render: render$5
 };
 
 const getCompletionDetailVirtualDom = content => {
@@ -10254,9 +10345,9 @@ const renderBounds$1 = {
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
   }
 };
-const render$5 = [renderContent, renderBounds$1];
+const render$4 = [renderContent, renderBounds$1];
 const renderFull = (oldState, newState) => {
-  return renderParts(render$5, oldState, newState);
+  return renderParts(render$4, oldState, newState);
 };
 
 const getWidgetState = (editor, id) => {
@@ -10275,7 +10366,7 @@ const getCompletionState = editor => {
   return getWidgetState(editor, Completion);
 };
 
-const render$4 = widget => {
+const render$3 = widget => {
   const commands = renderFull(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
@@ -10290,10 +10381,10 @@ const render$4 = widget => {
   }
   return wrappedCommands;
 };
-const add$3 = widget => {
-  return addWidget$1(widget, 'EditorCompletionDetails', render$4);
+const add$2 = widget => {
+  return addWidget$1(widget, 'EditorCompletionDetails', render$3);
 };
-const remove$3 = removeWidget;
+const remove$2 = removeWidget$1;
 const handleEditorType = (editor, state) => {
   const completionState = getCompletionState(editor);
   if (!completionState) {
@@ -10325,49 +10416,22 @@ const handleEditorDeleteLeft = (editor, state) => {
 
 const EditorCompletionDetailWidget = {
   __proto__: null,
-  add: add$3,
+  add: add$2,
   handleEditorDeleteLeft,
   handleEditorType,
-  remove: remove$3,
-  render: render$4
-};
-
-const render$3 = widget => {
-  const commands = renderHover(widget.oldState, widget.newState);
-  const wrappedCommands = [];
-  const {
-    uid
-  } = widget.newState;
-  for (const command of commands) {
-    if (command[0] === SetDom2) {
-      wrappedCommands.push([command[0], uid, ...command.slice(1)]);
-    } else {
-      wrappedCommands.push(['Viewlet.send', uid, ...command]);
-    }
-  }
-  return wrappedCommands;
-};
-const add$2 = widget => {
-  return addWidget$1(widget, 'EditorHover', render$3);
-};
-const remove$2 = removeWidget;
-
-const EditorHoverWidget = {
-  __proto__: null,
-  add: add$2,
   remove: remove$2,
   render: render$3
 };
 
 const render$2 = widget => {
-  const commands = renderFull$4(widget.oldState, widget.newState);
+  const commands = renderHover(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
   } = widget.newState;
   for (const command of commands) {
-    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);
+    if (command[0] === SetDom2) {
+      wrappedCommands.push([command[0], uid, ...command.slice(1)]);
     } else {
       wrappedCommands.push(['Viewlet.send', uid, ...command]);
     }
@@ -10375,11 +10439,11 @@ const render$2 = widget => {
   return wrappedCommands;
 };
 const add$1 = widget => {
-  return addWidget$1(widget, 'EditorRename', render$2);
+  return addWidget$1(widget, 'EditorHover', render$2);
 };
-const remove$1 = removeWidget;
+const remove$1 = removeWidget$1;
 
-const EditorRenameWidget = {
+const EditorHoverWidget = {
   __proto__: null,
   add: add$1,
   remove: remove$1,
@@ -10513,7 +10577,7 @@ const render = widget => {
 const add = widget => {
   return addWidget$1(widget, 'EditorSourceActions', render);
 };
-const remove = removeWidget;
+const remove = removeWidget$1;
 
 const EditorSourceActionWidget = {
   __proto__: null,

package/package.json

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