Avoids stale promise grouping on git change

Author: eamodio

src/env/browser/providers.ts

@@ -9,7 +9,11 @@ import type { SharedGkStorageLocationProvider } from '../../plus/repos/sharedGkS
 import type { GkWorkspacesSharedStorageProvider } from '../../plus/workspaces/workspacesSharedStorageProvider';
 import type { GitResult } from '../node/git/git';
 
-export function git(_options: GitCommandOptions, ..._args: any[]): Promise<GitResult<string | Buffer>> {
+export function git(
+	_container: Container,
+	_options: GitCommandOptions,
+	..._args: any[]
+): Promise<GitResult<string | Buffer>> {
 	return Promise.resolve({ stdout: '', exitCode: 0 });
 }
 

src/env/node/git/git.ts

@@ -7,6 +7,7 @@ import type { CancellationToken, Disposable, OutputChannel } from 'vscode';
 import { env, Uri, window, workspace } from 'vscode';
 import { hrtime } from '@env/hrtime';
 import { GlyphChars } from '../../../constants';
+import type { Container } from '../../../container';
 import { CancellationError, isCancellationError } from '../../../errors';
 import type { FilteredGitFeatures, GitFeatureOrPrefix, GitFeatures } from '../../../features';
 import { gitFeaturesByVersion } from '../../../features';
@@ -232,10 +233,24 @@ export type GitResult<T extends string | Buffer | unknown> = {
 	readonly cancelled?: boolean;
 };
 
-export class Git {
+export class Git implements Disposable {
+	private readonly _disposable: Disposable;
 	/** Map of running git commands -- avoids running duplicate overlaping commands */
 	private readonly pendingCommands = new Map<string, Promise<RunResult<string | Buffer>>>();
 
+	constructor(container: Container) {
+		this._disposable = container.events.on('git:cache:reset', e => {
+			// Ignore provider resets (e.g. it needs to be git specific)
+			if (e.data.types?.every(t => t === 'providers')) return;
+
+			this.pendingCommands.clear();
+		});
+	}
+
+	dispose(): void {
+		this._disposable.dispose();
+	}
+
 	async exec(
 		options: ExitCodeOnlyGitCommandOptions,
 		...args: readonly (string | undefined)[]

src/env/node/git/vslsGitProvider.ts

@@ -13,8 +13,11 @@ import { Git } from './git';
 import { LocalGitProvider } from './localGitProvider';
 
 export class VslsGit extends Git {
-	constructor(private readonly localGit: Git) {
-		super();
+	constructor(
+		container: Container,
+		private readonly localGit: Git,
+	) {
+		super(container);
 	}
 
 	override async exec<T extends string | Buffer>(options: GitCommandOptions, ...args: any[]): Promise<GitResult<T>> {

src/env/node/providers.ts

@@ -16,23 +16,25 @@ import { LocalSharedGkStorageLocationProvider } from './gk/localSharedGkStorageL
 import { LocalGkWorkspacesSharedStorageProvider } from './gk/localWorkspacesSharedStorageProvider';
 
 let gitInstance: Git | undefined;
-function ensureGit() {
-	if (gitInstance == null) {
-		gitInstance = new Git();
-	}
+function ensureGit(container: Container) {
+	gitInstance ??= new Git(container);
 	return gitInstance;
 }
 
-export function git(options: GitCommandOptions, ...args: any[]): Promise<GitResult<string | Buffer>> {
-	return ensureGit().exec(options, ...args);
+export function git(
+	container: Container,
+	options: GitCommandOptions,
+	...args: any[]
+): Promise<GitResult<string | Buffer>> {
+	return ensureGit(container).exec(options, ...args);
 }
 
 export async function getSupportedGitProviders(container: Container): Promise<GitProvider[]> {
-	const git = ensureGit();
+	const git = ensureGit(container);
 
 	const providers: GitProvider[] = [
 		new LocalGitProvider(container, git),
-		new VslsGitProvider(container, new VslsGit(git)),
+		new VslsGitProvider(container, new VslsGit(container, git)),
 	];
 
 	if (configuration.get('virtualRepositories.enabled')) {

src/vsls/host.ts

@@ -151,6 +151,7 @@ export class VslsHostService implements Disposable {
 		const [cwd, isRootWorkspace] = this.convertGitCommandCwd(options.cwd);
 
 		const result = await git(
+			this.container,
 			{ ...options, cwd: cwd, cancellation: cancellation },
 			...this.convertGitCommandArgs(args, isRootWorkspace),
 		);