@lvce-editor/server 0.15.5 → 0.15.6

package/static/{92fbf8b → e7424d4}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -1934,7 +1934,7 @@ var init_Platform = __esm({
     platform2 = "remote";
     getAssetDir = () => {
       if (true) {
-        return "/92fbf8b";
+        return "/e7424d4";
       }
       if (platform2 === Electron2) {
         return "../../../../..";
@@ -12944,7 +12944,7 @@ var init_TokenizerState = __esm({
     removeConnectedEditor = (id) => {
       const index = state32.connectedEditors.indexOf(id);
       if (index === -1) {
-        throw new Error("unexepcted index");
+        throw new Error("unexpected index");
       }
       state32.connectedEditors.splice(index, 1);
     };
@@ -28698,7 +28698,7 @@ var init_ViewletMainOpenUri = __esm({
     init_Assert();
     init_Id();
     init_PathDisplay();
-    init_RendererProcess();
+    init_Viewlet();
     init_ViewletManager();
     init_ViewletMap();
     init_ViewletModule();
@@ -28710,17 +28710,37 @@ var init_ViewletMainOpenUri = __esm({
       const x2 = state58.x;
       const y2 = state58.y + state58.tabHeight;
       const width = state58.width;
-      const height = state58.height - state58.tabHeight;
+      const contentHeight = state58.height - state58.tabHeight;
       const moduleId = getModuleId2(uri);
+      const previousEditor = state58.editors[state58.activeIndex];
+      let disposeCommands;
+      if (previousEditor) {
+        const previousUid = previousEditor.uid;
+        disposeCommands = disposeFunctional(previousUid);
+      }
       for (const editor of state58.editors) {
         if (editor.uri === uri) {
+          if (editor === previousEditor) {
+            return {
+              newState: state58,
+              commands: []
+            };
+          }
           const childUid = create();
-          const instance2 = create12(load3, moduleId, Main2, uri, x2, y2, width, height);
+          const instance2 = create12(load3, moduleId, Main2, uri, x2, y2, width, contentHeight);
           instance2.show = false;
           instance2.setBounds = false;
           instance2.uid = childUid;
           const commands2 = await load(instance2, focus14, false, options2);
-          commands2.push(["Viewlet.appendViewlet", state58.uid, childUid]);
+          if (disposeCommands) {
+            commands2.unshift(...disposeCommands);
+          }
+          commands2.push(["Viewlet.append", state58.uid, childUid]);
+          const newActiveIndex = state58.editors.indexOf(editor);
+          commands2.push(["Viewlet.setBounds", childUid, x2, state58.tabHeight, width, contentHeight]);
+          commands2.push(["Viewlet.send", state58.tabsUid, "setFocusedIndex", state58.activeIndex, newActiveIndex]);
+          state58.activeIndex = newActiveIndex;
+          editor.uid = childUid;
           return {
             newState: state58,
             commands: commands2
@@ -28728,45 +28748,52 @@ var init_ViewletMainOpenUri = __esm({
         }
       }
       const instanceUid = create();
-      const instance = create12(load3, moduleId, Main2, uri, x2, y2, width, height);
+      const instance = create12(load3, moduleId, Main2, uri, x2, y2, width, contentHeight);
       instance.uid = instanceUid;
       const oldActiveIndex = state58.activeIndex;
-      state58.editors.push({ uri, uid: instanceUid });
-      state58.activeIndex = state58.editors.length - 1;
       const tabLabel = getLabel2(uri);
       const tabTitle = getTitle2(uri);
-      await invoke2(
-        /* Viewlet.send */
-        "Viewlet.send",
-        /* id */
-        state58.uid,
-        /* method */
-        "openViewlet",
-        /* tabLabel */
-        tabLabel,
-        /* tabTitle */
-        tabTitle,
-        /* oldActiveIndex */
-        oldActiveIndex
-      );
+      state58.editors.push({ uri, uid: instanceUid, label: tabLabel, title: tabTitle });
+      state58.activeIndex = state58.editors.length - 1;
       instance.show = false;
       instance.setBounds = false;
       const commands = await load(instance, focus14);
-      commands.push(["Viewlet.appendViewlet", state58.uid, instanceUid || moduleId]);
+      commands.push(["Viewlet.setBounds", instanceUid, x2, state58.tabHeight, width, contentHeight]);
+      let tabsUid = state58.tabsUid;
+      if (tabsUid === -1) {
+        tabsUid = create();
+        commands.push(["Viewlet.create", MainTabs, tabsUid]);
+        commands.push(["Viewlet.setBounds", tabsUid, x2, 0, width, state58.tabHeight]);
+        commands.push(["Viewlet.append", state58.uid, tabsUid]);
+      }
+      commands.push(["Viewlet.send", tabsUid, "setTabs", state58.editors]);
+      commands.push(["Viewlet.send", tabsUid, "setFocusedIndex", oldActiveIndex, state58.activeIndex]);
+      if (disposeCommands) {
+        commands.push(...disposeCommands);
+      }
+      commands.push(["Viewlet.append", state58.uid, instanceUid]);
       if (focus14) {
         commands.push(["Viewlet.focus", instanceUid]);
       }
-      if (!hasInstance(moduleId)) {
+      const latestEditor = state58.editors[state58.activeIndex];
+      console.log({ commands, editors: state58.editors });
+      if (latestEditor.uid !== instanceUid) {
+        return {
+          newState: state58,
+          commands: []
+        };
+      }
+      if (!hasInstance(instanceUid)) {
         return {
           newState: state58,
           commands
         };
       }
-      const actualUri = getState(moduleId).uri;
-      const index = state58.editors.findIndex((editor) => editor.uid === instanceUid);
-      state58.editors[index].uri = actualUri;
       return {
-        newState: state58,
+        newState: {
+          ...state58,
+          tabsUid
+        },
         commands
       };
     };
@@ -28774,7 +28801,7 @@ var init_ViewletMainOpenUri = __esm({
 });
 
 // src/parts/ViewletMain/ViewletMain.js
-var canBeRestored7, getMainEditors, hydrateLazy, create36, getRestoredEditors, saveState6, handleEditorChange2, loadContent19, getChildren, contentLoaded3, openBackgroundTab, executeEditorCommand, saveEditor, focusEditor, save2, focus6, openEditorWithType, saveWithoutFormatting, handleDrop4, handleDropFilePath, handleDragEnd, handleDragOver2, closeActiveEditor, getId4, closeAllEditors, dispose14, closeEditor, handleClickClose, closeFocusedTab, handleTabContextMenu, focusIndex6, focusFirst6, focusLast6, focusPrevious6, focusNext6, handleTabClick, handleFocusChange3, closeOthers, closeTabsRight, closeTabsLeft, resize8, hasFunctionalRender18, renderDragOverlay, render20;
+var canBeRestored7, getMainEditors, hydrateLazy, create36, getRestoredEditors, saveState6, handleEditorChange2, loadContent19, getChildren, contentLoaded3, openBackgroundTab, executeEditorCommand, saveEditor, focusEditor, save2, focus6, openEditorWithType, saveWithoutFormatting, handleDrop4, handleDropFilePath, handleDragEnd, handleDragOver2, closeActiveEditor, getUid, getUids, closeAllEditors, dispose14, closeEditor, handleClickClose, closeFocusedTab, handleTabContextMenu, focusIndex6, focusFirst6, focusLast6, focusPrevious6, focusNext6, handleTabClick, handleFocusChange3, resize8;
 var init_ViewletMain = __esm({
   "src/parts/ViewletMain/ViewletMain.js"() {
     "use strict";
@@ -28813,11 +28840,11 @@ var init_ViewletMain = __esm({
       if (!editors) {
         return [];
       }
-      const restoredEditor = editors.filter(canBeRestored7)[activeIndex];
-      if (!restoredEditor) {
-        return [];
+      const restoredEditors = editors.filter(canBeRestored7);
+      for (const editor of restoredEditors) {
+        editor.uid = create();
       }
-      return [restoredEditor];
+      return restoredEditors;
     };
     hydrateLazy = async () => {
       await execute(
@@ -28841,15 +28868,23 @@ var init_ViewletMain = __esm({
         dragOverlayY: 0,
         dragOverlayWidth: 0,
         dragOverlayHeight: 0,
-        dragOverlayVisible: false
+        dragOverlayVisible: false,
+        tabsUid: -1
       };
     };
     getRestoredEditors = (savedState) => {
       if (isTest()) {
-        return [];
+        return { editors: [], activeIndex: -1 };
       }
       const restoredEditors = getMainEditors(savedState);
-      return restoredEditors;
+      const savedActiveIndex = savedState.activeIndex;
+      if (typeof savedActiveIndex !== "number" || savedActiveIndex < 0 || savedActiveIndex > restoredEditors.length) {
+        return { editors: [], activeIndex: -1 };
+      }
+      return {
+        editors: restoredEditors,
+        activeIndex: savedActiveIndex
+      };
     };
     saveState6 = (state58) => {
       const { editors, activeIndex } = state58;
@@ -28859,14 +28894,15 @@ var init_ViewletMain = __esm({
       const state58 = getState(Main2);
       const index = state58.activeIndex;
       number(index);
-      const command = ["Viewlet.send", state58.uid, "setDirty", index, true];
+      const tabsUid = state58.tabsUid;
+      const command = ["Viewlet.send", tabsUid, "setDirty", index, true];
       await invoke2(...command);
     };
-    loadContent19 = (state58, savedState) => {
-      const editors = getRestoredEditors(savedState);
+    loadContent19 = async (state58, savedState) => {
+      const { activeIndex, editors } = getRestoredEditors(savedState);
       once(Twelve, hydrateLazy);
-      const activeIndex = editors.length > 0 ? 0 : -1;
       addListener("editor.change", handleEditorChange2);
+      await invoke2("Viewlet.loadModule", MainTabs);
       return {
         ...state58,
         editors,
@@ -28893,10 +28929,12 @@ var init_ViewletMain = __esm({
       const x2 = state58.x;
       const y2 = state58.y + state58.tabHeight;
       const width = state58.width;
-      const height = state58.height - state58.tabHeight;
+      const contentHeight = state58.height - state58.tabHeight;
       const id = getModuleId2(editor.uri);
       const tabLabel = getLabel2(editor.uri);
       const tabTitle = getTitle2(editor.uri);
+      editor.label = tabLabel;
+      editor.title = tabTitle;
       const commands = [
         [
           /* Viewlet.send */
@@ -28911,7 +28949,14 @@ var init_ViewletMain = __esm({
           tabTitle
         ]
       ];
-      const childUid = create();
+      const childUid = editor.uid;
+      commands.push(["Viewlet.setBounds", childUid, x2, state58.tabHeight, width, contentHeight]);
+      const tabsUid = create();
+      state58.tabsUid = tabsUid;
+      commands.push(["Viewlet.create", MainTabs, tabsUid]);
+      commands.push(["Viewlet.send", tabsUid, "setTabs", state58.editors]);
+      commands.push(["Viewlet.send", tabsUid, "setFocusedIndex", -1, state58.activeIndex]);
+      commands.push(["Viewlet.setBounds", tabsUid, x2, 0, width, state58.tabHeight]);
       const extraCommands = await load(
         {
           getModule: load3,
@@ -28924,7 +28969,7 @@ var init_ViewletMain = __esm({
           x: x2,
           y: y2,
           width,
-          height,
+          height: contentHeight,
           show: false,
           focus: false,
           type: 0,
@@ -28937,7 +28982,9 @@ var init_ViewletMain = __esm({
         true
       );
       commands.push(...extraCommands);
-      commands.push(["Viewlet.appendViewlet", state58.uid, childUid]);
+      commands.push(["Viewlet.setBounds", childUid, x2, state58.tabHeight, width, contentHeight]);
+      commands.push(["Viewlet.append", state58.uid, tabsUid]);
+      commands.push(["Viewlet.append", state58.uid, childUid]);
       return commands;
     };
     openBackgroundTab = async (state58, initialUri, props) => {
@@ -28978,11 +29025,8 @@ var init_ViewletMain = __esm({
       return state58;
     };
     executeEditorCommand = async (editor, commandId) => {
-      const id = getId4(editor);
-      console.log({ editor });
-      const actualId = id === "EditorText" ? "Editor" : id;
-      const fullCommandId = `${actualId}.${commandId}`;
-      await execute(fullCommandId);
+      const uid = getUid(editor);
+      await executeViewletCommand(uid, commandId);
     };
     saveEditor = (editor) => {
       return executeEditorCommand(editor, "save");
@@ -29025,7 +29069,6 @@ var init_ViewletMain = __esm({
           newState = result.newState;
         } else {
         }
-        console.log(file);
       }
       return {
         newState: {
@@ -29096,16 +29139,21 @@ var init_ViewletMain = __esm({
       }
       return closeEditor(state58, activeIndex);
     };
-    getId4 = (editor) => {
-      return getModuleId2(editor.uri);
+    getUid = (editor) => {
+      return editor.uid;
+    };
+    getUids = (editors) => {
+      return editors.map(getUid);
     };
     closeAllEditors = async (state58) => {
-      const ids = state58.editors.map(getId4);
+      const ids = getUids(state58.editors);
       const uid = state58.uid;
-      const commands = [["Viewlet.send", uid, "dispose"], ...ids.flatMap(disposeFunctional)];
+      const tabsUid = state58.tabsUid;
+      const commands = [["Viewlet.send", uid, "dispose"], ["Viewlet.dispose", tabsUid], ...ids.flatMap(disposeFunctional)];
       state58.editors = [];
       state58.focusedIndex = -1;
       state58.selectedIndex = -1;
+      state58.tabsUid = -1;
       await invoke2("Viewlet.sendMultiple", commands);
       return state58;
     };
@@ -29127,37 +29175,21 @@ var init_ViewletMain = __esm({
         const oldEditor = state58.editors[index];
         state58.editors.splice(index, 1);
         const newActiveIndex = index === 0 ? index : index - 1;
-        const id = getModuleId2(oldEditor.uri);
-        dispose6(id);
+        const uid = oldEditor.uid;
+        const commands2 = [...disposeFunctional(uid)];
         state58.activeIndex = newActiveIndex;
         state58.focusedIndex = newActiveIndex;
-        await invoke2(
-          "Viewlet.send",
-          state58.uid,
-          /* Main.closeOneTab */
-          "closeOneTab",
-          /* closeIndex */
-          oldActiveIndex,
-          /* focusIndex */
-          newActiveIndex
-        );
+        commands2.push(["Viewlet.send", state58.tabsUid, "setTabs", state58.editors]);
         return state58;
       }
-      await invoke2(
-        /* Viewlet.send */
-        "Viewlet.send",
-        /* id */
-        state58.uid,
-        /* method */
-        "closeOneTabOnly",
-        /* closeIndex */
-        index
-      );
       state58.editors.splice(index, 1);
+      const commands = [["Viewlet.send", state58.tabsUid, "setTabs", state58.editors]];
       if (index < state58.activeIndex) {
         state58.activeIndex--;
       }
       state58.focusedIndex = state58.activeIndex;
+      commands.push(["Viewlet.send", state58.tabsUid, "setFocusedIndex", -1, state58.activeIndex]);
+      await invoke2("Viewlet.sendMultiple", commands);
       return state58;
     };
     handleClickClose = (state58, button2, index) => {
@@ -29167,9 +29199,10 @@ var init_ViewletMain = __esm({
       return closeEditor(state58, index);
     };
     closeFocusedTab = (state58) => {
-      return closeEditor(state58.focusedIndex);
+      return closeEditor(state58, state58.focusedIndex);
     };
     handleTabContextMenu = async (state58, index, x2, y2) => {
+      state58.focusedIndex = index;
       await execute(
         /* ContextMenu.show */
         "ContextMenu.show",
@@ -29194,39 +29227,34 @@ var init_ViewletMain = __esm({
       const x2 = state58.x;
       const y2 = state58.y + state58.tabHeight;
       const width = state58.width;
-      const height = state58.height - state58.tabHeight;
+      const contentHeight = state58.height - state58.tabHeight;
       const id = getModuleId2(editor.uri);
       const oldEditor = state58.editors[oldActiveIndex];
       const oldId = getModuleId2(oldEditor.uri);
       const oldInstance = getInstance(oldId);
       const instanceUid = create();
-      const instance = create12(load3, id, Main2, editor.uri, x2, y2, width, height);
+      const instance = create12(load3, id, Main2, editor.uri, x2, y2, width, contentHeight);
       instance.show = false;
       instance.setBounds = false;
       instance.uid = instanceUid;
-      invoke2(
-        /* Viewlet.send */
-        "Viewlet.send",
-        /* id */
-        state58.uid,
-        /* method */
-        "focusAnotherTab",
-        /* unFocusIndex */
-        oldActiveIndex,
-        /* focusIndex */
-        state58.activeIndex
-      );
+      editor.uid = instanceUid;
+      const tabFocusCommand = ["Viewlet.send", state58.tabsUid, "setFocusedIndex", oldActiveIndex, state58.activeIndex];
+      const resizeCommands = ["Viewlet.setBounds", instanceUid, x2, state58.tabHeight, width, contentHeight];
+      const previousUid = oldEditor.uid;
+      number(previousUid);
+      const disposeCommands = disposeFunctional(previousUid);
       if (has3(editor.uri)) {
-        console.log("has background true");
         const props = get3(editor.uri);
         const commands = await load(instance, false, false, props);
-        commands.push(["Viewlet.appendViewlet", state58.uid, instanceUid]);
+        commands.push(...disposeCommands, tabFocusCommand);
+        commands.push(resizeCommands);
+        commands.push(["Viewlet.append", state58.uid, instanceUid]);
         await invoke2("Viewlet.sendMultiple", commands);
       } else {
-        console.log("has background false");
         const commands = await load(instance);
-        commands.push(["Viewlet.appendViewlet", state58.uid, instanceUid]);
-        console.log({ commands });
+        commands.unshift(...disposeCommands, tabFocusCommand);
+        commands.push(resizeCommands);
+        commands.push(["Viewlet.append", state58.uid, instanceUid]);
         await invoke2("Viewlet.sendMultiple", commands);
       }
       if (oldInstance && oldInstance.factory.hide) {
@@ -29268,18 +29296,57 @@ var init_ViewletMain = __esm({
       }
       return state58;
     };
-    closeOthers = async (state58) => {
-      if (state58.focusedIndex === state58.activeIndex) {
+    resize8 = (state58, dimensions) => {
+      const { editors } = state58;
+      const x2 = dimensions.x;
+      const y2 = dimensions.y + state58.tabHeight;
+      const width = dimensions.width;
+      const contentHeight = dimensions.height - state58.tabHeight;
+      const childDimensions = {
+        x: x2,
+        y: y2,
+        width,
+        height: contentHeight
+      };
+      const editor = editors[0];
+      let commands = [];
+      if (editor) {
+        const editorUid = getUid(editor);
+        number(editorUid);
+        commands = resize7(editorUid, childDimensions);
+        commands.push(["Viewlet.setBounds", editorUid, x2, state58.tabHeight, width, contentHeight]);
+      }
+      return {
+        newState: {
+          ...state58,
+          ...dimensions
+        },
+        commands
+      };
+    };
+  }
+});
+
+// src/parts/ViewletMain/ViewletMainCloseTabsLeft.js
+var ViewletMainCloseTabsLeft_exports = {};
+__export(ViewletMainCloseTabsLeft_exports, {
+  closeTabsLeft: () => closeTabsLeft
+});
+var closeTabsLeft;
+var init_ViewletMainCloseTabsLeft = __esm({
+  "src/parts/ViewletMain/ViewletMainCloseTabsLeft.js"() {
+    "use strict";
+    init_RendererProcess();
+    closeTabsLeft = async (state58) => {
+      if (state58.focusedIndex <= state58.activeIndex) {
         await invoke2(
           /* Viewlet.send */
           "Viewlet.send",
           /* id */
           state58.uid,
           /* method */
-          "closeOthers",
-          /* keepIndex */
-          state58.focusedIndex,
-          /* focusIndex */
+          "closeTabsLeft",
+          /* index */
           state58.focusedIndex
         );
       } else {
@@ -29289,17 +29356,27 @@ var init_ViewletMain = __esm({
           /* id */
           state58.uid,
           /* method */
-          "closeOthers",
-          /* keepIndex */
-          state58.focusedIndex,
-          /* focusIndex */
+          "closeTabsLeft",
+          /* index */
           state58.focusedIndex
         );
       }
-      state58.editors = [state58.editors[state58.focusedIndex]];
-      state58.activeIndex = 0;
-      state58.focusedIndex = 0;
+      state58.editors = state58.editors.slice(state58.focusedIndex);
+      state58.activeIndex = state58.focusedIndex;
     };
+  }
+});
+
+// src/parts/ViewletMain/ViewletMainCloseTabsRight.js
+var ViewletMainCloseTabsRight_exports = {};
+__export(ViewletMainCloseTabsRight_exports, {
+  closeTabsRight: () => closeTabsRight
+});
+var closeTabsRight;
+var init_ViewletMainCloseTabsRight = __esm({
+  "src/parts/ViewletMain/ViewletMainCloseTabsRight.js"() {
+    "use strict";
+    init_RendererProcess();
     closeTabsRight = async (state58) => {
       if (state58.focusedIndex >= state58.activeIndex) {
         await invoke2(
@@ -29327,82 +29404,65 @@ var init_ViewletMain = __esm({
       state58.editors = state58.editors.slice(0, state58.focusedIndex + 1);
       state58.activeIndex = state58.focusedIndex;
     };
-    closeTabsLeft = async (state58) => {
-      if (state58.focusedIndex <= state58.activeIndex) {
-        await invoke2(
-          /* Viewlet.send */
-          "Viewlet.send",
-          /* id */
-          state58.uid,
-          /* method */
-          "closeTabsLeft",
-          /* index */
-          state58.focusedIndex
-        );
+  }
+});
+
+// src/parts/ViewletMain/ViewletMainCloseOthers.js
+var ViewletMainCloseOthers_exports = {};
+__export(ViewletMainCloseOthers_exports, {
+  closeOthers: () => closeOthers
+});
+var closeOthers;
+var init_ViewletMainCloseOthers = __esm({
+  "src/parts/ViewletMain/ViewletMainCloseOthers.js"() {
+    "use strict";
+    init_Id();
+    init_RendererProcess();
+    init_Viewlet();
+    init_ViewletManager();
+    init_ViewletMap();
+    init_ViewletModule();
+    init_ViewletModuleId();
+    closeOthers = async (state58) => {
+      const commands = [];
+      if (state58.focusedIndex === state58.activeIndex) {
+        state58.editors = [state58.editors[state58.focusedIndex]];
+        state58.focusedIndex = 0;
+        state58.activeIndex = 0;
+        commands.push(["Viewlet.send", state58.tabsUid, "setTabs", state58.editors]);
+        commands.push(["Viewlet.send", state58.tabsUid, "setFocusedIndex", -1, 0]);
       } else {
-        await invoke2(
-          /* Viewlet.send */
-          "Viewlet.send",
-          /* id */
-          state58.uid,
-          /* method */
-          "closeTabsLeft",
-          /* index */
-          state58.focusedIndex
-        );
-      }
-      state58.editors = state58.editors.slice(state58.focusedIndex);
-      state58.activeIndex = state58.focusedIndex;
-    };
-    resize8 = (state58, dimensions) => {
-      const { editors } = state58;
-      const x2 = dimensions.x;
-      const y2 = dimensions.y + state58.tabHeight;
-      const width = dimensions.width;
-      const height = dimensions.height - state58.tabHeight;
-      const childDimensions = {
-        x: x2,
-        y: y2,
-        width,
-        height
-      };
-      const editor = editors[0];
-      let commands = [];
-      if (editor) {
-        const editorUid = editor.uid;
-        number(editorUid);
-        commands = resize7(editorUid, childDimensions);
-      }
-      return {
-        newState: {
-          ...state58,
-          ...dimensions
-        },
-        commands
-      };
-    };
-    hasFunctionalRender18 = true;
-    renderDragOverlay = {
-      isEqual(oldState, newState) {
-        return oldState.dragOverlayVisible === newState.dragOverlayVisible && oldState.dragOverlayX === newState.dragOverlayX && oldState.dragOverlayY === newState.dragOverlayY && oldState.dragOverlayWidth === newState.dragOverlayWidth && oldState.dragOverlayHeight === newState.dragOverlayHeight;
-      },
-      apply(oldState, newState) {
-        return [
-          "setDragOverlay",
-          newState.dragOverlayVisible,
-          newState.dragOverlayX,
-          newState.dragOverlayY,
-          newState.dragOverlayWidth,
-          newState.dragOverlayHeight
-        ];
+        const activeEditor = state58.editors[state58.activeIndex];
+        state58.editors = [state58.editors[state58.focusedIndex]];
+        state58.focusedIndex = 0;
+        state58.activeIndex = 0;
+        commands.push(["Viewlet.send", state58.tabsUid, "setTabs", state58.editors]);
+        commands.push(["Viewlet.send", state58.tabsUid, "setFocusedIndex", -1, 0]);
+        const disposeCommands = disposeFunctional(activeEditor.uid);
+        commands.push(...disposeCommands);
+        const instanceUid = create();
+        const moduleId = getModuleId2(activeEditor.uri);
+        const x2 = state58.x;
+        const y2 = state58.y + state58.tabHeight;
+        const width = state58.width;
+        const contentHeight = state58.height - state58.tabHeight;
+        const instance = create12(load3, moduleId, Main2, activeEditor.uri, x2, y2, width, contentHeight);
+        instance.uid = instanceUid;
+        instance.show = false;
+        instance.setBounds = false;
+        const instanceCommands = await load(instance, false, false, {});
+        commands.push(...instanceCommands);
+        commands.push(["Viewlet.setBounds", instanceUid, x2, state58.tabHeight, width, contentHeight]);
+        commands.push(["Viewlet.append", state58.uid, instanceUid]);
       }
+      await invoke2("Viewlet.sendMultiple", commands);
+      return state58;
     };
-    render20 = [renderDragOverlay];
   }
 });
 
 // src/parts/ViewletMain/ViewletMainCommands.js
-var Commands18, CommandsWithSideEffects2;
+var Commands18, LazyCommands10, CommandsWithSideEffects2;
 var init_ViewletMainCommands = __esm({
   "src/parts/ViewletMain/ViewletMainCommands.js"() {
     "use strict";
@@ -29414,9 +29474,6 @@ var init_ViewletMainCommands = __esm({
       closeAllEditors,
       closeEditor,
       closeFocusedTab,
-      closeOthers,
-      closeTabsLeft,
-      closeTabsRight,
       focus: focus6,
       focusFirst: focusFirst6,
       focusLast: focusLast6,
@@ -29430,6 +29487,11 @@ var init_ViewletMainCommands = __esm({
       save: save2,
       handleClickClose
     };
+    LazyCommands10 = {
+      closeTabsLeft: () => Promise.resolve().then(() => (init_ViewletMainCloseTabsLeft(), ViewletMainCloseTabsLeft_exports)),
+      closeTabsRight: () => Promise.resolve().then(() => (init_ViewletMainCloseTabsRight(), ViewletMainCloseTabsRight_exports)),
+      closeOthers: () => Promise.resolve().then(() => (init_ViewletMainCloseOthers(), ViewletMainCloseOthers_exports))
+    };
     CommandsWithSideEffects2 = {
       openUri,
       handleDrop: handleDrop4,
@@ -29479,19 +29541,42 @@ var init_ViewletMainKeyBindings = __esm({
   }
 });
 
+// src/parts/ViewletMain/ViewletMainRender.js
+var hasFunctionalRender18, renderDragOverlay, render20;
+var init_ViewletMainRender = __esm({
+  "src/parts/ViewletMain/ViewletMainRender.js"() {
+    "use strict";
+    hasFunctionalRender18 = true;
+    renderDragOverlay = {
+      isEqual(oldState, newState) {
+        return oldState.dragOverlayVisible === newState.dragOverlayVisible && oldState.dragOverlayX === newState.dragOverlayX && oldState.dragOverlayY === newState.dragOverlayY && oldState.dragOverlayWidth === newState.dragOverlayWidth && oldState.dragOverlayHeight === newState.dragOverlayHeight;
+      },
+      apply(oldState, newState) {
+        return [
+          "setDragOverlay",
+          newState.dragOverlayVisible,
+          newState.dragOverlayX,
+          newState.dragOverlayY,
+          newState.dragOverlayWidth,
+          newState.dragOverlayHeight
+        ];
+      }
+    };
+    render20 = [renderDragOverlay];
+  }
+});
+
 // src/parts/ViewletMain/ViewletMain.ipc.js
 var ViewletMain_ipc_exports = {};
 __export(ViewletMain_ipc_exports, {
   Commands: () => Commands18,
   CommandsWithSideEffects: () => CommandsWithSideEffects2,
   Css: () => Css14,
+  LazyCommands: () => LazyCommands10,
   closeActiveEditor: () => closeActiveEditor,
   closeAllEditors: () => closeAllEditors,
   closeEditor: () => closeEditor,
   closeFocusedTab: () => closeFocusedTab,
-  closeOthers: () => closeOthers,
-  closeTabsLeft: () => closeTabsLeft,
-  closeTabsRight: () => closeTabsRight,
   contentLoaded: () => contentLoaded3,
   create: () => create36,
   dispose: () => dispose14,
@@ -29530,6 +29615,7 @@ var init_ViewletMain_ipc = __esm({
     init_ViewletMainCommands();
     init_ViewletMainCss();
     init_ViewletMainKeyBindings();
+    init_ViewletMainRender();
     name29 = "Main";
   }
 });
@@ -30501,11 +30587,11 @@ var init_ViewletPdfPrint = __esm({
 });
 
 // src/parts/ViewletPdf/ViewletPdfCommands.js
-var LazyCommands10;
+var LazyCommands11;
 var init_ViewletPdfCommands = __esm({
   "src/parts/ViewletPdf/ViewletPdfCommands.js"() {
     "use strict";
-    LazyCommands10 = {
+    LazyCommands11 = {
       previous: () => Promise.resolve().then(() => (init_ViewletPdfPrevious(), ViewletPdfPrevious_exports)),
       next: () => Promise.resolve().then(() => (init_ViewletPdfNext(), ViewletPdfNext_exports)),
       focusPage: () => Promise.resolve().then(() => (init_ViewletPdfFocusPage(), ViewletPdfFocusPage_exports)),
@@ -30520,7 +30606,7 @@ var init_ViewletPdfCommands = __esm({
 var ViewletPdf_ipc_exports = {};
 __export(ViewletPdf_ipc_exports, {
   Css: () => Css17,
-  LazyCommands: () => LazyCommands10,
+  LazyCommands: () => LazyCommands11,
   create: () => create43,
   hasFunctionalRender: () => hasFunctionalRender21,
   hasFunctionalResize: () => hasFunctionalResize8,
@@ -32689,7 +32775,7 @@ var init_ViewletQuickPickHandleBeforeInput = __esm({
 });
 
 // src/parts/ViewletQuickPick/ViewletQuickPickCommands.js
-var Commands23, LazyCommands11;
+var Commands23, LazyCommands12;
 var init_ViewletQuickPickCommands = __esm({
   "src/parts/ViewletQuickPick/ViewletQuickPickCommands.js"() {
     "use strict";
@@ -32702,7 +32788,7 @@ var init_ViewletQuickPickCommands = __esm({
       selectIndex: selectIndex4,
       selectItem
     };
-    LazyCommands11 = {
+    LazyCommands12 = {
       focusFirst: () => Promise.resolve().then(() => (init_ViewletQuickPickFocusFirst(), ViewletQuickPickFocusFirst_exports)),
       focusIndex: () => Promise.resolve().then(() => (init_ViewletQuickPickFocusIndex(), ViewletQuickPickFocusIndex_exports)),
       focusLast: () => Promise.resolve().then(() => (init_ViewletQuickPickFocusLast(), ViewletQuickPickFocusLast_exports)),
@@ -32890,7 +32976,7 @@ var ViewletQuickPick_ipc_exports = {};
 __export(ViewletQuickPick_ipc_exports, {
   Commands: () => Commands23,
   Css: () => Css19,
-  LazyCommands: () => LazyCommands11,
+  LazyCommands: () => LazyCommands12,
   create: () => create45,
   dispose: () => dispose19,
   getKeyBindings: () => getKeyBindings8,
@@ -35264,7 +35350,7 @@ var init_ViewletSearchClearSearchResults = __esm({
 });
 
 // src/parts/ViewletSearch/ViewletSearchCommands.js
-var Commands26, LazyCommands12;
+var Commands26, LazyCommands13;
 var init_ViewletSearchCommands = __esm({
   "src/parts/ViewletSearch/ViewletSearchCommands.js"() {
     "use strict";
@@ -35273,7 +35359,7 @@ var init_ViewletSearchCommands = __esm({
     Commands26 = {
       handleInput: handleInput5
     };
-    LazyCommands12 = {
+    LazyCommands13 = {
       handleContextMenu: () => Promise.resolve().then(() => (init_ViewletSearchHandleContextMenu(), ViewletSearchHandleContextMenu_exports)),
       handleContextMenuKeyboard: () => Promise.resolve().then(() => (init_ViewletSearchHandleContextMenuKeyBoard(), ViewletSearchHandleContextMenuKeyBoard_exports)),
       handleContextMenuMouseAt: () => Promise.resolve().then(() => (init_ViewletSearchHandleContextMenuMouseAt(), ViewletSearchHandleContextMenuMouseAt_exports)),
@@ -35313,7 +35399,8 @@ var init_ViewletSearchCss = __esm({
       "/css/parts/ViewletList.css",
       "/css/parts/ViewletSearch.css",
       "/css/parts/TreeItem.css",
-      "/css/parts/ScrollBar.css"
+      "/css/parts/ScrollBar.css",
+      "/css/parts/FileIcon.css"
     ];
   }
 });
@@ -35543,7 +35630,7 @@ var ViewletSearch_ipc_exports = {};
 __export(ViewletSearch_ipc_exports, {
   Commands: () => Commands26,
   Css: () => Css22,
-  LazyCommands: () => LazyCommands12,
+  LazyCommands: () => LazyCommands13,
   create: () => create48,
   dispose: () => dispose22,
   getActions: () => getActions7,
@@ -35956,7 +36043,7 @@ var init_IframeSrc = __esm({
 });
 
 // src/parts/ViewletSimpleBrowser/ViewletSimpleBrowser.js
-var create50, isFallThroughKeyBinding, getFallThroughKeyBindings, saveState9, getUrlFromSavedState, backgroundLoadContent, getId5, loadContent30, show3, hide3, handleInput6, go, handleWillNavigate, handleDidNavigate, handleDidNavigationCancel, handleTitleUpdated, dispose24;
+var create50, isFallThroughKeyBinding, getFallThroughKeyBindings, saveState9, getUrlFromSavedState, backgroundLoadContent, getId4, loadContent30, show3, hide3, handleInput6, go, handleWillNavigate, handleDidNavigate, handleDidNavigationCancel, handleTitleUpdated, dispose24;
 var init_ViewletSimpleBrowser = __esm({
   "src/parts/ViewletSimpleBrowser/ViewletSimpleBrowser.js"() {
     "use strict";
@@ -36023,7 +36110,7 @@ var init_ViewletSimpleBrowser = __esm({
         iframeSrc
       };
     };
-    getId5 = (idPart) => {
+    getId4 = (idPart) => {
       if (!idPart) {
         return 0;
       }
@@ -36032,7 +36119,7 @@ var init_ViewletSimpleBrowser = __esm({
     loadContent30 = async (state58, savedState) => {
       const { x: x2, y: y2, width, height, headerHeight, uri } = state58;
       const idPart = uri.slice("simple-browser://".length);
-      const id = getId5(idPart);
+      const id = getId4(idPart);
       const iframeSrc = getUrlFromSavedState(savedState);
       const keyBindings = await getKeyBindings5();
       const suggestionsEnabled = get("simpleBrowser.suggestions");
@@ -37150,6 +37237,7 @@ var init_MenuEntriesTab = __esm({
     init_I18NString();
     init_MenuItemFlags();
     init_ViewletStates();
+    init_ViewletModuleId();
     UiStrings37 = {
       Close: "Close",
       CloseOthers: "Close Others",
@@ -37158,8 +37246,9 @@ var init_MenuEntriesTab = __esm({
       RevealInExplorer: "Reveal in Explorer"
     };
     getMenuEntries13 = () => {
-      const mainState = getState("Main");
-      const editor = mainState.editors[mainState.focusedIndex];
+      const mainState = getState(Main2);
+      const editors = mainState.editors;
+      const editor = editors[mainState.focusedIndex];
       const uri = editor.uri;
       return [
         {
@@ -37184,10 +37273,7 @@ var init_MenuEntriesTab = __esm({
           id: "tabCloseAll",
           label: i18nString(UiStrings37.CloseAll),
           flags: None11,
-          command: (
-            /* TODO */
-            -1
-          )
+          command: "Main.closeAllEditors"
         },
         {
           id: "revealInExplorer",
@@ -38071,7 +38157,7 @@ var init_ViewletSimpleBrowserCancelNavigation = __esm({
 });
 
 // src/parts/ViewletSimpleBrowser/ViewletSimpleBrowserCommands.js
-var Commands28, LazyCommands13;
+var Commands28, LazyCommands14;
 var init_ViewletSimpleBrowserCommands = __esm({
   "src/parts/ViewletSimpleBrowser/ViewletSimpleBrowserCommands.js"() {
     "use strict";
@@ -38084,7 +38170,7 @@ var init_ViewletSimpleBrowserCommands = __esm({
       handleTitleUpdated,
       handleWillNavigate
     };
-    LazyCommands13 = {
+    LazyCommands14 = {
       openExternal: () => Promise.resolve().then(() => (init_ViewletSimpleBrowserOpenExternal(), ViewletSimpleBrowserOpenExternal_exports)),
       openBackgroundTab: () => Promise.resolve().then(() => (init_ViewletSimpleBrowserOpenBackgroundTab(), ViewletSimpleBrowserOpenBackgroundTab_exports)),
       handleContextMenu: () => Promise.resolve().then(() => (init_ViewletSimpleBrowserHandleContextMenu(), ViewletSimpleBrowserHandleContextMenu_exports)),
@@ -38178,7 +38264,7 @@ var ViewletSimpleBrowser_ipc_exports = {};
 __export(ViewletSimpleBrowser_ipc_exports, {
   Commands: () => Commands28,
   Css: () => Css24,
-  LazyCommands: () => LazyCommands13,
+  LazyCommands: () => LazyCommands14,
   backgroundLoadContent: () => backgroundLoadContent,
   create: () => create50,
   dispose: () => dispose24,
@@ -38791,7 +38877,7 @@ var init_ViewletSourceControlAcceptInput = __esm({
 });
 
 // src/parts/ViewletSourceControl/ViewletSourceControlCommands.js
-var Commands30, LazyCommands14;
+var Commands30, LazyCommands15;
 var init_ViewletSourceControlCommands = __esm({
   "src/parts/ViewletSourceControl/ViewletSourceControlCommands.js"() {
     "use strict";
@@ -38801,7 +38887,7 @@ var init_ViewletSourceControlCommands = __esm({
       handleMouseOver,
       handleMouseOut
     };
-    LazyCommands14 = {
+    LazyCommands15 = {
       handleContextMenu: () => Promise.resolve().then(() => (init_ViewletSourceControlHandleContextMenu(), ViewletSourceControlHandleContextMenu_exports)),
       handleClick: () => Promise.resolve().then(() => (init_ViewletSourceControlHandleClick(), ViewletSourceControlHandleClick_exports)),
       handleButtonClick: () => Promise.resolve().then(() => (init_ViewletSourceControlHandleButtonClick(), ViewletSourceControlHandleButtonClick_exports)),
@@ -38884,7 +38970,7 @@ var ViewletSourceControl_ipc_exports = {};
 __export(ViewletSourceControl_ipc_exports, {
   Commands: () => Commands30,
   Css: () => Css25,
-  LazyCommands: () => LazyCommands14,
+  LazyCommands: () => LazyCommands15,
   create: () => create51,
   dispose: () => dispose25,
   getActions: () => getActions8,
@@ -39582,12 +39668,12 @@ var init_ViewletTitleBarButtonsHandleClickToggleMaximize = __esm({
 });
 
 // src/parts/ViewletTitleBarButtons/ViewletTitleBarButtonsCommands.js
-var Commands34, LazyCommands15;
+var Commands34, LazyCommands16;
 var init_ViewletTitleBarButtonsCommands = __esm({
   "src/parts/ViewletTitleBarButtons/ViewletTitleBarButtonsCommands.js"() {
     "use strict";
     Commands34 = {};
-    LazyCommands15 = {
+    LazyCommands16 = {
       handleClickClose: () => Promise.resolve().then(() => (init_ViewletTitleBarButtonsHandleClickClose(), ViewletTitleBarButtonsHandleClickClose_exports)),
       handleClickMinimize: () => Promise.resolve().then(() => (init_ViewletTitleBarButtonsHandleClickMinimize(), ViewletTitleBarButtonsHandleClickMinimize_exports)),
       handleClickToggleMaximize: () => Promise.resolve().then(() => (init_ViewletTitleBarButtonsHandleClickToggleMaximize(), ViewletTitleBarButtonsHandleClickToggleMaximize_exports))
@@ -39647,7 +39733,7 @@ var ViewletTitleBarButtons_ipc_exports = {};
 __export(ViewletTitleBarButtons_ipc_exports, {
   Commands: () => Commands34,
   Css: () => Css29,
-  LazyCommands: () => LazyCommands15,
+  LazyCommands: () => LazyCommands16,
   create: () => create55,
   dispose: () => dispose27,
   hasFunctionalRender: () => hasFunctionalRender32,
@@ -41371,7 +41457,7 @@ var init_ViewletTitleBarMenuBarHandleClick = __esm({
 var ViewletTitleBarMenuBar_ipc_exports = {};
 __export(ViewletTitleBarMenuBar_ipc_exports, {
   Css: () => Css30,
-  LazyCommands: () => LazyCommands16,
+  LazyCommands: () => LazyCommands17,
   create: () => create56,
   getKeyBindings: () => getKeyBindings9,
   hasFunctionalRender: () => hasFunctionalRender33,
@@ -41379,7 +41465,7 @@ __export(ViewletTitleBarMenuBar_ipc_exports, {
   name: () => name53,
   render: () => render36
 });
-var name53, LazyCommands16;
+var name53, LazyCommands17;
 var init_ViewletTitleBarMenuBar_ipc = __esm({
   "src/parts/ViewletTitleBarMenuBar/ViewletTitleBarMenuBar.ipc.js"() {
     "use strict";
@@ -41388,7 +41474,7 @@ var init_ViewletTitleBarMenuBar_ipc = __esm({
     init_ViewletTitleBarMenuBarKeyBindings();
     init_ViewletTitleBarMenuBarRender();
     name53 = "TitleBarMenuBar";
-    LazyCommands16 = {
+    LazyCommands17 = {
       closeMenu: () => Promise.resolve().then(() => (init_ViewletTitleBarMenuBarCloseMenu(), ViewletTitleBarMenuBarCloseMenu_exports)),
       focus: () => Promise.resolve().then(() => (init_ViewletTitleBarMenuBarFocus(), ViewletTitleBarMenuBarFocus_exports)),
       focusFirst: () => Promise.resolve().then(() => (init_ViewletTitleBarMenuBarFocusFirst(), ViewletTitleBarMenuBarFocusFirst_exports)),
@@ -41610,7 +41696,7 @@ var init_ViewletColorPicker = __esm({
 });
 
 // src/parts/ViewletColorPicker/ViewletColorPickerCommands.js
-var Commands36, LazyCommands17;
+var Commands36, LazyCommands18;
 var init_ViewletColorPickerCommands = __esm({
   "src/parts/ViewletColorPicker/ViewletColorPickerCommands.js"() {
     "use strict";
@@ -41619,7 +41705,7 @@ var init_ViewletColorPickerCommands = __esm({
       handleSliderPointerDown,
       handleSliderPointerMove
     };
-    LazyCommands17 = {};
+    LazyCommands18 = {};
   }
 });
 
@@ -41672,7 +41758,7 @@ var ViewletColorPicker_ipc_exports = {};
 __export(ViewletColorPicker_ipc_exports, {
   Commands: () => Commands36,
   Css: () => Css32,
-  LazyCommands: () => LazyCommands17,
+  LazyCommands: () => LazyCommands18,
   create: () => create58,
   handleSliderPointerDown: () => handleSliderPointerDown,
   handleSliderPointerMove: () => handleSliderPointerMove,
@@ -56891,6 +56977,7 @@ var init_Viewlet = __esm({
     init_ElectronBrowserView();
     init_GlobalEventBus();
     init_Id();
+    init_Logger();
     init_RendererProcess();
     init_VError();
     init_ViewletManager();
@@ -56973,7 +57060,7 @@ var init_Viewlet = __esm({
         }
         const instance = getInstance(id);
         if (!instance) {
-          console.info("instance may already be disposed");
+          warn(`cannot dispose instance ${id} because it may already be disposed`);
           return [];
         }
         instance.status = "disposing";
@@ -57168,6 +57255,7 @@ var init_Viewlet = __esm({
     executeViewletCommand = async (uid, fnName, ...args) => {
       const instance = getInstance(uid);
       if (!instance) {
+        warn(`cannot execute ${fnName} instance not found ${uid}`);
         return;
       }
       const fn2 = await getFn3(instance.factory, fnName);