Adds last selected memory for grouped views

Author: eamodio

src/views/viewBase.ts

@@ -245,8 +245,8 @@ export abstract class ViewBase<
 		if (this.container.debugging || configuration.get('debug')) {
 			function addDebuggingInfo(item: TreeItem, node: ViewNode, parent: ViewNode | undefined) {
 				item.tooltip ??= new MarkdownString(
-						item.label != null && typeof item.label !== 'string' ? item.label.label : item.label ?? '',
-					);
+					item.label != null && typeof item.label !== 'string' ? item.label.label : item.label ?? '',
+				);
 
 				if (typeof item.tooltip === 'string') {
 					item.tooltip = `${item.tooltip}\n\n---\ncontext: ${
@@ -515,10 +515,12 @@ export abstract class ViewBase<
 	}
 
 	protected onElementCollapsed(e: TreeViewExpansionEvent<ViewNode>): void {
+		this._expandedNodes.delete(e.element);
 		this._onDidChangeNodeCollapsibleState.fire({ ...e, state: TreeItemCollapsibleState.Collapsed });
 	}
 
 	protected onElementExpanded(e: TreeViewExpansionEvent<ViewNode>): void {
+		this._expandedNodes.add(e.element);
 		this._onDidChangeNodeCollapsibleState.fire({ ...e, state: TreeItemCollapsibleState.Expanded });
 	}
 
@@ -732,6 +734,11 @@ export abstract class ViewBase<
 		return undefined;
 	}
 
+	private _expandedNodes = new WeakSet<ViewNode>();
+	isNodeExpanded(node: ViewNode): boolean {
+		return this._expandedNodes.has(node);
+	}
+
 	@debug()
 	async refresh(reset: boolean = false): Promise<void> {
 		// If we are resetting, make sure to clear any saved node state
@@ -823,8 +830,8 @@ export abstract class ViewBase<
 			await this.tree?.reveal(node, options);
 		} catch (ex) {
 			if (!node.id || root == null) {
-			Logger.error(ex, scope);
-			debugger;
+				Logger.error(ex, scope);
+				debugger;
 
 				return;
 			}

src/views/views.ts

@@ -85,6 +85,10 @@ export class Views implements Disposable {
 		return this._scmGroupedViews;
 	}
 
+	private _lastSelectedByView = new Map<
+		GroupableTreeViewTypes,
+		{ node: ViewNode; parents: ViewNode[]; expanded: boolean }
+	>();
 	private _welcomeDismissed = false;
 
 	constructor(
@@ -482,7 +486,43 @@ export class Views implements Disposable {
 
 	private setScmGroupedView<T extends GroupableTreeViewTypes>(type: T, focus?: boolean) {
 		if (this._scmGroupedView != null) {
-			return this._scmGroupedView.setView(type, focus);
+			// Save current selection before switching views
+			let { view } = this._scmGroupedView;
+			if (view) {
+				const node: ViewNode | undefined = view.selection?.[0];
+				if (node != null) {
+					const parents: ViewNode[] = [];
+
+					let parent: ViewNode | undefined = node;
+					while (true) {
+						parent = parent.getParent();
+						if (parent == null) break;
+
+						parents.unshift(parent);
+					}
+
+					this._lastSelectedByView.set(view.type, {
+						node: node,
+						parents: parents,
+						expanded: view.isNodeExpanded(node),
+					});
+				}
+			}
+
+			view = this._scmGroupedView.setView(type, focus);
+
+			// Restore the last selection for this view type (if any)
+			if (view) {
+				const selection = this._lastSelectedByView.get(type);
+				if (selection != null) {
+					setTimeout(async () => {
+						const { node, parents, expanded } = selection;
+						await view.revealDeep(node, parents, { expand: expanded, focus: focus ?? false, select: true });
+					}, 1);
+				}
+			}
+
+			return view;
 		}
 
 		if (!this.scmGroupedViews?.has(type)) {