fixes #40156

extensions/git/src/decorationProvider.ts

@@ -10,18 +10,20 @@ import * as path from 'path';
 import { Repository, GitResourceGroup, Status } from './repository';
 import { Model } from './model';
 import { debounce } from './decorators';
-import { filterEvent } from './util';
-import { Submodule } from './git';
+import { filterEvent, dispose } from './util';
+import { Submodule, GitErrorCodes } from './git';
+
+type Callback = { resolve: (status: boolean) => void, reject: (err: any) => void };
 
 class GitIgnoreDecorationProvider implements DecorationProvider {
 
 	private readonly _onDidChangeDecorations = new EventEmitter<Uri[]>();
 	readonly onDidChangeDecorations: Event<Uri[]> = this._onDidChangeDecorations.event;
 
-	private checkIgnoreQueue = new Map<string, { resolve: (status: boolean) => void, reject: (err: any) => void }>();
+	private queue = new Map<string, { repository: Repository; queue: Map<string, Callback>; }>();
 	private disposables: Disposable[] = [];
 
-	constructor(private repository: Repository) {
+	constructor(private model: Model) {
 		this.disposables.push(
 			window.registerDecorationProvider(this),
 			filterEvent(workspace.onDidSaveTextDocument, e => e.fileName.endsWith('.gitignore'))(_ => this._onDidChangeDecorations.fire())
@@ -29,14 +31,22 @@ class GitIgnoreDecorationProvider implements DecorationProvider {
 		);
 	}
 
-	dispose(): void {
-		this.disposables.forEach(d => d.dispose());
-		this.checkIgnoreQueue.clear();
-	}
-
 	provideDecoration(uri: Uri): Promise<DecorationData | undefined> {
+		const repository = this.model.getRepository(uri);
+
+		if (!repository) {
+			return Promise.resolve(undefined);
+		}
+
+		let queueItem = this.queue.get(repository.root);
+
+		if (!queueItem) {
+			queueItem = { repository, queue: new Map<string, Callback>() };
+			this.queue.set(repository.root, queueItem);
+		}
+
 		return new Promise<boolean>((resolve, reject) => {
-			this.checkIgnoreQueue.set(uri.fsPath, { resolve, reject });
+			queueItem!.queue.set(uri.fsPath, { resolve, reject });
 			this.checkIgnoreSoon();
 		}).then(ignored => {
 			if (ignored) {
@@ -50,18 +60,31 @@ class GitIgnoreDecorationProvider implements DecorationProvider {
 
 	@debounce(500)
 	private checkIgnoreSoon(): void {
-		const queue = new Map(this.checkIgnoreQueue.entries());
-		this.checkIgnoreQueue.clear();
-		this.repository.checkIgnore([...queue.keys()]).then(ignoreSet => {
-			for (const [key, value] of queue.entries()) {
-				value.resolve(ignoreSet.has(key));
-			}
-		}, err => {
-			console.error(err);
-			for (const [, value] of queue.entries()) {
-				value.reject(err);
-			}
-		});
+		const queue = new Map(this.queue.entries());
+		this.queue.clear();
+
+		for (const [, item] of queue) {
+			const paths = [...item.queue.keys()];
+
+			item.repository.checkIgnore(paths).then(ignoreSet => {
+				for (const [key, value] of item.queue.entries()) {
+					value.resolve(ignoreSet.has(key));
+				}
+			}, err => {
+				if (err.gitErrorCode !== GitErrorCodes.IsInSubmodule) {
+					console.error(err);
+				}
+
+				for (const [, value] of item.queue.entries()) {
+					value.reject(err);
+				}
+			});
+		}
+	}
+
+	dispose(): void {
+		this.disposables.forEach(d => d.dispose());
+		this.queue.clear();
 	}
 }
 
@@ -129,17 +152,21 @@ class GitDecorationProvider implements DecorationProvider {
 
 export class GitDecorations {
 
-	private configListener: Disposable;
-	private modelListener: Disposable[] = [];
+	private disposables: Disposable[] = [];
+	private modelDisposables: Disposable[] = [];
 	private providers = new Map<Repository, Disposable>();
 
 	constructor(private model: Model) {
-		this.configListener = workspace.onDidChangeConfiguration(e => e.affectsConfiguration('git.decorations.enabled') && this.update());
+		this.disposables.push(new GitIgnoreDecorationProvider(model));
+
+		const onEnablementChange = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git.decorations.enabled'));
+		onEnablementChange(this.update, this, this.disposables);
 		this.update();
 	}
 
 	private update(): void {
 		const enabled = workspace.getConfiguration('git').get('decorations.enabled');
+
 		if (enabled) {
 			this.enable();
 		} else {
@@ -148,26 +175,25 @@ export class GitDecorations {
 	}
 
 	private enable(): void {
-		this.modelListener = [];
-		this.model.onDidOpenRepository(this.onDidOpenRepository, this, this.modelListener);
-		this.model.onDidCloseRepository(this.onDidCloseRepository, this, this.modelListener);
+		this.model.onDidOpenRepository(this.onDidOpenRepository, this, this.modelDisposables);
+		this.model.onDidCloseRepository(this.onDidCloseRepository, this, this.modelDisposables);
 		this.model.repositories.forEach(this.onDidOpenRepository, this);
 	}
 
 	private disable(): void {
-		this.modelListener.forEach(d => d.dispose());
+		this.modelDisposables = dispose(this.modelDisposables);
 		this.providers.forEach(value => value.dispose());
 		this.providers.clear();
 	}
 
 	private onDidOpenRepository(repository: Repository): void {
 		const provider = new GitDecorationProvider(repository);
-		const ignoreProvider = new GitIgnoreDecorationProvider(repository);
-		this.providers.set(repository, Disposable.from(provider, ignoreProvider));
+		this.providers.set(repository, provider);
 	}
 
 	private onDidCloseRepository(repository: Repository): void {
 		const provider = this.providers.get(repository);
+
 		if (provider) {
 			provider.dispose();
 			this.providers.delete(repository);
@@ -175,9 +201,7 @@ export class GitDecorations {
 	}
 
 	dispose(): void {
-		this.configListener.dispose();
-		this.modelListener.forEach(d => d.dispose());
-		this.providers.forEach(value => value.dispose);
-		this.providers.clear();
+		this.disable();
+		this.disposables = dispose(this.disposables);
 	}
 }

extensions/git/src/git.ts

@@ -318,7 +318,8 @@ export const GitErrorCodes = {
 	NoLocalChanges: 'NoLocalChanges',
 	NoStashFound: 'NoStashFound',
 	LocalChangesOverwritten: 'LocalChangesOverwritten',
-	NoUpstreamBranch: 'NoUpstreamBranch'
+	NoUpstreamBranch: 'NoUpstreamBranch',
+	IsInSubmodule: 'IsInSubmodule'
 };
 
 function getGitErrorCode(stderr: string): string | undefined {

extensions/git/src/repository.ts

@@ -834,7 +834,11 @@ export class Repository implements Disposable {
 						// paths are separated by the null-character
 						resolve(new Set<string>(data.split('\0')));
 					} else {
-						reject(new GitError({ stdout: data, stderr, exitCode }));
+						if (/ is in submodule /.test(stderr)) {
+							reject(new GitError({ stdout: data, stderr, exitCode, gitErrorCode: GitErrorCodes.IsInSubmodule }));
+						} else {
+							reject(new GitError({ stdout: data, stderr, exitCode }));
+						}
 					}
 				};