ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 966b87dd4013be1a9c06e2b8334522ec61905cc2 (#4696)

Browse Source
This commit is contained in:
Anthony Dresser
2019-03-26 11:43:38 -07:00
committed by GitHub
parent b1393ae615
commit 0d8ef9583b
268 changed files with 5947 additions and 3422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/browser/workbench.ts
View File

@@ -173,10 +173,10 @@ export class Workbench extends Layout {
// Layout Service
serviceCollection.set(IWorkbenchLayoutService, this);
//
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// NOTE: DO NOT ADD ANY OTHER SERVICE INTO THE COLLECTION HERE.
// INSTEAD, CONTRIBUTE IT VIA WORKBENCH.MAIN.TS
//
// CONTRIBUTE IT VIA WORKBENCH.MAIN.TS AND registerSingleton().
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// All Contributed Services
const contributedServices = getServices();
@@ -192,8 +192,8 @@ export class Workbench extends Layout {
// TODO@Ben legacy file service
const fileService = accessor.get(IFileService) as any;
if (typeof fileService.setImpl === 'function') {
fileService.setImpl(accessor.get(ILegacyFileService));
if (typeof fileService.setLegacyService === 'function') {
fileService.setLegacyService(accessor.get(ILegacyFileService));
}
// TODO@Sandeep debt around cyclic dependencies