@lvce-editor/explorer-view 7.26.0 → 7.27.1

package/dist/explorerViewWorkerMain.js

@@ -2816,6 +2816,7 @@ const collapseAll = async state => {
   const newDirents = items.filter(isTopLevel).map(toCollapsedDirent);
   return {
     ...state,
+    expandedPaths: [],
     focusedIndex: 0,
     items: newDirents
   };
@@ -3717,6 +3718,34 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
   return visible;
 };
 
+const syncExpandedPaths = state => {
+  const {
+    expandedPaths: oldExpandedPaths,
+    items,
+    preserveExpandState
+  } = state;
+  if (!preserveExpandState) {
+    return state;
+  }
+  const expandedPaths = new Set(oldExpandedPaths);
+  for (const item of items) {
+    const type = normalizeDirentType(item.type);
+    if (type === DirectoryExpanded || type === DirectoryExpanding) {
+      expandedPaths.add(item.path);
+    } else if (type === Directory || type === SymLinkFolder) {
+      expandedPaths.delete(item.path);
+    }
+  }
+  const newExpandedPaths = [...expandedPaths];
+  if (newExpandedPaths.length === oldExpandedPaths.length && newExpandedPaths.every((path, index) => path === oldExpandedPaths[index])) {
+    return state;
+  }
+  return {
+    ...state,
+    expandedPaths: newExpandedPaths
+  };
+};
+
 const {
   get,
   getCommandIds,
@@ -3755,6 +3784,9 @@ const enqueueCommand = async (id, command) => {
 const hasSameVisibleExplorerItemInputs = (oldState, newState) => {
   return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingSessionId === newState.editingSessionId && oldState.editingIcon === newState.editingIcon && oldState.cutItems === newState.cutItems && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.dropTargets === newState.dropTargets && oldState.fileIconCache === newState.fileIconCache && oldState.decorations === newState.decorations && oldState.useChevrons === newState.useChevrons && oldState.sourceControlIgnoredUris === newState.sourceControlIgnoredUris;
 };
+const hasSameDragDataInputs = (oldState, newState) => {
+  return oldState.isPointerDown === newState.isPointerDown && oldState.pointerDownIndex === newState.pointerDownIndex;
+};
 const updateGitIgnoredUris = (state, generation, sourceControlIgnoredUris) => {
   const {
     gitIgnoreGeneration
@@ -3821,8 +3853,9 @@ const wrapListItemCommandInternal = (fn, queued) => {
     const {
       newState
     } = get(id);
-    const rawUpdatedState = await fn(newState, ...args);
-    const completion = take(rawUpdatedState);
+    const commandState = await fn(newState, ...args);
+    const completion = take(commandState);
+    const rawUpdatedState = syncExpandedPaths(commandState);
     if (newState === rawUpdatedState) {
       return {
         completion
@@ -3852,7 +3885,7 @@ const wrapListItemCommandInternal = (fn, queued) => {
     const intermediate = get(id);
     set$1(id, intermediate.oldState, updatedState, intermediate.scheduledState);
     if (hasSameVisibleExplorerItemInputs(intermediate.newState, updatedState)) {
-      if (updatedState.inputSource === User) {
+      if (updatedState.inputSource === User || !hasSameDragDataInputs(intermediate.newState, updatedState)) {
         set$1(id, intermediate.oldState, updatedState);
       }
       return {
@@ -3938,6 +3971,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0, ass
     errorMessageTop: 0,
     errorMessageWidth: 0,
     excluded: [],
+    expandedPaths: [],
     fileIconCache: Object.create(null),
     fileIconWidth: 16,
     finalDeltaY: 0,
@@ -3969,6 +4003,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0, ass
     pathSeparator: Slash,
     platform,
     pointerDownIndex: -1,
+    preserveExpandState: true,
     root: '',
     scrollBarActive: false,
     scrollBarHeight: 0,
@@ -4688,11 +4723,82 @@ const handleArrowRightDirectoryExpanded = (state, dirent) => {
   return state;
 };
 
+const getPathDirentsMap = async allPaths => {
+  const pathToDirents = Object.create(null);
+  await Promise.all(allPaths.map(async path => {
+    try {
+      const dirents = await readDirWithFileTypes(path);
+      pathToDirents[path] = dirents;
+    } catch {
+      // ignore
+    }
+  }));
+  return pathToDirents;
+};
+
+const restoreDirentType = (rawDirentType, path, expandedPaths) => {
+  if (rawDirentType === Directory && expandedPaths.includes(path)) {
+    return DirectoryExpanded;
+  }
+  return rawDirentType;
+};
+
+const getProtoMapInternal = (root, pathToDirents, expandedPaths, depth, excluded = [], workspaceRoot = root) => {
+  if (!(root in pathToDirents)) {
+    return [];
+  }
+  const items = (pathToDirents[root] || []).filter(item => !isExcluded(workspaceRoot, join2(root, item.name), excluded));
+  const protoMap = [];
+  for (let i = 0; i < items.length; i++) {
+    const item = items[i];
+    const path = join2(root, item.name);
+    const displayDirent = {
+      depth,
+      icon: '',
+      name: item.name,
+      path,
+      posInSet: i + 1,
+      selected: false,
+      setSize: items.length,
+      type: restoreDirentType(item.type, path, expandedPaths)
+    };
+    const children = getProtoMapInternal(path, pathToDirents, expandedPaths, depth + 1, excluded, workspaceRoot);
+    protoMap.push(displayDirent, ...children);
+  }
+  return protoMap;
+};
+
+const sortPathDirentsMap = map => {
+  const sortedMap = Object.create(null);
+  for (const [key, value] of Object.entries(map)) {
+    const sorted = sortExplorerItems(value);
+    sortedMap[key] = sorted;
+  }
+  return sortedMap;
+};
+
+const getRestoredChildDirents = async (state, dirent) => {
+  const {
+    excluded,
+    expandedPaths,
+    pathSeparator,
+    preserveExpandState,
+    root
+  } = state;
+  const descendantPrefix = dirent.path.endsWith(pathSeparator) ? dirent.path : `${dirent.path}${pathSeparator}`;
+  const descendantExpandedPaths = preserveExpandState ? expandedPaths.filter(path => path.startsWith(descendantPrefix)) : [];
+  if (descendantExpandedPaths.length === 0) {
+    return getChildDirents(pathSeparator, dirent.path, dirent.depth, excluded, root);
+  }
+  const pathToDirents = await getPathDirentsMap([dirent.path, ...descendantExpandedPaths]);
+  const sortedPathDirents = sortPathDirentsMap(pathToDirents);
+  return getProtoMapInternal(dirent.path, sortedPathDirents, descendantExpandedPaths, dirent.depth + 1, excluded, root);
+};
 const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   // @ts-ignore
   dirent.type = DirectoryExpanding;
   // TODO handle error
-  const dirents = await getChildDirents(state.pathSeparator, dirent.path, dirent.depth, state.excluded, state.root);
+  const dirents = await getRestoredChildDirents(state, dirent);
   const state2 = state;
   if (!state2) {
     return state;
@@ -4989,19 +5095,6 @@ const getExpandedDirents = items => {
   return items.filter(isExpanded);
 };
 
-const getPathDirentsMap = async allPaths => {
-  const pathToDirents = Object.create(null);
-  await Promise.all(allPaths.map(async path => {
-    try {
-      const dirents = await readDirWithFileTypes(path);
-      pathToDirents[path] = dirents;
-    } catch {
-      // ignore
-    }
-  }));
-  return pathToDirents;
-};
-
 const getPath = item => {
   return item.path;
 };
@@ -5010,62 +5103,23 @@ const getPaths = items => {
   return items.map(getPath);
 };
 
-const restoreDirentType = (rawDirentType, path, expandedPaths) => {
-  if (rawDirentType === Directory && expandedPaths.includes(path)) {
-    return DirectoryExpanded;
-  }
-  return rawDirentType;
-};
-
-const getProtoMapInternal = (root, pathToDirents, expandedPaths, depth, excluded = [], workspaceRoot = root) => {
-  if (!(root in pathToDirents)) {
-    return [];
-  }
-  const items = (pathToDirents[root] || []).filter(item => !isExcluded(workspaceRoot, join2(root, item.name), excluded));
-  const protoMap = [];
-  for (let i = 0; i < items.length; i++) {
-    const item = items[i];
-    const path = join2(root, item.name);
-    const displayDirent = {
-      depth,
-      icon: '',
-      name: item.name,
-      path,
-      posInSet: i + 1,
-      selected: false,
-      setSize: items.length,
-      type: restoreDirentType(item.type, path, expandedPaths)
-    };
-    const children = getProtoMapInternal(path, pathToDirents, expandedPaths, depth + 1, excluded, workspaceRoot);
-    protoMap.push(displayDirent, ...children);
-  }
-  return protoMap;
-};
-
 const getProtoMap = (root, pathToDirents, expandedPaths, excluded = []) => {
   return getProtoMapInternal(root, pathToDirents, expandedPaths, 1, excluded, root);
 };
 
-const sortPathDirentsMap = map => {
-  const sortedMap = Object.create(null);
-  for (const [key, value] of Object.entries(map)) {
-    const sorted = sortExplorerItems(value);
-    sortedMap[key] = sorted;
-  }
-  return sortedMap;
-};
-
 const refresh = async state => {
   const {
     excluded,
+    expandedPaths: preservedExpandedPaths,
     focusedIndex,
     gitIgnoreDecorations,
     items,
     pathSeparator,
+    preserveExpandState,
     root
   } = state;
-  const expandedDirents = getExpandedDirents(items);
-  const expandedPaths = getPaths(expandedDirents);
+  const legacyExpandedPaths = getPaths(getExpandedDirents(items));
+  const expandedPaths = preserveExpandState ? preservedExpandedPaths : legacyExpandedPaths;
   const allPaths = [root, ...expandedPaths];
   const pathToDirents = await getPathDirentsMap(allPaths);
   const sortedPathDirents = sortPathDirentsMap(pathToDirents);
@@ -5697,6 +5751,8 @@ const getSettings = async () => {
   const excluded = getExcluded(excludedRaw);
   const gitIgnoreDecorationsRaw = await invoke$3('Preferences.get', 'explorer.gitIgnoreDecorations');
   const gitIgnoreDecorations = gitIgnoreDecorationsRaw === false ? false : true;
+  const preserveExpandStateRaw = await invoke$3('Preferences.get', 'explorer.preserveExpandState');
+  const preserveExpandState = preserveExpandStateRaw === false ? false : true;
   const sourceControlDecorationsRaw = await invoke$3('Preferences.get', 'explorer.sourceControlDecorations');
   const sourceControlDecorations = sourceControlDecorationsRaw === false ? false : true;
   return {
@@ -5704,6 +5760,7 @@ const getSettings = async () => {
     confirmPaste,
     excluded,
     gitIgnoreDecorations,
+    preserveExpandState,
     sourceControlDecorations,
     useChevrons
   };
@@ -5784,17 +5841,16 @@ const getSavedExpandedPaths = (savedState, root) => {
     return [];
   }
   if (savedState && savedState.expandedPaths && Array.isArray(savedState.expandedPaths)) {
-    return savedState.expandedPaths;
+    return savedState.expandedPaths.filter(path => typeof path === 'string');
   }
   return [];
 };
-const restoreExpandedState = async (savedState, root, pathSeparator, excluded) => {
+const restoreExpandedState = async (expandedPaths, root, pathSeparator, excluded) => {
   // TODO read all opened folders in parallel
   // ignore ENOENT errors
   // ignore ENOTDIR errors
   // merge all dirents
   // restore scroll location
-  const expandedPaths = getSavedExpandedPaths(savedState, root);
   if (root === EmptyString) {
     return [];
   }
@@ -5807,28 +5863,44 @@ const restoreExpandedState = async (savedState, root, pathSeparator, excluded) =
   return dirents;
 };
 
+const getExpandedPaths = (savedState, root, currentRoot, currentExpandedPaths, preserveExpandState) => {
+  if (!preserveExpandState) {
+    return [];
+  }
+  if (savedState !== undefined && savedState !== null) {
+    return getSavedExpandedPaths(savedState, root);
+  }
+  if (currentRoot === root) {
+    return currentExpandedPaths;
+  }
+  return [];
+};
 const loadContent = async (state, savedState) => {
   const {
     assetDir,
+    expandedPaths: currentExpandedPaths,
     height,
     itemHeight,
-    platform
+    platform,
+    root: currentRoot
   } = state;
   const {
     confirmDelete,
     excluded,
     gitIgnoreDecorations,
+    preserveExpandState,
     sourceControlDecorations,
     useChevrons
   } = await getSettings();
   const workspacePath = await getWorkspacePath();
   const root = getSavedRoot(savedState, workspacePath);
+  const expandedPaths = getExpandedPaths(savedState, root, currentRoot, currentExpandedPaths, preserveExpandState);
   try {
     // TODO path separator could be restored from saved state
     const [pathSeparator, isReadonly$1] = await Promise.all([getPathSeparator(root),
     // TODO only load path separator once
     root === '' ? false : isReadonly(root)]);
-    const restoredDirents = await restoreExpandedState(savedState, root, pathSeparator, excluded);
+    const restoredDirents = await restoreExpandedState(expandedPaths, root, pathSeparator, excluded);
     const rawDeltaY = getRestoredDeltaY(savedState);
     const maxDeltaY = Math.max(restoredDirents.length * itemHeight - height, 0);
     const deltaY = Math.min(Math.max(rawDeltaY, 0), maxDeltaY);
@@ -5844,6 +5916,7 @@ const loadContent = async (state, savedState) => {
       errorCode: '',
       errorMessage: '',
       excluded,
+      expandedPaths,
       gitIgnoreDecorations,
       hasError: false,
       initial: false,
@@ -5852,6 +5925,7 @@ const loadContent = async (state, savedState) => {
       maxIndent: 10,
       minLineY,
       pathSeparator,
+      preserveExpandState,
       root,
       sourceControlIgnoredUris,
       useChevrons
@@ -5864,11 +5938,13 @@ const loadContent = async (state, savedState) => {
       confirmDelete,
       errorCode,
       errorMessage,
+      expandedPaths,
       gitIgnoreDecorations,
       hasError: true,
       initial: false,
       isReadonly: false,
       items: [],
+      preserveExpandState,
       root,
       useChevrons
     };
@@ -6200,8 +6276,10 @@ const expandTargetFolder = (items, targetFolder) => {
 };
 const handleInternalDrop = async (state, sourcePaths, index) => {
   const {
+    expandedPaths: oldExpandedPaths,
     isReadonly,
-    items
+    items,
+    preserveExpandState
   } = state;
   if (isReadonly) {
     return state;
@@ -6218,8 +6296,10 @@ const handleInternalDrop = async (state, sourcePaths, index) => {
     await rename$1(operation.from, operation.path);
   }
   const expandedItems = expandTargetFolder(items, targetFolder);
+  const expandedPaths = preserveExpandState ? [...new Set([...oldExpandedPaths, targetFolder])] : oldExpandedPaths;
   const updated = await refresh({
     ...state,
+    expandedPaths,
     items: expandedItems
   });
   return {
@@ -7054,9 +7134,13 @@ const handleWheel = (state, deltaMode, deltaY) => {
 };
 
 const handleWorkspaceChange = async (state, _workspacePath, savedState) => {
+  const {
+    root
+  } = state;
   const newRoot = await getWorkspacePath();
-  const state1 = {
+  const state1 = newRoot === root ? state : {
     ...state,
+    expandedPaths: [],
     root: newRoot
   };
   const newState = await loadContent(state1, savedState);
@@ -8215,12 +8299,14 @@ const isExpandedDirectory = dirent => {
 const saveState = state => {
   const {
     deltaY,
+    expandedPaths: preservedExpandedPaths,
     items,
     maxLineY,
     minLineY,
+    preserveExpandState,
     root
   } = state;
-  const expandedPaths = items.filter(isExpandedDirectory).map(getPath);
+  const expandedPaths = preserveExpandState ? preservedExpandedPaths : items.filter(isExpandedDirectory).map(getPath);
   return {
     deltaY,
     expandedPaths,

package/dist/settings.json

@@ -31,6 +31,14 @@
     "type": 3,
     "value": "true"
   },
+  {
+    "category": "explorer",
+    "description": "Controls whether expanded folders are preserved for the current workspace when the Explorer rebuilds and across editor restarts.",
+    "heading": "Preserve Expand State",
+    "id": "explorer.preserveExpandState",
+    "type": 3,
+    "value": "true"
+  },
   {
     "category": "explorer",
     "description": "Controls whether source control decorations are shown in the Explorer.",

package/package.json

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