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

✨ scm: require uris on resources and groups

Browse Source
This commit is contained in:
Joao Moreno
2017-03-24 17:51:00 +01:00
parent e52ce12816
commit 24cd191ac2
12 changed files with 119 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/api/node/mainThreadSCM.ts
View File

@@ -49,7 +49,7 @@ class MainThreadSCMProvider implements ISCMProvider {
return TPromise.as(null);
}
return this.proxy.$open(this.id, resource.resourceGroupId, resource.uri.toString());
return this.proxy.$open(this.id, resource.uri.toString());
}
acceptChanges(): TPromise<void> {
@@ -76,10 +76,10 @@ class MainThreadSCMProvider implements ISCMProvider {
$onChange(rawResourceGroups: SCMRawResourceGroup[], count: number | undefined, state: string | undefined): void {
this._resources = rawResourceGroups.map(rawGroup => {
const [id, label, rawResources] = rawGroup;
const [uri, id, label, rawResources] = rawGroup;
const resources = rawResources.map(rawResource => {
const [uri, icons, strikeThrough] = rawResource;
const [uri, sourceUri, icons, strikeThrough] = rawResource;
const icon = icons[0];
const iconDark = icons[1] || icon;
@@ -93,11 +93,12 @@ class MainThreadSCMProvider implements ISCMProvider {
return {
resourceGroupId: id,
uri: URI.parse(uri),
sourceUri: URI.parse(sourceUri),
decorations
};
});
return { id, label, resources };
return { uri: URI.parse(uri), id, label, resources };
});
this._count = count;