@lvce-editor/source-control-worker 3.17.0 → 3.18.0

package/dist/settings.json

@@ -4,7 +4,7 @@
     "description": "Controls whether source control actions use a split button.",
     "heading": "Split Button",
     "id": "sourceControl.splitButtonEnabled",
-    "type": 3,
+    "type": "boolean",
     "value": "false"
   }
 ]

package/dist/sourceControlWorkerMain.js

@@ -2038,6 +2038,18 @@ const getEnabledProviderIds = (scheme, root, assetDir, platform) => {
 const getGroups$1 = (providerId, root, assetDir, platform) => {
   return getGroups$2(providerId, root, assetDir, platform);
 };
+const getIconDefinition = (icon, baseUri, platform) => {
+  if (!URL.canParse(icon, baseUri)) {
+    throw new Error('Invalid source control icon URL');
+  }
+  const uri = new URL(icon, baseUri).href;
+  if (platform === Electron || platform === Remote) {
+    const protocol = getProtocol(uri);
+    const path = getPath(protocol, uri);
+    return `/remote${path.startsWith('/') ? '' : '/'}${path}`;
+  }
+  return uri;
+};
 const getIconDefinitions = async (providerIds, assetDir, platform) => {
   try {
     if (providerIds.length === 0) {
@@ -2053,15 +2065,7 @@ const getIconDefinitions = async (providerIds, assetDir, platform) => {
     }
     const icons = extension['source-control-icons'].filter(icon => typeof icon === 'string');
     const baseUri = extension.uri.endsWith('/') ? extension.uri : `${extension.uri}/`;
-    return icons.map(icon => {
-      const uri = new URL(icon, baseUri).href;
-      if (platform === Electron || platform === Remote) {
-        const protocol = getProtocol(uri);
-        const path = getPath(protocol, uri);
-        return `/remote${path.startsWith('/') ? '' : '/'}${path}`;
-      }
-      return uri;
-    });
+    return icons.map(icon => getIconDefinition(icon, baseUri, platform));
   } catch {
     return [];
   }
@@ -3914,6 +3918,9 @@ const getIconsDom = (icon, fileIcon) => {
   if (icon === ChevronRight) {
     return [chevron, getIconVirtualDom(icon)];
   }
+  if (!fileIcon) {
+    return [];
+  }
   return [getFileIconVirtualDom(fileIcon)];
 };
 const createItemOther = item => {
@@ -3935,16 +3942,17 @@ const createItemOther = item => {
   const dom = [];
   const hasButtons = buttons.length;
   const buttonsDom = getButtonsVirtualDom(buttons);
+  const iconsDom = getIconsDom(icon, fileIcon);
   const treeItemClassName = getTreeItemClassName(indent);
   dom.push({
     ariaPosInSet: posInSet,
     ariaSetSize: setSize,
-    childCount: 3 + (hasButtons ? 1 : 0),
+    childCount: 2 + (iconsDom.length > 0 ? 1 : 0) + (hasButtons ? 1 : 0),
     className: treeItemClassName,
     role: TreeItem$1,
     title: file,
     type: Div
-  }, ...getIconsDom(icon, fileIcon));
+  }, ...iconsDom);
   const labelDom = {
     childCount: 1,
     className: labelClassName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/source-control-worker",
-  "version": "3.17.0",
+  "version": "3.18.0",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"