@lvce-editor/editor-worker 19.28.1 → 19.28.3

package/dist/editorWorkerMain.js

@@ -1589,7 +1589,7 @@ const sendMessagePortToErrorWorker = async (port, rpcId) => {
   const command = 'Errors.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToErrorWorker', port, command, rpcId);
 };
-const readFile = async uri => {
+const readFile$1 = async uri => {
   return invoke$b('FileSystem.readFile', uri);
 };
 const handleWorkspaceRefresh = async () => {
@@ -1639,7 +1639,7 @@ const RendererWorker = {
   invokeAndTransfer,
   openUri,
   readClipBoardText,
-  readFile,
+  readFile: readFile$1,
   sendMessagePortToDialogWorker,
   sendMessagePortToErrorWorker,
   sendMessagePortToExtensionHostWorker,
@@ -3779,7 +3779,8 @@ const splitLines = lines => {
 };
 
 const {
-  invoke: invoke$7} = RendererWorker;
+  invoke: invoke$7,
+  readFile} = RendererWorker;
 
 const notifyTabModifiedStatusChange = async (uri, modified) => {
   try {
@@ -5025,44 +5026,80 @@ const applyEdit = async (editor, changes) => {
 
 // TODO maybe use a separate worker for bulk edits and bulk edit history
 
-const getTextChanges = (editor, changes) => {
+const sortEditsDescending = edits => {
+  return edits.toSorted((a, b) => b.offset - a.offset);
+};
+const applyEditsToText = (text, edits) => {
+  let newText = text;
+  for (const edit of sortEditsDescending(edits)) {
+    newText = newText.slice(0, edit.offset) + edit.inserted + newText.slice(edit.offset + edit.deleted);
+  }
+  return newText;
+};
+const getTextChanges = (editor, edits) => {
   const textChanges = [];
+  for (const edit of sortEditsDescending(edits)) {
+    const startPosition = positionAt(editor, edit.offset);
+    const endPosition = positionAt(editor, edit.offset + edit.deleted);
+    const deleted = getSelectionText(editor, {
+      end: endPosition,
+      start: startPosition
+    });
+    const textChange = {
+      deleted,
+      end: endPosition,
+      inserted: [edit.inserted],
+      origin: Rename,
+      start: startPosition
+    };
+    textChanges.push(textChange);
+  }
+  return textChanges;
+};
+const groupEditsByUri = changes => {
+  const editsByUri = new Map();
   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, {
-          end: endPosition,
-          start: startPosition
-        });
-        const textChange = {
-          deleted,
-          end: endPosition,
-          inserted: [edit.inserted],
-          origin: Rename,
-          start: startPosition
-        };
-        textChanges.push(textChange);
-      }
+    const edits = editsByUri.get(change.uri);
+    if (edits) {
+      edits.push(...change.edits);
+    } else {
+      editsByUri.set(change.uri, [...change.edits]);
     }
   }
-  return textChanges;
+  return editsByUri;
+};
+const getOpenEditor = (currentEditor, uri) => {
+  if (currentEditor.uri === uri) {
+    return currentEditor;
+  }
+  for (const key of getKeys$2()) {
+    const editor = get$7(Number(key))?.newState;
+    if (editor && !editor.initial && editor.uri === uri) {
+      return editor;
+    }
+  }
+  return undefined;
 };
 const applyWorkspaceEdit = async (editor, changes) => {
   object(editor);
   array(changes);
-  const textChanges = getTextChanges(editor, changes);
-  if (textChanges.length === 0) {
-    return editor;
+  let currentEditor = editor;
+  const editsByUri = groupEditsByUri(changes);
+  for (const [uri, edits] of editsByUri) {
+    const openEditor = getOpenEditor(currentEditor, uri);
+    if (openEditor) {
+      const textChanges = getTextChanges(openEditor, edits);
+      const updatedEditor = await scheduleDocumentAndCursorsSelections(openEditor, textChanges);
+      if (openEditor.uid === currentEditor.uid) {
+        currentEditor = updatedEditor;
+      }
+      continue;
+    }
+    const text = await readFile(uri);
+    const newText = applyEditsToText(text, edits);
+    await invoke$7('FileSystem.writeFile', uri, newText);
   }
-  // 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);
+  return currentEditor;
 };
 
 const isPersistentWidget = widgetId => {
@@ -8807,6 +8844,11 @@ const createFn = (key, name, widgetId) => {
     } = state;
     const invoke = getWidgetInvoke(widgetId);
     await invoke(`${name}.${key}`, uid, ...args);
+    const latestAfterInvoke = get$7(editor.uid).newState;
+    const latestChildIndex = latestAfterInvoke.widgets.findIndex(isWidget);
+    if (latestChildIndex === -1) {
+      return latestAfterInvoke;
+    }
     const diff = await invoke(`${name}.diff2`, uid);
     const commands = await invoke(`${name}.render2`, uid, diff);
     const latest = get$7(editor.uid).newState;
@@ -12354,7 +12396,7 @@ const loadContent = async (state, savedState) => {
   let content = existingEditor ? getText$1(existingEditor) : '';
   try {
     if (!existingEditor) {
-      content = await readFile(uri);
+      content = await readFile$1(uri);
     }
   } catch (error) {
     const newEditor1 = setBounds(newEditor0, x, y, width, height, 9);
@@ -12536,6 +12578,9 @@ const renderCss$1 = (oldState, newState) => {
 };
 
 const renderFocus$2 = (oldState, newState) => {
+  if (!newState.focused) {
+    return [];
+  }
   const selector = '.EditorInput textarea';
   return [FocusSelector$1, newState.uid, selector];
 };

package/package.json

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