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

deco - use correct/overwrite decorations in scm viewlet because the same URI can have multiple decorations

Browse Source
This commit is contained in:
Johannes Rieken
2017-10-26 17:01:03 +02:00
parent 86cd46a44e
commit 47e1c93285
13 changed files with 105 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/api/electron-browser/mainThreadSCM.ts
View File

@@ -182,7 +182,7 @@ class MainThreadSCMProvider implements ISCMProvider {
for (const [start, deleteCount, rawResources] of groupSlices) {
const resources = rawResources.map(rawResource => {
const [handle, sourceUri, icons, tooltip, strikeThrough, faded] = rawResource;
const [handle, sourceUri, icons, tooltip, strikeThrough, faded, source, letter, color] = rawResource;
const icon = icons[0];
const iconDark = icons[1] || icon;
const decorations = {
@@ -190,7 +190,11 @@ class MainThreadSCMProvider implements ISCMProvider {
iconDark: iconDark && URI.parse(iconDark),
tooltip,
strikeThrough,
faded
faded,
source,
letter,
color: color.id
};
return new MainThreadSCMResource(