@lvce-editor/main-area-worker 9.11.0 → 9.13.0

package/dist/mainAreaWorkerMain.js

@@ -118,579 +118,255 @@ const terminate = () => {
   globalThis.close();
 };
 
-const getGroupIndexById = (state, groupId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  return groups.findIndex(group => group.id === groupId);
-};
-
-const redistributeSizesWithRounding = groups => {
-  return groups.map(group => ({
-    ...group,
-    size: Math.round(100 / groups.length)
-  }));
-};
-
-const withGroupsAndActiveGroup = (state, groups, activeGroupId) => {
-  return {
-    ...state,
-    layout: {
-      ...state.layout,
-      activeGroupId,
-      groups
-    }
-  };
+const normalizeLine = line => {
+  if (line.startsWith('Error: ')) {
+    return line.slice('Error: '.length);
+  }
+  if (line.startsWith('VError: ')) {
+    return line.slice('VError: '.length);
+  }
+  return line;
 };
-
-const withEmptyGroups = state => {
-  return withGroupsAndActiveGroup(state, [], undefined);
+const getCombinedMessage = (error, message) => {
+  const stringifiedError = normalizeLine(`${error}`);
+  if (message) {
+    return `${message}: ${stringifiedError}`;
+  }
+  return stringifiedError;
 };
-
-const withGroups = (state, groups) => {
-  return {
-    ...state,
-    layout: {
-      ...state.layout,
-      groups
-    }
-  };
+const NewLine$2 = '\n';
+const getNewLineIndex$1 = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$2, startIndex);
 };
-
-const closeTab = (state, groupId, tabId) => {
-  const {
-    activeGroupId,
-    groups
-  } = state.layout;
-
-  // Find the group to close the tab from
-  const groupIndex = getGroupIndexById(state, groupId);
-  if (groupIndex === -1) {
-    return state;
+const mergeStacks = (parent, child) => {
+  if (!child) {
+    return parent;
   }
-  const group = groups[groupIndex];
-  // Check if the tab exists in the group
-  const tabWasRemoved = group.tabs.some(tab => tab.id === tabId);
-  if (!tabWasRemoved) {
-    return state;
+  const parentNewLineIndex = getNewLineIndex$1(parent);
+  const childNewLineIndex = getNewLineIndex$1(child);
+  if (childNewLineIndex === -1) {
+    return parent;
   }
-  const newGroups = groups.map(grp => {
-    if (grp.id === groupId) {
-      const newTabs = grp.tabs.filter(tab => tab.id !== tabId);
-      let newActiveTabId = grp.activeTabId;
-      if (grp.activeTabId === tabId) {
-        const tabIndex = grp.tabs.findIndex(tab => tab.id === tabId);
-        if (newTabs.length > 0) {
-          newActiveTabId = newTabs[Math.min(tabIndex, newTabs.length - 1)].id;
-        } else {
-          newActiveTabId = undefined;
-        }
-      }
-      return {
-        ...grp,
-        activeTabId: newActiveTabId,
-        isEmpty: newTabs.length === 0,
-        tabs: newTabs
-      };
+  const parentFirstLine = parent.slice(0, parentNewLineIndex);
+  const childRest = child.slice(childNewLineIndex);
+  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
+  if (parentFirstLine.includes(childFirstLine)) {
+    return parentFirstLine + childRest;
+  }
+  return child;
+};
+class VError extends Error {
+  constructor(error, message) {
+    const combinedMessage = getCombinedMessage(error, message);
+    super(combinedMessage);
+    this.name = 'VError';
+    if (error instanceof Error) {
+      this.stack = mergeStacks(this.stack, error.stack);
     }
-    return grp;
-  });
-
-  // If the group has no tabs left after closing, remove the group
-  const groupIsNowEmpty = newGroups[groupIndex].tabs.length === 0;
-  if (groupIsNowEmpty) {
-    const remainingGroups = newGroups.filter(group => group.id !== groupId);
-
-    // If there are remaining groups, redistribute sizes
-    if (remainingGroups.length > 0) {
-      const redistributedGroups = redistributeSizesWithRounding(remainingGroups);
-      const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0]?.id : activeGroupId;
-      return withGroupsAndActiveGroup(state, redistributedGroups, newActiveGroupId);
+    if (error.codeFrame) {
+      // @ts-ignore
+      this.codeFrame = error.codeFrame;
+    }
+    if (error.code) {
+      // @ts-ignore
+      this.code = error.code;
     }
-
-    // If no remaining groups, return empty layout
-    return withEmptyGroups(state);
   }
-  return withGroups(state, newGroups);
-};
-
-const getFocusedGroup = state => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  return groups.find(group => group.focused);
-};
+}
 
-const closeActiveEditor = state => {
-  const focusedGroup = getFocusedGroup(state);
-  if (!focusedGroup) {
-    return state;
+class AssertionError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'AssertionError';
   }
-  const {
-    activeTabId
-  } = focusedGroup;
-  if (activeTabId === undefined) {
-    return state;
+}
+const Object$1 = 1;
+const Number$1 = 2;
+const Array$1 = 3;
+const String$1 = 4;
+const Boolean$1 = 5;
+const Function = 6;
+const Null = 7;
+const Unknown = 8;
+const getType = value => {
+  switch (typeof value) {
+    case 'number':
+      return Number$1;
+    case 'function':
+      return Function;
+    case 'string':
+      return String$1;
+    case 'object':
+      if (value === null) {
+        return Null;
+      }
+      if (Array.isArray(value)) {
+        return Array$1;
+      }
+      return Object$1;
+    case 'boolean':
+      return Boolean$1;
+    default:
+      return Unknown;
   }
-  return closeTab(state, focusedGroup.id, activeTabId);
-};
-
-const closeAll$1 = state => {
-  return withEmptyGroups(state);
 };
-
-const redistributeSizesWithRemainder = groups => {
-  const baseSize = Math.floor(100 / groups.length);
-  const remainder = 100 % groups.length;
-  return groups.map((group, index) => ({
-    ...group,
-    size: baseSize + (index === groups.length - 1 ? remainder : 0)
-  }));
+const object = value => {
+  const type = getType(value);
+  if (type !== Object$1) {
+    throw new AssertionError('expected value to be of type object');
+  }
 };
-
-const closeEditorGroup$1 = (state, groupId) => {
-  if (Number.isNaN(groupId)) {
-    return state;
+const number = value => {
+  const type = getType(value);
+  if (type !== Number$1) {
+    throw new AssertionError('expected value to be of type number');
   }
-  const {
-    layout
-  } = state;
-  const {
-    activeGroupId,
-    groups
-  } = layout;
-  const groupIndex = getGroupIndexById(state, groupId);
-  if (groupIndex === -1 || groups.length <= 1) {
-    return state;
+};
+const string = value => {
+  const type = getType(value);
+  if (type !== String$1) {
+    throw new AssertionError('expected value to be of type string');
   }
-  const remainingGroups = groups.filter(group => group.id !== groupId);
-  const redistributedGroups = redistributeSizesWithRemainder(remainingGroups);
-  const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0].id : activeGroupId;
-  return withGroupsAndActiveGroup(state, redistributedGroups, newActiveGroupId);
 };
 
-const isFocused = group => {
-  return group.focused;
+const isMessagePort = value => {
+  return value && value instanceof MessagePort;
 };
-const closeFocusedTab = state => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const focusedGroup = groups.find(isFocused);
-  if (!focusedGroup) {
-    return state;
-  }
-  const {
-    activeTabId
-  } = focusedGroup;
-  if (activeTabId === undefined) {
-    return state;
-  }
-  return closeTab(state, focusedGroup.id, activeTabId);
+const isMessagePortMain = value => {
+  return value && value.constructor && value.constructor.name === 'MessagePortMain';
 };
-
-const closeOtherTabs = (state, groupId) => {
-  const {
-    layout
-  } = state;
-  const {
-    activeGroupId,
-    groups
-  } = layout;
-  const targetGroupId = groupId ?? activeGroupId;
-  if (targetGroupId === undefined) {
-    return state;
-  }
-  const group = groups.find(g => g.id === targetGroupId);
-  if (!group) {
-    return state;
-  }
-  const {
-    activeTabId
-  } = group;
-  if (activeTabId === undefined) {
-    return state;
-  }
-  const newGroups = groups.map(g => {
-    if (g.id === targetGroupId) {
-      const newTabs = g.tabs.filter(tab => tab.id === activeTabId);
-      return {
-        ...g,
-        activeTabId,
-        isEmpty: newTabs.length === 0,
-        tabs: newTabs
-      };
-    }
-    return g;
-  });
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      groups: newGroups
+const isOffscreenCanvas = value => {
+  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
+};
+const isInstanceOf = (value, constructorName) => {
+  return value?.constructor?.name === constructorName;
+};
+const isSocket = value => {
+  return isInstanceOf(value, 'Socket');
+};
+const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
+const isTransferrable = value => {
+  for (const fn of transferrables) {
+    if (fn(value)) {
+      return true;
     }
-  };
+  }
+  return false;
 };
-
-const getNextActiveTabId = (tabs, newTabs, activeTabId) => {
-  if (activeTabId === undefined) {
-    return undefined;
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
   }
-  if (newTabs.some(tab => tab.id === activeTabId)) {
-    return activeTabId;
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
   }
-  const activeTabIndex = tabs.findIndex(tab => tab.id === activeTabId);
-  if (activeTabIndex === -1 || newTabs.length === 0) {
-    return undefined;
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
   }
-  return newTabs[Math.min(activeTabIndex, newTabs.length - 1)].id;
-};
-const closeSavedInGroup = group => {
-  const {
-    activeTabId,
-    tabs
-  } = group;
-  const newTabs = tabs.filter(tab => tab.isDirty);
-  if (newTabs.length === tabs.length) {
-    return group;
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
   }
-  const newActiveTabId = getNextActiveTabId(tabs, newTabs, activeTabId);
-  return {
-    ...group,
-    activeTabId: newActiveTabId,
-    isEmpty: newTabs.length === 0,
-    tabs: newTabs
-  };
 };
-const closeSaved$1 = state => {
-  const {
-    groups
-  } = state.layout;
-  const newGroups = groups.map(closeSavedInGroup);
-  return withGroups(state, newGroups);
+const getTransferrables = value => {
+  const transferrables = [];
+  walkValue(value, transferrables, isTransferrable);
+  return transferrables;
 };
-
-const closeTabsByUris = (state, uris) => {
-  let currentState = state;
-  for (const uri of uris) {
-    while (true) {
-      const matchingGroup = currentState.layout.groups.find(group => {
-        return group.tabs.some(tab => tab.uri === uri);
-      });
-      if (!matchingGroup) {
-        break;
+const removeValues = (value, toRemove) => {
+  if (!value) {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    const newItems = [];
+    for (const item of value) {
+      if (!toRemove.includes(item)) {
+        newItems.push(removeValues(item, toRemove));
       }
-      const matchingTab = matchingGroup.tabs.find(tab => tab.uri === uri);
-      if (!matchingTab) {
-        break;
+    }
+    return newItems;
+  }
+  if (typeof value === 'object') {
+    const newObject = Object.create(null);
+    for (const [key, property] of Object.entries(value)) {
+      if (!toRemove.includes(property)) {
+        newObject[key] = removeValues(property, toRemove);
       }
-      currentState = closeTab(currentState, matchingGroup.id, matchingTab.id);
     }
+    return newObject;
   }
-  return currentState;
+  return value;
 };
 
-const getGroupById = (state, groupId) => {
-  return state.layout.groups.find(group => group.id === groupId);
+// workaround for electron not supporting transferrable objects
+// as parameters. If the transferrable object is a parameter, in electron
+// only an empty objected is received in the main process
+const fixElectronParameters = value => {
+  const transfer = getTransferrables(value);
+  const newValue = removeValues(value, transfer);
+  return {
+    newValue,
+    transfer
+  };
 };
-
-const closeTabsRight = (state, groupId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const group = getGroupById(state, groupId);
-  if (!group) {
-    return state;
-  }
+const getActualDataElectron = event => {
   const {
-    activeTabId,
-    tabs
-  } = group;
-  if (activeTabId === undefined) {
-    return state;
-  }
-  const activeTabIndex = tabs.findIndex(tab => tab.id === activeTabId);
-  if (activeTabIndex === -1) {
-    return state;
-  }
-  const newTabs = tabs.slice(0, activeTabIndex + 1);
-  if (newTabs.length === tabs.length) {
-    return state;
+    data,
+    ports
+  } = event;
+  if (ports.length === 0) {
+    return data;
   }
-  const newGroups = groups.map(g => {
-    if (g.id === groupId) {
-      return {
-        ...g,
-        isEmpty: newTabs.length === 0,
-        tabs: newTabs
-      };
-    }
-    return g;
-  });
-  return withGroups(state, newGroups);
+  return {
+    ...data,
+    params: [...ports, ...data.params]
+  };
 };
-
-const normalizeLine = line => {
-  if (line.startsWith('Error: ')) {
-    return line.slice('Error: '.length);
-  }
-  if (line.startsWith('VError: ')) {
-    return line.slice('VError: '.length);
-  }
-  return line;
+const attachEvents = that => {
+  const handleMessage = (...args) => {
+    const data = that.getData(...args);
+    that.dispatchEvent(new MessageEvent('message', {
+      data
+    }));
+  };
+  that.onMessage(handleMessage);
+  const handleClose = event => {
+    that.dispatchEvent(new Event('close'));
+  };
+  that.onClose(handleClose);
 };
-const getCombinedMessage = (error, message) => {
-  const stringifiedError = normalizeLine(`${error}`);
-  if (message) {
-    return `${message}: ${stringifiedError}`;
+class Ipc extends EventTarget {
+  constructor(rawIpc) {
+    super();
+    this._rawIpc = rawIpc;
+    attachEvents(this);
   }
-  return stringifiedError;
+}
+const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
+const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
+const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
+const NewLine$1 = '\n';
+const joinLines$1 = lines => {
+  return lines.join(NewLine$1);
 };
-const NewLine$2 = '\n';
-const getNewLineIndex$1 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$2, startIndex);
+const RE_AT = /^\s+at/;
+const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
+const isNormalStackLine = line => {
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
 };
-const mergeStacks = (parent, child) => {
-  if (!child) {
-    return parent;
-  }
-  const parentNewLineIndex = getNewLineIndex$1(parent);
-  const childNewLineIndex = getNewLineIndex$1(child);
-  if (childNewLineIndex === -1) {
-    return parent;
-  }
-  const parentFirstLine = parent.slice(0, parentNewLineIndex);
-  const childRest = child.slice(childNewLineIndex);
-  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
-  if (parentFirstLine.includes(childFirstLine)) {
-    return parentFirstLine + childRest;
-  }
-  return child;
-};
-class VError extends Error {
-  constructor(error, message) {
-    const combinedMessage = getCombinedMessage(error, message);
-    super(combinedMessage);
-    this.name = 'VError';
-    if (error instanceof Error) {
-      this.stack = mergeStacks(this.stack, error.stack);
-    }
-    if (error.codeFrame) {
-      // @ts-ignore
-      this.codeFrame = error.codeFrame;
-    }
-    if (error.code) {
-      // @ts-ignore
-      this.code = error.code;
-    }
-  }
-}
-
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
-  }
-}
-const Object$1 = 1;
-const Number$1 = 2;
-const Array$1 = 3;
-const String$1 = 4;
-const Boolean$1 = 5;
-const Function = 6;
-const Null = 7;
-const Unknown = 8;
-const getType = value => {
-  switch (typeof value) {
-    case 'number':
-      return Number$1;
-    case 'function':
-      return Function;
-    case 'string':
-      return String$1;
-    case 'object':
-      if (value === null) {
-        return Null;
-      }
-      if (Array.isArray(value)) {
-        return Array$1;
-      }
-      return Object$1;
-    case 'boolean':
-      return Boolean$1;
-    default:
-      return Unknown;
-  }
-};
-const object = value => {
-  const type = getType(value);
-  if (type !== Object$1) {
-    throw new AssertionError('expected value to be of type object');
-  }
-};
-const number = value => {
-  const type = getType(value);
-  if (type !== Number$1) {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
-const string = value => {
-  const type = getType(value);
-  if (type !== String$1) {
-    throw new AssertionError('expected value to be of type string');
-  }
-};
-
-const isMessagePort = value => {
-  return value && value instanceof MessagePort;
-};
-const isMessagePortMain = value => {
-  return value && value.constructor && value.constructor.name === 'MessagePortMain';
-};
-const isOffscreenCanvas = value => {
-  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
-};
-const isInstanceOf = (value, constructorName) => {
-  return value?.constructor?.name === constructorName;
-};
-const isSocket = value => {
-  return isInstanceOf(value, 'Socket');
-};
-const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
-const isTransferrable = value => {
-  for (const fn of transferrables) {
-    if (fn(value)) {
-      return true;
-    }
-  }
-  return false;
-};
-const walkValue = (value, transferrables, isTransferrable) => {
-  if (!value) {
-    return;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables, isTransferrable);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables, isTransferrable);
-    }
-    return;
-  }
-};
-const getTransferrables = value => {
-  const transferrables = [];
-  walkValue(value, transferrables, isTransferrable);
-  return transferrables;
-};
-const removeValues = (value, toRemove) => {
-  if (!value) {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    const newItems = [];
-    for (const item of value) {
-      if (!toRemove.includes(item)) {
-        newItems.push(removeValues(item, toRemove));
-      }
-    }
-    return newItems;
-  }
-  if (typeof value === 'object') {
-    const newObject = Object.create(null);
-    for (const [key, property] of Object.entries(value)) {
-      if (!toRemove.includes(property)) {
-        newObject[key] = removeValues(property, toRemove);
-      }
-    }
-    return newObject;
-  }
-  return value;
-};
-
-// workaround for electron not supporting transferrable objects
-// as parameters. If the transferrable object is a parameter, in electron
-// only an empty objected is received in the main process
-const fixElectronParameters = value => {
-  const transfer = getTransferrables(value);
-  const newValue = removeValues(value, transfer);
-  return {
-    newValue,
-    transfer
-  };
-};
-const getActualDataElectron = event => {
-  const {
-    data,
-    ports
-  } = event;
-  if (ports.length === 0) {
-    return data;
-  }
-  return {
-    ...data,
-    params: [...ports, ...data.params]
-  };
-};
-const attachEvents = that => {
-  const handleMessage = (...args) => {
-    const data = that.getData(...args);
-    that.dispatchEvent(new MessageEvent('message', {
-      data
-    }));
-  };
-  that.onMessage(handleMessage);
-  const handleClose = event => {
-    that.dispatchEvent(new Event('close'));
-  };
-  that.onClose(handleClose);
-};
-class Ipc extends EventTarget {
-  constructor(rawIpc) {
-    super();
-    this._rawIpc = rawIpc;
-    attachEvents(this);
-  }
-}
-const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
-const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
-const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
-const NewLine$1 = '\n';
-const joinLines$1 = lines => {
-  return lines.join(NewLine$1);
-};
-const RE_AT = /^\s+at/;
-const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
-const isNormalStackLine = line => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
-};
-const getDetails = lines => {
-  const index = lines.findIndex(isNormalStackLine);
-  if (index === -1) {
-    return {
-      actualMessage: joinLines$1(lines),
-      rest: []
-    };
+const getDetails = lines => {
+  const index = lines.findIndex(isNormalStackLine);
+  if (index === -1) {
+    return {
+      actualMessage: joinLines$1(lines),
+      rest: []
+    };
   }
   let lastIndex = index - 1;
   while (++lastIndex < lines.length) {
@@ -1769,6 +1445,9 @@ const {
   invokeAndTransfer,
   set: set$1
 } = create$3(RendererWorker);
+const handleModifiedStatusChange$1 = async (uri, modified) => {
+  return invoke('Main.handleModifiedStatusChange', uri, modified);
+};
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1795,6 +1474,356 @@ const writeClipBoardText = async text => {
   await invoke('ClipBoard.writeText', /* text */text);
 };
 
+const getGroupIndexById = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  return groups.findIndex(group => group.id === groupId);
+};
+
+const redistributeSizesWithRounding = groups => {
+  return groups.map(group => ({
+    ...group,
+    size: Math.round(100 / groups.length)
+  }));
+};
+
+const withGroupsAndActiveGroup = (state, groups, activeGroupId) => {
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      activeGroupId,
+      groups
+    }
+  };
+};
+
+const withEmptyGroups = state => {
+  return withGroupsAndActiveGroup(state, [], undefined);
+};
+
+const withGroups = (state, groups) => {
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      groups
+    }
+  };
+};
+
+const closeTab = (state, groupId, tabId) => {
+  const {
+    activeGroupId,
+    groups
+  } = state.layout;
+
+  // Find the group to close the tab from
+  const groupIndex = getGroupIndexById(state, groupId);
+  if (groupIndex === -1) {
+    return state;
+  }
+  const group = groups[groupIndex];
+  // Check if the tab exists in the group
+  const tabWasRemoved = group.tabs.some(tab => tab.id === tabId);
+  if (!tabWasRemoved) {
+    return state;
+  }
+  const newGroups = groups.map(grp => {
+    if (grp.id === groupId) {
+      const newTabs = grp.tabs.filter(tab => tab.id !== tabId);
+      let newActiveTabId = grp.activeTabId;
+      if (grp.activeTabId === tabId) {
+        const tabIndex = grp.tabs.findIndex(tab => tab.id === tabId);
+        if (newTabs.length > 0) {
+          newActiveTabId = newTabs[Math.min(tabIndex, newTabs.length - 1)].id;
+        } else {
+          newActiveTabId = undefined;
+        }
+      }
+      return {
+        ...grp,
+        activeTabId: newActiveTabId,
+        isEmpty: newTabs.length === 0,
+        tabs: newTabs
+      };
+    }
+    return grp;
+  });
+
+  // If the group has no tabs left after closing, remove the group
+  const groupIsNowEmpty = newGroups[groupIndex].tabs.length === 0;
+  if (groupIsNowEmpty) {
+    const remainingGroups = newGroups.filter(group => group.id !== groupId);
+
+    // If there are remaining groups, redistribute sizes
+    if (remainingGroups.length > 0) {
+      const redistributedGroups = redistributeSizesWithRounding(remainingGroups);
+      const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0]?.id : activeGroupId;
+      return withGroupsAndActiveGroup(state, redistributedGroups, newActiveGroupId);
+    }
+
+    // If no remaining groups, return empty layout
+    return withEmptyGroups(state);
+  }
+  return withGroups(state, newGroups);
+};
+
+const findTabInState = (state, groupId, tabId) => {
+  const {
+    layout
+  } = state;
+  const group = layout.groups.find(g => g.id === groupId);
+  return group?.tabs.find(t => t.id === tabId);
+};
+
+const saveEditor = async editorUid => {
+  return invoke('Editor.save', editorUid);
+};
+
+const closeTabAndSave = async (state, groupId, tabId) => {
+  const tab = findTabInState(state, groupId, tabId);
+  if (!tab) {
+    return state;
+  }
+  if (tab.editorUid !== -1) {
+    const editorState = await saveEditor(tab.editorUid);
+    if (!editorState?.modified && tab.uri) {
+      await handleModifiedStatusChange$1(tab.uri, false);
+    }
+  }
+  return closeTab(state, groupId, tabId);
+};
+
+const getFocusedGroup = state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  return groups.find(group => group.focused);
+};
+
+const closeActiveEditor = async state => {
+  const focusedGroup = getFocusedGroup(state);
+  if (!focusedGroup) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = focusedGroup;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  return closeTabAndSave(state, focusedGroup.id, activeTabId);
+};
+
+const closeAll$1 = state => {
+  return withEmptyGroups(state);
+};
+
+const redistributeSizesWithRemainder = groups => {
+  const baseSize = Math.floor(100 / groups.length);
+  const remainder = 100 % groups.length;
+  return groups.map((group, index) => ({
+    ...group,
+    size: baseSize + (index === groups.length - 1 ? remainder : 0)
+  }));
+};
+
+const closeEditorGroup$1 = (state, groupId) => {
+  if (Number.isNaN(groupId)) {
+    return state;
+  }
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const groupIndex = getGroupIndexById(state, groupId);
+  if (groupIndex === -1 || groups.length <= 1) {
+    return state;
+  }
+  const remainingGroups = groups.filter(group => group.id !== groupId);
+  const redistributedGroups = redistributeSizesWithRemainder(remainingGroups);
+  const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0].id : activeGroupId;
+  return withGroupsAndActiveGroup(state, redistributedGroups, newActiveGroupId);
+};
+
+const isFocused = group => {
+  return group.focused;
+};
+const closeFocusedTab = async state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const focusedGroup = groups.find(isFocused);
+  if (!focusedGroup) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = focusedGroup;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  return closeTabAndSave(state, focusedGroup.id, activeTabId);
+};
+
+const closeOtherTabs = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const targetGroupId = groupId ?? activeGroupId;
+  if (targetGroupId === undefined) {
+    return state;
+  }
+  const group = groups.find(g => g.id === targetGroupId);
+  if (!group) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = group;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  const newGroups = groups.map(g => {
+    if (g.id === targetGroupId) {
+      const newTabs = g.tabs.filter(tab => tab.id === activeTabId);
+      return {
+        ...g,
+        activeTabId,
+        isEmpty: newTabs.length === 0,
+        tabs: newTabs
+      };
+    }
+    return g;
+  });
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: newGroups
+    }
+  };
+};
+
+const getNextActiveTabId = (tabs, newTabs, activeTabId) => {
+  if (activeTabId === undefined) {
+    return undefined;
+  }
+  if (newTabs.some(tab => tab.id === activeTabId)) {
+    return activeTabId;
+  }
+  const activeTabIndex = tabs.findIndex(tab => tab.id === activeTabId);
+  if (activeTabIndex === -1 || newTabs.length === 0) {
+    return undefined;
+  }
+  return newTabs[Math.min(activeTabIndex, newTabs.length - 1)].id;
+};
+const closeSavedInGroup = group => {
+  const {
+    activeTabId,
+    tabs
+  } = group;
+  const newTabs = tabs.filter(tab => tab.isDirty);
+  if (newTabs.length === tabs.length) {
+    return group;
+  }
+  const newActiveTabId = getNextActiveTabId(tabs, newTabs, activeTabId);
+  return {
+    ...group,
+    activeTabId: newActiveTabId,
+    isEmpty: newTabs.length === 0,
+    tabs: newTabs
+  };
+};
+const closeSaved$1 = state => {
+  const {
+    groups
+  } = state.layout;
+  const newGroups = groups.map(closeSavedInGroup);
+  return withGroups(state, newGroups);
+};
+
+const closeTabsByUris = (state, uris) => {
+  let currentState = state;
+  for (const uri of uris) {
+    while (true) {
+      const matchingGroup = currentState.layout.groups.find(group => {
+        return group.tabs.some(tab => tab.uri === uri);
+      });
+      if (!matchingGroup) {
+        break;
+      }
+      const matchingTab = matchingGroup.tabs.find(tab => tab.uri === uri);
+      if (!matchingTab) {
+        break;
+      }
+      currentState = closeTab(currentState, matchingGroup.id, matchingTab.id);
+    }
+  }
+  return currentState;
+};
+
+const getGroupById = (state, groupId) => {
+  return state.layout.groups.find(group => group.id === groupId);
+};
+
+const closeTabsRight = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const group = getGroupById(state, groupId);
+  if (!group) {
+    return state;
+  }
+  const {
+    activeTabId,
+    tabs
+  } = group;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  const activeTabIndex = tabs.findIndex(tab => tab.id === activeTabId);
+  if (activeTabIndex === -1) {
+    return state;
+  }
+  const newTabs = tabs.slice(0, activeTabIndex + 1);
+  if (newTabs.length === tabs.length) {
+    return state;
+  }
+  const newGroups = groups.map(g => {
+    if (g.id === groupId) {
+      return {
+        ...g,
+        isEmpty: newTabs.length === 0,
+        tabs: newTabs
+      };
+    }
+    return g;
+  });
+  return withGroups(state, newGroups);
+};
+
 const copyPath$1 = async (state, path) => {
   string(path);
   await writeClipBoardText(path);
@@ -1899,6 +1928,99 @@ const diff2 = uid => {
   return result;
 };
 
+const getActiveTabId$1 = state => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = groups.find(group => group.id === activeGroupId);
+  return activeGroup?.activeTabId;
+};
+
+const getSelectedTabBounds = state => {
+  return {
+    height: state.height - state.tabHeight,
+    width: state.width,
+    x: state.x,
+    y: state.y + state.tabHeight
+  };
+};
+
+const getSelectedTabData = (state, groupIndex, index) => {
+  const group = state.layout.groups[groupIndex];
+  if (!group || index < 0 || index >= group.tabs.length) {
+    return undefined;
+  }
+  const tab = group.tabs[index];
+  return {
+    group,
+    groupId: group.id,
+    tab,
+    tabId: tab.id
+  };
+};
+
+const getUpdatedGroups = (groups, groupIndex, needsLoading, tabId) => {
+  return groups.map((group, index) => {
+    if (index !== groupIndex) {
+      return {
+        ...group,
+        focused: false
+      };
+    }
+    const tabs = needsLoading ? group.tabs.map(tab => {
+      if (tab.id !== tabId) {
+        return tab;
+      }
+      return {
+        ...tab,
+        errorMessage: '',
+        loadingState: 'loading'
+      };
+    }) : group.tabs;
+    return {
+      ...group,
+      activeTabId: tabId,
+      focused: true,
+      tabs
+    };
+  });
+};
+
+const getViewletModuleId$1 = async uri => {
+  // Query RendererWorker for viewlet module ID (optional, may fail in tests)
+  let viewletModuleId;
+  try {
+    viewletModuleId = await invoke('Layout.getModuleId', uri);
+  } catch {
+    // Viewlet creation is optional - silently ignore if RendererWorker isn't available
+  }
+  return viewletModuleId;
+};
+
+const DiffEditor = 'DiffEditor';
+const EditorText = 'Editor';
+const ExtensionDetail = 'ExtensionDetail';
+const QuickPick = 'QuickPick';
+
+const getViewletModuleIdForEditorInput = async editorInput => {
+  switch (editorInput.type) {
+    case 'diff-editor':
+      return DiffEditor;
+    case 'editor':
+      return getViewletModuleId$1(editorInput.uri);
+    case 'extension-detail-view':
+      return ExtensionDetail;
+  }
+};
+
+const getViewletModuleId = async tab => {
+  return tab.editorInput ? getViewletModuleIdForEditorInput(tab.editorInput) : invoke('Layout.getModuleId', tab.uri);
+};
+
 const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri) => {
   await invoke('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
 };
@@ -2178,54 +2300,6 @@ const findTabById = (state, tabId) => {
   return undefined;
 };
 
-// Counter for request IDs to handle race conditions
-let requestIdCounter = 0;
-const getNextRequestId = () => {
-  return ++requestIdCounter;
-};
-
-const getViewletModuleId$1 = async uri => {
-  // Query RendererWorker for viewlet module ID (optional, may fail in tests)
-  let viewletModuleId;
-  try {
-    viewletModuleId = await invoke('Layout.getModuleId', uri);
-  } catch {
-    // Viewlet creation is optional - silently ignore if RendererWorker isn't available
-  }
-  return viewletModuleId;
-};
-
-const DiffEditor = 'DiffEditor';
-const ExtensionDetail = 'ExtensionDetail';
-const QuickPick = 'QuickPick';
-
-const getViewletModuleIdForEditorInput = async editorInput => {
-  switch (editorInput.type) {
-    case 'diff-editor':
-      return DiffEditor;
-    case 'editor':
-      return getViewletModuleId$1(editorInput.uri);
-    case 'extension-detail-view':
-      return ExtensionDetail;
-  }
-};
-
-const shouldLoadContentForTab = tab => {
-  if (tab.editorInput && tab.editorInput.type !== 'editor') {
-    return false;
-  }
-  if (!tab.uri) {
-    return false;
-  }
-  if (tab.loadingState === 'loading') {
-    return false;
-  }
-  if (tab.loadingState === 'loaded' && tab.editorUid !== -1) {
-    return false;
-  }
-  return true;
-};
-
 const startContentLoading = async (oldState, state, tabId, path, requestId) => {
   try {
     const getLatestState = () => {
@@ -2240,76 +2314,17 @@ const startContentLoading = async (oldState, state, tabId, path, requestId) => {
   return state;
 };
 
-const getActiveTabId$1 = state => {
-  const {
-    layout
-  } = state;
-  const {
-    activeGroupId,
-    groups
-  } = layout;
-  const activeGroup = groups.find(g => g.id === activeGroupId);
-  return activeGroup?.activeTabId;
-};
-const getSelectedTabData = (state, groupIndex, index) => {
-  const group = state.layout.groups[groupIndex];
-  if (!group || index < 0 || index >= group.tabs.length) {
-    return undefined;
-  }
-  const tab = group.tabs[index];
-  return {
-    group,
-    groupId: group.id,
-    tab,
-    tabId: tab.id
-  };
-};
-const getUpdatedGroups = (groups, groupIndex, needsLoading, tabId) => {
-  return groups.map((group, index) => {
-    if (index !== groupIndex) {
-      return {
-        ...group,
-        focused: false
-      };
-    }
-    const tabs = needsLoading ? group.tabs.map(tab => {
-      if (tab.id !== tabId) {
-        return tab;
-      }
-      return {
-        ...tab,
-        errorMessage: '',
-        loadingState: 'loading'
-      };
-    }) : group.tabs;
-    return {
-      ...group,
-      activeTabId: tabId,
-      focused: true,
-      tabs
-    };
-  });
-};
-const shouldCreateViewletForSelectedTab = tab => {
-  return Boolean(tab.uri) && (tab.editorUid === -1 || !tab.loadingState || tab.loadingState === 'loading');
-};
-const getSelectedTabBounds = state => {
-  return {
-    height: state.height - state.tabHeight,
-    width: state.width,
-    x: state.x,
-    y: state.y + state.tabHeight
-  };
-};
-const getViewletModuleId = async tab => {
-  return tab.editorInput ? getViewletModuleIdForEditorInput(tab.editorInput) : invoke('Layout.getModuleId', tab.uri);
-};
 const maybeStartLoading = async (state, newState, tabId, tab, needsLoading, requestId) => {
   if (needsLoading && tab.uri) {
     return startContentLoading(state, newState, tabId, tab.uri, requestId);
   }
   return newState;
 };
+
+const shouldCreateViewletForSelectedTab = tab => {
+  return Boolean(tab.uri) && (tab.editorUid === -1 || !tab.loadingState || tab.loadingState === 'loading');
+};
+
 const maybeCreateViewletForSelectedTab = async (state, newState, groupIndex, index, tabId, tab, uid, needsLoading, requestId, switchCommands) => {
   const selectedTab = newState.layout.groups[groupIndex].tabs[index];
   if (!shouldCreateViewletForSelectedTab(selectedTab)) {
@@ -2338,6 +2353,29 @@ const maybeCreateViewletForSelectedTab = async (state, newState, groupIndex, ind
   }
   return maybeStartLoading(state, stateWithViewlet, tabId, tab, needsLoading, requestId);
 };
+
+// Counter for request IDs to handle race conditions
+let requestIdCounter = 0;
+const getNextRequestId = () => {
+  return ++requestIdCounter;
+};
+
+const shouldLoadContentForTab = tab => {
+  if (tab.editorInput && tab.editorInput.type !== 'editor') {
+    return false;
+  }
+  if (!tab.uri) {
+    return false;
+  }
+  if (tab.loadingState === 'loading') {
+    return false;
+  }
+  if (tab.loadingState === 'loaded' && tab.editorUid !== -1) {
+    return false;
+  }
+  return true;
+};
+
 const selectTab = async (state, groupIndex, index) => {
   const {
     layout,
@@ -3434,7 +3472,7 @@ const handleClickAction = async (state, action, rawGroupId) => {
   }
 };
 
-const handleClickCloseTab = (state, rawGroupIndex, rawIndex) => {
+const handleClickCloseTab = async (state, rawGroupIndex, rawIndex) => {
   if (!rawGroupIndex || !rawIndex) {
     return state;
   }
@@ -3458,7 +3496,7 @@ const handleClickCloseTab = (state, rawGroupIndex, rawIndex) => {
   const tab = group.tabs[index];
   const groupId = group.id;
   const tabId = tab.id;
-  return closeTab(state, groupId, tabId);
+  return closeTabAndSave(state, groupId, tabId);
 };
 
 const handleClickTab = async (state, groupIndexRaw, indexRaw) => {
@@ -3605,6 +3643,7 @@ const newFile = async state => {
     x: stateWithNewTab.x,
     y: stateWithNewTab.y + stateWithNewTab.tabHeight
   };
+  const viewletModuleId = EditorText;
   const stateWithViewlet = createViewletForTab(stateWithNewTab, tabId);
   let intermediateState = stateWithViewlet;
 
@@ -3626,7 +3665,7 @@ const newFile = async state => {
   if (actualEditorUid === -1) {
     throw new Error(`invalid editorUid`);
   }
-  await createViewlet('Editor', actualEditorUid, tabId, bounds, newTab.uri || '');
+  await createViewlet(viewletModuleId, actualEditorUid, tabId, bounds, newTab.uri || '');
 
   // After viewlet is created, get the latest state and mark it as ready
   const {
@@ -5553,33 +5592,54 @@ const renderEventListeners = () => {
   }];
 };
 
-const saveEditor = async editorUid => {
-  await invoke('Editor.save', editorUid);
-};
-const getEditorSaveState = async editorUid => {
-  return invoke('Editor.saveState', editorUid);
+const getLatestStoredState = (uid, fallbackState, referenceTabId, referenceTabUri, allowMissingReference = false) => {
+  const stateFromStore = get(uid);
+  if (!stateFromStore) {
+    return fallbackState;
+  }
+  const storedState = stateFromStore.newState;
+  const storedActiveTabData = getActiveTab(storedState);
+  if (!storedActiveTabData) {
+    return fallbackState;
+  }
+  if (allowMissingReference && referenceTabId === undefined && referenceTabUri === undefined) {
+    return storedState;
+  }
+  if (storedActiveTabData.tab.id === referenceTabId) {
+    return storedState;
+  }
+  if (referenceTabUri && storedActiveTabData.tab.uri === referenceTabUri) {
+    return storedState;
+  }
+  return fallbackState;
 };
-
 const save = async state => {
-  const activeTabData = getActiveTab(state);
+  const requestedActiveTabData = getActiveTab(state);
+  const currentState = getLatestStoredState(state.uid, state, requestedActiveTabData?.tab.id, requestedActiveTabData?.tab.uri, !requestedActiveTabData);
+  const activeTabData = getActiveTab(currentState);
   if (!activeTabData) {
-    return state;
+    return currentState;
   }
   const {
     tab
   } = activeTabData;
   if (tab.loadingState === 'loading') {
-    return state;
+    return currentState;
   }
-  await saveEditor(tab.editorUid);
   if (!tab.isDirty) {
-    return state;
+    await saveEditor(tab.editorUid);
+    return getLatestStoredState(state.uid, currentState, tab.id, tab.uri);
   }
-  const editorState = await getEditorSaveState(tab.editorUid);
-  if (editorState.modified) {
-    return state;
+  const editorState = await saveEditor(tab.editorUid);
+  const latestState = getLatestStoredState(state.uid, currentState, tab.id, tab.uri);
+  if (editorState?.modified) {
+    return latestState;
+  }
+  if (tab.uri) {
+    await handleModifiedStatusChange$1(tab.uri, false);
   }
-  return updateTab(state, tab.id, {
+  const stateAfterModifiedStatusChange = getLatestStoredState(state.uid, latestState, tab.id, tab.uri);
+  return updateTab(stateAfterModifiedStatusChange, tab.id, {
     isDirty: false
   });
 };
@@ -5768,6 +5828,7 @@ const commandMap = {
   'Main.focusNextTab': wrapCommand(focusNextTab),
   'Main.focusPrevious': wrapCommand(focusPreviousTab),
   'Main.focusPreviousTab': wrapCommand(focusPreviousTab),
+  'Main.handleModifiedStatusChange': wrapCommand(handleModifiedStatusChange),
   'Main.handleTabContextMenu': wrapCommand(handleTabContextMenu),
   'Main.openInput': wrapCommand(openInput),
   'Main.openUri': wrapCommand(openUri),