merge master

This commit is contained in:
isidor
2017-09-20 10:08:51 +02:00
90 changed files with 2328 additions and 465 deletions

View File

@@ -489,14 +489,14 @@ export function createApiFactory(
get inputBox() {
return extHostSCM.getLastInputBox(extension);
},
createSourceControl(id: string, label: string) {
createSourceControl(id: string, label: string, rootUri?: vscode.Uri) {
mainThreadTelemetry.$publicLog('registerSCMProvider', {
extensionId: extension.id,
providerId: id,
providerLabel: label
});
return extHostSCM.createSourceControl(extension, id, label);
return extHostSCM.createSourceControl(extension, id, label, rootUri);
}
};