@lvce-editor/main-area-worker 9.38.1 → 9.40.0

package/dist/mainAreaWorkerMain.js

@@ -6061,11 +6061,51 @@ const handleWorkspaceChange = async (state, _workspacePath, savedState) => {
   };
 };
 
+const getEditorInputUris = editorInput => {
+  switch (editorInput?.type) {
+    case 'diff-editor':
+      return [editorInput.uriLeft, editorInput.uriRight];
+    case 'editor':
+    case 'image':
+    case 'video':
+    case 'webview':
+      return [editorInput.uri];
+    default:
+      return [];
+  }
+};
+const getChangedEditorUid = (editorUid, editorInput, uri, changedUris) => {
+  if (editorUid === -1) {
+    return undefined;
+  }
+  const uris = getEditorInputUris(editorInput);
+  if (uris.some(editorUri => changedUris.has(editorUri)) || uris.length === 0 && uri && changedUris.has(uri)) {
+    return editorUid;
+  }
+  return undefined;
+};
+const reloadChangedEditors = async (state, changed) => {
+  if (changed.length === 0) {
+    return;
+  }
+  const changedUris = new Set(changed);
+  const editorUids = new Set();
+  for (const group of state.layout.groups) {
+    for (const tab of group.tabs) {
+      const editorUid = getChangedEditorUid(tab.editorUid, tab.editorInput, tab.uri, changedUris);
+      if (editorUid !== undefined) {
+        editorUids.add(editorUid);
+      }
+    }
+  }
+  await Promise.allSettled(Array.from(editorUids, editorUid => invoke('Viewlet.reload', editorUid)));
+};
 const handleWorkspaceRefresh = async (state, refresh = {}) => {
   const changes = Array.isArray(refresh) ? {
     deleted: refresh
   } : refresh;
   const {
+    changed = [],
     deleted = [],
     renamed = []
   } = changes;
@@ -6081,6 +6121,7 @@ const handleWorkspaceRefresh = async (state, refresh = {}) => {
       }
     }
   }
+  await reloadChangedEditors(newState, changed);
   return newState;
 };
 const handleWorkspaceRefreshWithContext = async (context, refresh = {}) => {
@@ -7637,12 +7678,12 @@ const renderEventListeners = () => {
   }];
 };
 
+const textEditorEntry = {
+  id: 'editor',
+  label: 'Text Editor',
+  type: 'editor'
+};
 const getViewProviderEntries = async uri => {
-  const textEditorEntry = {
-    id: 'editor',
-    label: 'Text Editor',
-    type: 'editor'
-  };
   try {
     const providers = await invoke('WebView.getEditorProviders');
     const matchingProviders = providers.filter(provider => provider?.id && provider.selector?.some(selector => uri.endsWith(selector)));
@@ -7658,7 +7699,7 @@ const getViewProviderEntries = async uri => {
     return [textEditorEntry];
   }
 };
-const reopenEditorWith = async context => {
+const reopenEditorWith = async (context, preferredEditorId) => {
   const initialState = context.getState();
   const {
     activeGroupId,
@@ -7669,16 +7710,21 @@ const reopenEditorWith = async context => {
   if (!initialTab?.uri) {
     return;
   }
-  const entries = await getViewProviderEntries(initialTab.uri);
-  const items = entries.map(entry => ({
-    description: '',
-    label: entry.label,
-    value: entry
-  }));
-  const selected = await invoke('ExtensionHostQuickPick.showQuickPick', {
-    items,
-    placeholder: 'Select Editor'
-  });
+  let selected;
+  if (preferredEditorId === textEditorEntry.id) {
+    selected = textEditorEntry;
+  } else {
+    const entries = await getViewProviderEntries(initialTab.uri);
+    const items = entries.map(entry => ({
+      description: '',
+      label: entry.label,
+      value: entry
+    }));
+    selected = await invoke('ExtensionHostQuickPick.showQuickPick', {
+      items,
+      placeholder: 'Select Editor'
+    });
+  }
   if (!selected) {
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-area-worker",
-  "version": "9.38.1",
+  "version": "9.40.0",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",