@lvce-editor/explorer-view 5.2.0 → 5.4.0

package/dist/explorerViewWorkerMain.js

@@ -2650,7 +2650,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     errorMessageTop: 0,
     visibleExplorerItems: [],
     errorMessageWidth: 0,
-    decorations: []
+    decorations: [],
+    sourceControlDecorations: false
   };
   set(state.uid, state, state);
   return state;
@@ -4635,28 +4636,48 @@ const getWorkspacePath = () => {
   return invoke$2('Workspace.getPath');
 };
 
-const DecorationsEnabled = false;
+const isValid = decoration => {
+  return decoration && typeof decoration.decoration === 'string' && typeof decoration.uri === 'string';
+};
+const normalizeDecorations = decorations => {
+  if (!decorations || !Array.isArray(decorations)) {
+    return [];
+  }
+  return decorations.filter(isValid);
+};
 
-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];
+    // 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;
+    const normalized = normalizeDecorations(decorations);
+    return normalized;
   } catch (error) {
     console.error(error);
     return [];
   }
 };
 
+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;
@@ -4664,10 +4685,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
   };
 };
 
@@ -4780,18 +4804,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);
@@ -4808,10 +4825,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,
@@ -4819,8 +4837,7 @@ const loadContent = async (state, savedState) => {
     minLineY,
     pathSeparator,
     root,
-    useChevrons,
-    decorations
+    useChevrons
   };
 };
 
@@ -4834,6 +4851,10 @@ const handleWorkspaceChange = async state => {
   return newState;
 };
 
+const handleWorkspaceRefresh = async state => {
+  return refresh(state);
+};
+
 const sendMessagePortToFileSystemWorker = async port => {
   await sendMessagePortToFileSystemWorker$1(port, 0);
 };
@@ -4893,9 +4914,6 @@ const createSourceControlWorkerRpc = async () => {
 
 const initializeSourceControlWorker = async () => {
   try {
-    if (!DecorationsEnabled) {
-      return;
-    }
     const rpc = await createSourceControlWorkerRpc();
     // TODO
     set$2(rpc);
@@ -6125,6 +6143,7 @@ const commandMap = {
   'Explorer.handleUpload': wrapListItemCommand(handleUpload),
   'Explorer.handleWheel': wrapListItemCommand(handleWheel),
   'Explorer.handleWorkspaceChange': wrapListItemCommand(handleWorkspaceChange),
+  'Explorer.handleWorkspaceRefresh': wrapListItemCommand(handleWorkspaceRefresh),
   'Explorer.loadContent': wrapListItemCommand(loadContent),
   'Explorer.newFile': wrapListItemCommand(newFile),
   'Explorer.newFolder': wrapListItemCommand(newFolder),

package/package.json

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