Skip to content

Commit 50486dc

Browse files
authored
Fix quick diff for workspace with multiple git repos (microsoft#176390) (microsoft#176524)
* Fix quick diff for workspace with multiple git repos Part of microsoft#176051 * PR feedback
1 parent 9cdb992 commit 50486dc

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/vs/workbench/contrib/scm/common/quickDiffService.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ export class QuickDiffService extends Disposable implements IQuickDiffService {
5959
}
6060

6161
async getQuickDiffs(uri: URI, language: string = '', isSynchronized: boolean = false): Promise<QuickDiff[]> {
62-
const sorted = Array.from(this.quickDiffProviders).sort(createProviderComparer(uri));
62+
const providers = Array.from(this.quickDiffProviders)
63+
.filter(provider => !provider.rootUri || isEqualOrParent(uri, provider.rootUri))
64+
.sort(createProviderComparer(uri));
6365

64-
const diffs = await Promise.all(Array.from(sorted.values()).map(async (provider) => {
66+
const diffs = await Promise.all(providers.map(async provider => {
6567
const scoreValue = provider.selector ? score(provider.selector, uri, language, isSynchronized, undefined, undefined) : 10;
6668
const diff: Partial<QuickDiff> = {
6769
originalResource: scoreValue > 0 ? withNullAsUndefined(await provider.getOriginalResource(uri)) : undefined,

0 commit comments

Comments
 (0)