Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 19:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

SCM Graph - only show one badge per color/type (#229716)

Browse Source
This commit is contained in:
Ladislau Szomoru
2024-09-25 16:18:56 +02:00
committed by GitHub
parent cedad6e8fc
commit bdc3e5e2f4
3 changed files with 78 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
extensions/git/src/historyProvider.ts
View File

@@ -45,6 +45,29 @@ function toSourceControlHistoryItemRef(ref: Ref): SourceControlHistoryItemRef {
}
}
function compareSourceControlHistoryItemRef(ref1: SourceControlHistoryItemRef, ref2: SourceControlHistoryItemRef): number {
const getOrder = (ref: SourceControlHistoryItemRef): number => {
if (ref.id.startsWith('refs/heads/')) {
return 1;
} else if (ref.id.startsWith('refs/remotes/')) {
return 2;
} else if (ref.id.startsWith('refs/tags/')) {
return 3;
}
return 99;
};
const ref1Order = getOrder(ref1);
const ref2Order = getOrder(ref2);
if (ref1Order !== ref2Order) {
return ref1Order - ref2Order;
}
return ref1.name.localeCompare(ref2.name);
}
export class GitHistoryProvider implements SourceControlHistoryProvider, FileDecorationProvider, IDisposable {
private readonly _onDidChangeDecorations = new EventEmitter<Uri[]>();
readonly onDidChangeFileDecorations: Event<Uri[]> = this._onDidChangeDecorations.event;
@@ -334,14 +357,6 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
icon: new ThemeIcon('target')
});
break;
case ref.startsWith('tag: refs/tags/'):
references.push({
id: ref.substring('tag: '.length),
name: ref.substring('tag: refs/tags/'.length),
revision: commit.hash,
icon: new ThemeIcon('tag')
});
break;
case ref.startsWith('refs/heads/'):
references.push({
id: ref,
@@ -358,10 +373,18 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
icon: new ThemeIcon('cloud')
});
break;
case ref.startsWith('tag: refs/tags/'):
references.push({
id: ref.substring('tag: '.length),
name: ref.substring('tag: refs/tags/'.length),
revision: commit.hash,
icon: new ThemeIcon('tag')
});
break;
}
}
return references;
return references.sort(compareSourceControlHistoryItemRef);
}
private async resolveHEADMergeBase(): Promise<Branch | undefined> {