@lvce-editor/main-area-worker 9.73.2 → 9.74.1

package/dist/mainAreaWorkerMain.js

@@ -628,9 +628,12 @@ const applyDataProperties = (restoredError, error) => {
       writable: true
     });
   }
-  if (error.data.type) {
-    // @ts-ignore
-    restoredError.name = error.data.type;
+  const name = error.data.name || error.data.type;
+  if (name) {
+    Object.defineProperty(restoredError, 'name', {
+      configurable: true,
+      value: name
+    });
   }
 };
 const applyDirectProperties = (restoredError, error) => {
@@ -647,7 +650,7 @@ const applyDirectProperties = (restoredError, error) => {
   }
 };
 const restoreMessageError = (error, _currentStack) => {
-  const restoredError = constructError(error.message, error.type || error.data?.type, error.name);
+  const restoredError = constructError(error.message, error.type || error.data?.type, error.name || error.data?.name);
   if (typeof error.code === 'string' || typeof error.code === 'number') {
     Object.defineProperty(restoredError, 'code', {
       configurable: true,
@@ -2064,6 +2067,9 @@ const getLoadFileErrorMessage = error => {
   }
   return error.message;
 };
+const isBinaryFileError = error => {
+  return error instanceof Error && error.name === 'BinaryFileError';
+};
 const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
   try {
     await loadFileContent(path);
@@ -2101,6 +2107,16 @@ const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
     if (latestTab.loadingState !== 'loading') {
       return latestState;
     }
+    if (isBinaryFileError(error)) {
+      return updateTab(latestState, tabId, {
+        editorInput: {
+          type: 'binary',
+          uri: path
+        },
+        errorMessage: undefined,
+        loadingState: 'binary'
+      });
+    }
     const errorMessage = getLoadFileErrorMessage(error);
     return updateTab(latestState, tabId, {
       errorMessage,
@@ -4101,7 +4117,7 @@ const NewTextFile = 'New Text File';
 const NewWindow = 'New Window';
 const OpenFile = 'Open File';
 const OpenAnyway = 'Open Anyway';
-const OpenInTextEditor = 'Open in Text Editor';
+const OpenInTextEditor = 'Reopen with Text Editor';
 const BinaryFileNotDisplayed = 'The file is not displayed in the text editor because its contents are binary.';
 const LargeFileNotDisplayed = 'The file is not displayed in the text editor because it is very large';
 const SplitDown = 'Split Down';
@@ -5621,11 +5637,40 @@ const getViewletArgs = options => {
   return [{
     ...context,
     focus: options.focus,
+    ...(options.editorInput.type === 'editor' && options.editorInput.forceText === true && {
+      forceText: true
+    }),
     ...(options.forceOpen === true && {
       largeFile: true
     })
   }, ...rest];
 };
+const handleOpenError = async (context, tabId, editorInput, uri, error) => {
+  const latestState = context.getState();
+  if (editorInput.type === 'editor' && error instanceof Error && error.name === 'BinaryFileError') {
+    const editorUid = findTabById(latestState, tabId)?.tab.editorUid ?? -1;
+    const binaryState = updateTab(latestState, tabId, {
+      editorInput: {
+        type: 'binary',
+        uri
+      },
+      editorUid: -1,
+      errorMessage: undefined,
+      loadingState: 'binary'
+    });
+    await context.updateState(() => binaryState);
+    if (editorUid !== -1) {
+      await disposeEditors([editorUid]);
+    }
+    return;
+  }
+  const errorMessage = error instanceof Error ? error.message : 'Failed to open URI';
+  const errorState = updateTab(latestState, tabId, {
+    errorMessage,
+    loadingState: 'error'
+  });
+  await context.updateState(() => errorState);
+};
 const openInputWithContext = async (context, options) => {
   const state = context.getState();
   object(state);
@@ -5733,13 +5778,7 @@ const openInputWithContext = async (context, options) => {
       return;
     }
   } catch (error) {
-    const latestState = context.getState();
-    const errorMessage = error instanceof Error ? error.message : 'Failed to open URI';
-    const errorState = updateTab(latestState, tabId, {
-      errorMessage,
-      loadingState: 'error'
-    });
-    await context.updateState(() => errorState);
+    await handleOpenError(context, tabId, editorInput, uri, error);
   }
 };
 const openInput = async (state, options) => {

package/package.json

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