remove automatic merging/overwriting of decorations, simplify proposed API, #54938

This commit is contained in:
Johannes Rieken
2019-09-04 10:52:31 +02:00
parent ddff4bc893
commit 07d19b90a5
14 changed files with 23 additions and 105 deletions

View File

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