Merge branch 'master' into scm-multiroot

This commit is contained in:
Joao
2017-08-25 11:36:39 +02:00
294 changed files with 4601 additions and 2062 deletions

View File

@@ -15,7 +15,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { ICommandService } from 'vs/platform/commands/common/commands';
import { ExtHostContext, MainThreadSCMShape, ExtHostSCMShape, SCMProviderFeatures, SCMRawResource, SCMGroupFeatures, MainContext, IExtHostContext } from '../node/extHost.protocol';
import { Command } from 'vs/editor/common/modes';
import { extHostNamedCustomer } from "vs/workbench/api/electron-browser/extHostCustomers";
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
class MainThreadSCMResourceGroup implements ISCMResourceGroup {