Renames "grouped" view to "scm.grouped" for future

Adds per-workspace memory to the last selected grouped view

Author: eamodio

docs/telemetry-events.md

@@ -621,9 +621,11 @@ export interface ViewsCommonConfig {
 			readonly tooltip: string;
 		};
 	};
-	readonly grouped: {
-		readonly enabled: boolean;
-		readonly views: GroupableTreeViewTypes[];
+	readonly scm: {
+		grouped: {
+			readonly enabled: boolean;
+			readonly views: GroupableTreeViewTypes[];
+		};
 	};
 	readonly openChangesInMultiDiffEditor: boolean;
 	readonly pageItemLimit: number;

package.json

@@ -44,9 +44,9 @@ export type ContextKeys = {
 	'gitlens:views:patchDetails:mode': 'create' | 'view';
 	'gitlens:views:pullRequest:visible': boolean;
 	'gitlens:views:repositories:autoRefresh': boolean;
-	'gitlens:views:grouped:default': GroupableTreeViewTypes;
-	'gitlens:views:grouped:view': GroupableTreeViewTypes;
-	'gitlens:views:grouped:views': string;
+	'gitlens:views:scm:grouped:default': GroupableTreeViewTypes;
+	'gitlens:views:scm:grouped:view': GroupableTreeViewTypes;
+	'gitlens:views:scm:grouped:views': string;
 	'gitlens:vsls': boolean | 'host' | 'guest';
 	'gitlens:window:annotated': AnnotationStatus;
 } & Record<`gitlens:action:${string}`, number> &

src/config.ts

@@ -2,6 +2,7 @@ import type { GraphBranchesVisibility, ViewShowBranchComparison } from './config
 import type { AIProviders } from './constants.ai';
 import type { IntegrationId } from './constants.integrations';
 import type { TrackedUsage, TrackedUsageKeys } from './constants.telemetry';
+import type { GroupableTreeViewTypes } from './constants.views';
 import type { Environment } from './container';
 import type { Subscription } from './plus/gk/account/subscription';
 import type { Integration } from './plus/integrations/integration';
@@ -102,10 +103,11 @@ export type WorkspaceStorage = {
 	'remote:default': string;
 	'starred:branches': StoredStarred;
 	'starred:repositories': StoredStarred;
-	'views:repositories:autoRefresh': boolean;
-	'views:searchAndCompare:pinned': StoredSearchAndCompareItems;
 	'views:commitDetails:autolinksExpanded': boolean;
 	'views:commitDetails:pullRequestExpanded': boolean;
+	'views:repositories:autoRefresh': boolean;
+	'views:searchAndCompare:pinned': StoredSearchAndCompareItems;
+	'views:scm:grouped:selected': GroupableTreeViewTypes;
 } & { [key in `confirm:ai:tos:${AIProviders}`]: boolean } & {
 	[key in `connected:${Integration['key']}`]: boolean;
 };

src/constants.context.ts

@@ -7,7 +7,7 @@ export type TreeViewTypes =
 	| 'contributors'
 	| 'drafts'
 	| 'fileHistory'
-	| 'grouped'
+	| 'scm.grouped'
 	| 'launchpad'
 	| 'lineHistory'
 	| 'pullRequest'

src/constants.storage.ts

@@ -13,45 +13,36 @@ import { SearchAndCompareView } from './searchAndCompareView';
 import { StashesView } from './stashesView';
 import { TagsView } from './tagsView';
 import type { TreeViewByType } from './viewBase';
+import type { Views } from './views';
 import { WorktreesView } from './worktreesView';
 
-let lastView: GroupableTreeViewTypes | undefined;
-export function getLastView(): GroupableTreeViewTypes | undefined;
-export function getLastView(defaultType: GroupableTreeViewTypes): GroupableTreeViewTypes;
-export function getLastView(defaultType?: GroupableTreeViewTypes) {
-	return lastView ?? defaultType;
-}
-
-export function setLastView(type: GroupableTreeViewTypes | undefined) {
-	lastView = type;
-}
-
-export class GroupedView implements Disposable {
+export class ScmGroupedView implements Disposable {
 	private _disposable: Disposable;
 	private _view: TreeViewByType[GroupableTreeViewTypes] | undefined;
 
 	constructor(
 		private readonly container: Container,
+		private views: Views,
 		private readonly included: GroupableTreeViewTypes[],
 	) {
 		this._disposable = Disposable.from(
-			registerCommand('gitlens.views.grouped.refresh', () => {
+			registerCommand('gitlens.views.scm.grouped.refresh', () => {
 				if (this._view == null) return;
 
 				executeCommand(`gitlens.views.${this._view.type}.refresh` as Commands);
 			}),
-			registerCommand('gitlens.views.grouped.branches', () => this.setView('branches')),
-			registerCommand('gitlens.views.grouped.commits', () => this.setView('commits')),
-			registerCommand('gitlens.views.grouped.contributors', () => this.setView('contributors')),
-			registerCommand('gitlens.views.grouped.remotes', () => this.setView('remotes')),
-			registerCommand('gitlens.views.grouped.repositories', () => this.setView('repositories')),
-			registerCommand('gitlens.views.grouped.searchAndCompare', () => this.setView('searchAndCompare')),
-			registerCommand('gitlens.views.grouped.stashes', () => this.setView('stashes')),
-			registerCommand('gitlens.views.grouped.tags', () => this.setView('tags')),
-			registerCommand('gitlens.views.grouped.worktrees', () => this.setView('worktrees')),
+			registerCommand('gitlens.views.scm.grouped.branches', () => this.setView('branches')),
+			registerCommand('gitlens.views.scm.grouped.commits', () => this.setView('commits')),
+			registerCommand('gitlens.views.scm.grouped.contributors', () => this.setView('contributors')),
+			registerCommand('gitlens.views.scm.grouped.remotes', () => this.setView('remotes')),
+			registerCommand('gitlens.views.scm.grouped.repositories', () => this.setView('repositories')),
+			registerCommand('gitlens.views.scm.grouped.searchAndCompare', () => this.setView('searchAndCompare')),
+			registerCommand('gitlens.views.scm.grouped.stashes', () => this.setView('stashes')),
+			registerCommand('gitlens.views.scm.grouped.tags', () => this.setView('tags')),
+			registerCommand('gitlens.views.scm.grouped.worktrees', () => this.setView('worktrees')),
 		);
 
-		this._view = this.setView(getLastView(this.included[0]));
+		this._view = this.setView(this.views.lastSelectedScmGroupedView!);
 	}
 
 	dispose() {
@@ -63,11 +54,11 @@ export class GroupedView implements Disposable {
 		if (!this.included.includes(type)) {
 			type = this.included[0] as T;
 		}
-		setLastView(type);
+		this.views.lastSelectedScmGroupedView = type;
 
 		if (this._view?.type === type) return this._view as TreeViewByType[T];
 
-		void setContext('gitlens:views:grouped:view', type);
+		void setContext('gitlens:views:scm:grouped:view', type);
 		this._view?.dispose();
 
 		this._view = this.getView(type);

src/constants.views.ts

@@ -369,7 +369,7 @@ export abstract class ViewBase<
 	}
 
 	protected initialize(options: { canSelectMany?: boolean; showCollapseAll?: boolean } = {}) {
-		this.tree = window.createTreeView<ViewNode>(this.grouped ? 'gitlens.views.grouped' : this.id, {
+		this.tree = window.createTreeView<ViewNode>(this.grouped ? 'gitlens.views.scm.grouped' : this.id, {
 			...options,
 			treeDataProvider: this,
 		});
@@ -730,7 +730,7 @@ export abstract class ViewBase<
 		const scope = getLogScope();
 
 		try {
-			const command = `${this.grouped ? 'gitlens.views.grouped' : this.id}.focus` as const;
+			const command = `${this.grouped ? 'gitlens.views.scm.grouped' : this.id}.focus` as const;
 			// If we haven't been initialized, the focus command will show the view, but won't focus it, so wait until it's initialized and then focus again
 			if (!this.initialized) {
 				void executeCoreCommand(command, options);