@lvce-editor/explorer-view 5.1.0 → 5.3.0

package/dist/explorerViewWorkerMain.js

@@ -2340,6 +2340,25 @@ const None$4 = 0;
 const Right = 1;
 const Down = 2;
 
+const ensureUri = item => {
+  if (item.startsWith('/')) {
+    return `file://` + item;
+  }
+  return item;
+};
+const ensureUris = maybeUris => {
+  return maybeUris.map(ensureUri);
+};
+
+const createDecorationMap = decorations => {
+  const map = Object.create(null);
+  for (const decoration of decorations) {
+    const uri = ensureUri(decoration.uri);
+    map[uri] = decoration.decoration;
+  }
+  return map;
+};
+
 const getChevronType = (type, useChevrons) => {
   if (!useChevrons) {
     return None$4;
@@ -2430,7 +2449,7 @@ const text = data => {
   };
 };
 
-const getTreeItemClassName = (isSelected, isFocused, isDropping, useChevrons, indent) => {
+const getTreeItemClassName = (isSelected, isFocused, isDropping, useChevrons, indent, decoration) => {
   let className = TreeItem$1;
   className = mergeClassNames(className, `Indent-${indent}`);
   if (isSelected || isFocused) {
@@ -2439,6 +2458,9 @@ const getTreeItemClassName = (isSelected, isFocused, isDropping, useChevrons, in
   if (isDropping) {
     className = mergeClassNames(className, 'DropTarget');
   }
+  if (decoration) {
+    className = mergeClassNames(className, `decoration-${decoration}`);
+  }
   return className;
 };
 
@@ -2470,7 +2492,8 @@ const getEditingChevron = direntType => {
       return None$4;
   }
 };
-const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris = []) => {
+const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris = [], decorations) => {
+  const decorationMap = createDecorationMap(decorations);
   const visible = [];
   const indentFn = useChevrons ? getTreeItemIndentWithChevron : getTreeItemIndent;
   let iconIndex = 0;
@@ -2484,7 +2507,8 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
     const isDropping = dropTargets.includes(i);
     const isIgnored = sourceControlIgnoredUris.includes(item.path);
     const indent = indentFn(item.depth, chevron);
-    const className = getTreeItemClassName(isSelected, isFocused, isDropping, useChevrons, indent);
+    const decoration = decorationMap[item.path] || '';
+    const className = getTreeItemClassName(isSelected, isFocused, isDropping, useChevrons, indent, decoration);
     const expanded = getExpandedType(item.type);
     const ariaExpanded = ariaExpandedValues[expanded];
     const isEditing = i === editingIndex;
@@ -2507,7 +2531,9 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
       className,
       isCut,
       isIgnored,
-      index: i
+      index: i,
+      // @ts-ignore
+      decoration
     });
   }
   return visible;
@@ -2539,12 +2565,13 @@ const wrapListItemCommand = fn => {
       sourceControlIgnoredUris,
       height,
       itemHeight,
-      fileIconCache
+      fileIconCache,
+      decorations
     } = updatedState;
     const intermediate = get(id);
     set(id, intermediate.oldState, updatedState);
     const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, items.length);
-    if (items === intermediate.newState.items && minLineY === intermediate.newState.minLineY && editingIcon === intermediate.newState.editingIcon && cutItems === intermediate.newState.cutItems && editingErrorMessage === intermediate.newState.editingErrorMessage && dropTargets === intermediate.newState.dropTargets && fileIconCache === intermediate.newState.fileIconCache) {
+    if (items === intermediate.newState.items && minLineY === intermediate.newState.minLineY && editingIcon === intermediate.newState.editingIcon && cutItems === intermediate.newState.cutItems && editingErrorMessage === intermediate.newState.editingErrorMessage && dropTargets === intermediate.newState.dropTargets && fileIconCache === intermediate.newState.fileIconCache && decorations === intermediate.newState.decorations) {
       return;
     }
     const visible = items.slice(minLineY, maxLineY);
@@ -2552,7 +2579,7 @@ const wrapListItemCommand = fn => {
       icons,
       newFileIconCache
     } = await getFileIcons(visible, fileIconCache);
-    const visibleExplorerItems = getVisibleExplorerItems(items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris);
+    const visibleExplorerItems = getVisibleExplorerItems(items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris, decorations);
     const finalState = {
       ...updatedState,
       visibleExplorerItems,
@@ -2622,7 +2649,9 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     errorMessageLeft: 0,
     errorMessageTop: 0,
     visibleExplorerItems: [],
-    errorMessageWidth: 0
+    errorMessageWidth: 0,
+    decorations: [],
+    sourceControlDecorations: false
   };
   set(state.uid, state, state);
   return state;
@@ -4607,30 +4636,17 @@ const getWorkspacePath = () => {
   return invoke$2('Workspace.getPath');
 };
 
-const DecorationsEnabled = false;
-
-const ensureUris = maybeUris => {
-  const uris = [];
-  for (const item of maybeUris) {
-    if (item.startsWith('/')) {
-      uris.push(`file://` + item);
-    } else {
-      uris.push(item);
-    }
-  }
-  return uris;
-};
-const getFileDecorations = async (scheme, root, maybeUris) => {
+const getFileDecorations = async (scheme, root, maybeUris, decorationsEnabled) => {
   try {
-    if (!DecorationsEnabled) {
+    if (!decorationsEnabled) {
       return [];
     }
     const providerIds = await invoke$1('SourceControl.getEnabledProviderIds', scheme, root);
     if (providerIds.length === 0) {
       return [];
     }
-    const providerId = providerIds[0];
-    // @ts-ignore
+    // TODO how to handle multiple providers?
+    const providerId = providerIds.at(-1);
     const uris = ensureUris(maybeUris);
     const decorations = await invoke$1('SourceControl.getFileDecorations', providerId, uris);
     return decorations;
@@ -4640,7 +4656,17 @@ const getFileDecorations = async (scheme, root, maybeUris) => {
   }
 };
 
+const RE_PROTOCOL = /^[a-z+]:\/\//;
+const getScheme = uri => {
+  const match = uri.match(RE_PROTOCOL);
+  if (!match) {
+    return '';
+  }
+  return match[0];
+};
+
 const getSettings = async () => {
+  // TODO don't return false always
   // TODO get all settings at once
   const useChevronsRaw = await invoke$2('Preferences.get', 'explorer.useChevrons');
   const useChevrons = useChevronsRaw === false ? false : true;
@@ -4648,10 +4674,13 @@ const getSettings = async () => {
   const confirmDelete = confirmDeleteRaw === false ? false : false;
   const confirmPasteRaw = await invoke$2('Preferences.get', 'explorer.confirmpaste');
   const confirmPaste = confirmPasteRaw === false ? false : false;
+  const sourceControlDecorationsRaw = await invoke$2('Preferences.get', 'explorer.sourceControlDecorations');
+  const sourceControlDecorations = sourceControlDecorationsRaw === false ? false : true;
   return {
     useChevrons,
     confirmDelete,
-    confirmPaste
+    confirmPaste,
+    sourceControlDecorations
   };
 };
 
@@ -4764,18 +4793,11 @@ const getExcluded = () => {
 const getSavedRoot = (savedState, workspacePath) => {
   return workspacePath;
 };
-const RE_PROTOCOL = /^[a-z+]:\/\//;
-const getScheme = uri => {
-  const match = uri.match(RE_PROTOCOL);
-  if (!match) {
-    return '';
-  }
-  return match[0];
-};
 const loadContent = async (state, savedState) => {
   const {
     useChevrons,
-    confirmDelete
+    confirmDelete,
+    sourceControlDecorations
   } = await getSettings();
   const workspacePath = await getWorkspacePath();
   const root = getSavedRoot(savedState, workspacePath);
@@ -4792,10 +4814,11 @@ const loadContent = async (state, savedState) => {
     deltaY = savedState.deltaY;
   }
   const scheme = getScheme(root);
-  const decorations = await getFileDecorations(scheme, root, restoredDirents.filter(item => item.depth === 1).map(item => item.path));
+  const decorations = await getFileDecorations(scheme, root, restoredDirents.filter(item => item.depth === 1).map(item => item.path), sourceControlDecorations);
   return {
     ...state,
     confirmDelete,
+    decorations,
     deltaY,
     excluded,
     items: restoredDirents,
@@ -4803,8 +4826,7 @@ const loadContent = async (state, savedState) => {
     minLineY,
     pathSeparator,
     root,
-    useChevrons,
-    decorations
+    useChevrons
   };
 };
 
@@ -4877,9 +4899,6 @@ const createSourceControlWorkerRpc = async () => {
 
 const initializeSourceControlWorker = async () => {
   try {
-    if (!DecorationsEnabled) {
-      return;
-    }
     const rpc = await createSourceControlWorkerRpc();
     // TODO
     set$2(rpc);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",