@lvce-editor/source-control-worker 1.23.0 → 2.1.0

package/dist/sourceControlWorkerMain.js

@@ -1196,6 +1196,11 @@ const sendMessagePortToMarkdownWorker = async (port, rpcId) => {
   // @ts-ignore
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToMarkdownWorker', port, command, rpcId);
 };
+const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
+  const command = 'IconTheme.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
+};
 const sendMessagePortToFileSystemWorker = async (port, rpcId) => {
   const command = 'FileSystem.handleMessagePort';
   // @ts-ignore
@@ -1462,6 +1467,7 @@ const RendererWorker = {
   sendMessagePortToErrorWorker,
   sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1,
   sendMessagePortToFileSystemWorker,
+  sendMessagePortToIconThemeWorker,
   sendMessagePortToMarkdownWorker,
   sendMessagePortToRendererProcess,
   sendMessagePortToSearchProcess,
@@ -1622,7 +1628,8 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     inputLineHeight: 20,
     inputBoxMaxHeight: 214,
     history: [],
-    viewMode: 1
+    viewMode: 1,
+    iconDefinitions: []
   };
   set$1(id, state, state);
 };
@@ -1720,7 +1727,7 @@ const pathBaseName = path => {
   return path.slice(path.lastIndexOf('/') + 1);
 };
 
-const getDisplayItemsGroup = (group, expandedGroups) => {
+const getDisplayItemsGroup = (group, expandedGroups, iconDefinitions) => {
   const displayItems = [];
   const {
     id,
@@ -1761,6 +1768,10 @@ const getDisplayItemsGroup = (group, expandedGroups) => {
       } = item;
       const baseName = pathBaseName(file);
       const folderName = file.slice(0, -baseName.length - 1);
+      let actualDecorationIcon = icon;
+      if (typeof icon === 'number') {
+        actualDecorationIcon = iconDefinitions[icon];
+      }
       displayItems.push({
         file,
         label: baseName,
@@ -1770,7 +1781,7 @@ const getDisplayItemsGroup = (group, expandedGroups) => {
         icon: getFileIcon({
           name: file
         }),
-        decorationIcon: icon,
+        decorationIcon: actualDecorationIcon,
         decorationIconTitle: iconTitle,
         decorationStrikeThrough: strikeThrough,
         type: File,
@@ -1782,10 +1793,10 @@ const getDisplayItemsGroup = (group, expandedGroups) => {
   return displayItems;
 };
 
-const getDisplayItems = (allGroups, expandedGroups) => {
+const getDisplayItems = (allGroups, expandedGroups, iconDefinitions) => {
   const displayItems = [];
   for (const group of allGroups) {
-    const groupDisplayItems = getDisplayItemsGroup(group, expandedGroups);
+    const groupDisplayItems = getDisplayItemsGroup(group, expandedGroups, iconDefinitions);
     displayItems.push(...groupDisplayItems);
   }
   return displayItems;
@@ -1873,6 +1884,11 @@ const getEnabledProviderIds$1 = (scheme, root) => {
     // noProviderFoundMessage: 'No source control provider found',
   });
 };
+const getIconDefinitions$1 = async providerId => {
+  // @ts-ignore
+  const result = await invoke$1('ExtensionHostSourceControl.getIconDefinitions', providerId);
+  return result;
+};
 
 const getFileBefore = (providerId, file) => {
   return getFileBefore$1(providerId, file);
@@ -1885,6 +1901,16 @@ const getEnabledProviderIds = (scheme, root) => {
 const getGroups$1 = (providerId, root) => {
   return getGroups$2(providerId, root);
 };
+const getIconDefinitions = async providerIds => {
+  try {
+    if (providerIds.length === 0) {
+      return [];
+    }
+    return await getIconDefinitions$1(providerIds[0]);
+  } catch {
+    return [];
+  }
+};
 
 const getGroups = async enabledProviderIds => {
   const allGroups = [];
@@ -2071,13 +2097,16 @@ const loadContent = async (state, savedState) => {
     inputValue
   } = restoreState(savedState);
   const enabledProviderIds = await getEnabledProviderIds(scheme, root);
+  const iconDefinitions = await getIconDefinitions(enabledProviderIds);
   const {
     allGroups,
     gitRoot
   } = await getGroups(enabledProviderIds);
   const expandedGroups = restoreExpandedGroups(allGroups);
-  const displayItems = getDisplayItems(allGroups, expandedGroups);
+  const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
   const actionsCache = await requestSourceActions();
+
+  // TODO make preferences async and more functional
   const splitButtonEnabled = get();
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
@@ -2149,14 +2178,15 @@ const refresh = async state => {
     fileIconCache,
     enabledProviderIds,
     splitButtonEnabled,
-    actionsCache
+    actionsCache,
+    iconDefinitions
   } = state;
   const {
     allGroups,
     gitRoot
   } = await getGroups(enabledProviderIds);
   const expandedGroups = restoreExpandedGroups(allGroups);
-  const displayItems = getDisplayItems(allGroups, expandedGroups);
+  const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
@@ -2209,9 +2239,10 @@ const updateVisibleItems = async (state, expandedGroups) => {
     height,
     actionsCache,
     fileIconCache,
-    allGroups
+    allGroups,
+    iconDefinitions
   } = state;
-  const displayItems = getDisplayItems(allGroups, expandedGroups);
+  const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
   const total = displayItems.length;
   const listHeight = getListHeight(total, itemHeight, height);
   const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);

package/package.json

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