Merge branch 'master' of github.com:Microsoft/vscode

This commit is contained in:
Joao Moreno
2017-12-05 17:54:18 +01:00
8 changed files with 58 additions and 27 deletions

View File

@@ -95,7 +95,7 @@ export class ExtensionHostMain {
registerGlobalLogService(logService);
this.disposables.push(logService);
logService.info('main {0}', initData);
logService.info('main', initData);
this._extHostConfiguration = new ExtHostConfiguration(threadService.get(MainContext.MainThreadConfiguration), extHostWorkspace, initData.configuration);
this._extensionService = new ExtHostExtensionService(initData, threadService, extHostWorkspace, this._extHostConfiguration);