@lvce-editor/main-area-worker 9.6.0 → 9.8.0

package/dist/mainAreaWorkerMain.js

@@ -3041,14 +3041,67 @@ const getOptionUriOptions = options => {
   return options.uri;
 };
 
+const getEditorInputFromUri = uri => {
+  if (uri.startsWith('diff://?')) {
+    try {
+      const parsed = new URL(uri);
+      const uriLeft = parsed.searchParams.get('left');
+      const uriRight = parsed.searchParams.get('right');
+      if (uriLeft && uriRight) {
+        return {
+          type: 'diff-editor',
+          uriLeft,
+          uriRight
+        };
+      }
+    } catch {
+      // Ignore malformed legacy URIs and fall back to a text editor input.
+    }
+  }
+  if (uri.startsWith('extension-detail://')) {
+    const extensionIdWithPath = uri.slice('extension-detail://'.length);
+    const extensionId = extensionIdWithPath.split('/')[0];
+    if (extensionId) {
+      return {
+        extensionId,
+        type: 'extension-detail-view'
+      };
+    }
+  }
+  return {
+    type: 'editor',
+    uri
+  };
+};
+const getNormalizedEditorInput = tab => {
+  if (typeof tab?.uri === 'string') {
+    const inferredEditorInput = getEditorInputFromUri(tab.uri);
+    if (inferredEditorInput.type !== 'editor') {
+      return inferredEditorInput;
+    }
+  }
+  return tab?.editorInput;
+};
+const normalizeTabEditorInput = tab => {
+  const editorInput = getNormalizedEditorInput(tab);
+  if (!editorInput) {
+    return tab;
+  }
+  return {
+    ...tab,
+    editorInput,
+    editorType: getEditorInputEditorType(editorInput)
+  };
+};
+const getNormalizedOpenEditorInput = uri => {
+  return getEditorInputFromUri(uri);
+};
+
 const openUri = async (state, options) => {
   const uri = getOptionUriOptions(options);
   const preview = typeof options === 'string' ? false : options.preview ?? false;
   return openInput(state, {
-    editorInput: {
-      type: 'editor',
-      uri
-    },
+    editorInput: getNormalizedOpenEditorInput(uri),
     focu: typeof options === 'string' ? false : options.focu,
     preview
   });
@@ -3769,8 +3822,9 @@ const normalizeRestoredTab = tab => {
     loadingState: _loadingState,
     ...rest
   } = tab ?? {};
+  const normalizedTab = normalizeTabEditorInput(rest);
   return {
-    ...rest,
+    ...normalizedTab,
     editorUid: -1,
     isDirty: false,
     isPreview: typeof tab?.isPreview === 'boolean' ? tab.isPreview : false
@@ -3951,6 +4005,17 @@ const loadContent = async (state, savedState) => {
   };
 };
 
+const hasTargetGroup = groupId => {
+  return groupId !== undefined && groupId >= 0;
+};
+
+const getMenuEntryArgs = groupId => {
+  if (!hasTargetGroup(groupId)) {
+    return undefined;
+  }
+  return [groupId];
+};
+
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -4084,15 +4149,6 @@ const menuEntrySeparator = {
   label: ''
 };
 
-const hasTargetGroup = groupId => {
-  return groupId !== undefined && groupId >= 0;
-};
-const getArgs = groupId => {
-  if (!hasTargetGroup(groupId)) {
-    return undefined;
-  }
-  return [groupId];
-};
 const getNewWindowMenuEntries = state => {
   if (state.platform !== Electron) {
     return [];
@@ -4104,8 +4160,9 @@ const getNewWindowMenuEntries = state => {
     label: newWindow$1()
   }];
 };
+
 const getMenuEntries$2 = (state, groupId) => {
-  const groupArgs = getArgs(groupId);
+  const groupArgs = getMenuEntryArgs(groupId);
   const entries = [{
     args: [QuickPick, 'file'],
     command: 'Viewlet.openWidget',
@@ -4931,12 +4988,13 @@ const renderEditorGroupHeader = (group, groupIndex, splitButtonEnabled) => {
   }, ...getTabsVirtualDom(group, groupIndex, tabsChildCount), ...actions];
 };
 
+const emptyHeader = {
+  childCount: 1,
+  className: EmptyGroupHeader,
+  type: Div
+};
 const renderEmptyGroupCloseButton = (group, groupIndex) => {
-  return [{
-    childCount: 1,
-    className: EmptyGroupHeader,
-    type: Div
-  }, {
+  return [emptyHeader, {
     childCount: 1,
     className: EmptyGroupCloseButton,
     'data-groupId': String(group.id),
@@ -5181,6 +5239,9 @@ const renderEventListeners = () => {
 const saveEditor = async editorUid => {
   await invoke('Editor.save', editorUid);
 };
+const getEditorSaveState = async editorUid => {
+  return invoke('Editor.saveState', editorUid);
+};
 
 const save = async state => {
   const activeTabData = getActiveTab(state);
@@ -5197,6 +5258,10 @@ const save = async state => {
   if (!tab.isDirty) {
     return state;
   }
+  const editorState = await getEditorSaveState(tab.editorUid);
+  if (editorState.modified) {
+    return state;
+  }
   return updateTab(state, tab.id, {
     isDirty: false
   });
@@ -5205,7 +5270,7 @@ const save = async state => {
 const getFilteredGroups = groups => {
   return groups.map(group => ({
     ...group,
-    tabs: group.tabs.filter(tab => !tab.uri?.startsWith('untitled://'))
+    tabs: group.tabs.filter(tab => !tab.uri?.startsWith('untitled://')).map(normalizeTabEditorInput)
   })).filter(group => group.tabs.length > 0);
 };
 

package/package.json

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