Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '25849' of https://github.com/marckassay/vscode into marckassay-25849

Browse Source
This commit is contained in:
Joao Moreno
2017-08-16 10:06:33 +02:00
parent 8bad13987d dc4e07da58
commit f9f06beefa
7 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/api/node/extHostSCM.ts
View File

@@ -125,10 +125,11 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG
icons.push(darkIconPath);
}
const tooltip = r.decorations.tooltip;
const strikeThrough = r.decorations && !!r.decorations.strikeThrough;
const faded = r.decorations && !!r.decorations.faded;
return [handle, sourceUri, command, icons, strikeThrough, faded] as SCMRawResource;
return [handle, sourceUri, command, icons, tooltip, strikeThrough, faded] as SCMRawResource;
});
this._proxy.$updateGroupResourceStates(this._sourceControlHandle, this._handle, rawResources);