From 0a5289e95709d7c4d7ff41b8e021aae846c19dd9 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 8 Mar 2019 10:59:09 +0100 Subject: [PATCH] debt - declarative request service --- .../contextview/browser/contextViewService.ts | 5 +---- .../node/extensionGalleryService.ts | 5 +---- src/vs/workbench/electron-browser/workbench.ts | 5 ----- src/vs/workbench/workbench.main.ts | 12 +++++++++--- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/vs/platform/contextview/browser/contextViewService.ts b/src/vs/platform/contextview/browser/contextViewService.ts index 8244328604f..c0acf0ea176 100644 --- a/src/vs/platform/contextview/browser/contextViewService.ts +++ b/src/vs/platform/contextview/browser/contextViewService.ts @@ -7,7 +7,6 @@ import { IContextViewService, IContextViewDelegate } from './contextView'; import { ContextView } from 'vs/base/browser/ui/contextview/contextview'; import { Disposable } from 'vs/base/common/lifecycle'; import { ILayoutService } from 'vs/platform/layout/browser/layoutService'; -import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; export class ContextViewService extends Disposable implements IContextViewService { _serviceBrand: any; @@ -42,6 +41,4 @@ export class ContextViewService extends Disposable implements IContextViewServic hideContextView(data?: any): void { this.contextView.hide(data); } -} - -registerSingleton(IContextViewService, ContextViewService, true); \ No newline at end of file +} \ No newline at end of file diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts index cd033acca99..3a92695bb88 100644 --- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts @@ -25,7 +25,6 @@ import { values } from 'vs/base/common/map'; import { CancellationToken } from 'vs/base/common/cancellation'; import { ILogService } from 'vs/platform/log/common/log'; import { IExtensionManifest } from 'vs/platform/extensions/common/extensions'; -import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; interface IRawGalleryExtensionFile { assetType: string; @@ -855,6 +854,4 @@ export function resolveMarketplaceHeaders(environmentService: IEnvironmentServic 'X-Market-User-Id': uuid }; }); -} - -registerSingleton(IExtensionGalleryService, ExtensionGalleryService, true); \ No newline at end of file +} \ No newline at end of file diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 2cb19755b8c..9517023c83e 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -76,7 +76,6 @@ import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net'; import { DialogChannel } from 'vs/platform/dialogs/node/dialogIpc'; import { TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc'; import { resolveWorkbenchCommonProperties } from 'vs/platform/telemetry/node/workbenchCommonProperties'; -import { IRequestService } from 'vs/platform/request/node/request'; import { IRemoteAgentService } from 'vs/workbench/services/remote/node/remoteAgentService'; import { DownloadServiceChannel } from 'vs/platform/download/node/downloadIpc'; import { LogLevelSetterChannel } from 'vs/platform/log/node/logIpc'; @@ -90,7 +89,6 @@ import { LifecycleService } from 'vs/platform/lifecycle/electron-browser/lifecyc import { WindowService } from 'vs/platform/windows/electron-browser/windowService'; import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-browser/remoteAuthorityResolverService'; import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl'; -import { RequestService } from 'vs/platform/request/electron-browser/requestService'; import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar'; import { IActivityBarService } from 'vs/workbench/services/activityBar/browser/activityBarService'; @@ -338,9 +336,6 @@ export class Workbench extends Disposable implements IWorkbenchLayoutService { // Lifecycle serviceCollection.set(ILifecycleService, new SyncDescriptor(LifecycleService)); - // Request Service - serviceCollection.set(IRequestService, new SyncDescriptor(RequestService, undefined, true)); - // Remote Resolver serviceCollection.set(IRemoteAuthorityResolverService, new SyncDescriptor(RemoteAuthorityResolverService, undefined, true)); diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index fcec2e271a1..49d2e5a1365 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -62,8 +62,13 @@ import { ITextResourceConfigurationService } from 'vs/editor/common/services/res import { TextResourceConfigurationService } from 'vs/editor/common/services/resourceConfigurationImpl'; import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility'; import { AccessibilityService } from 'vs/platform/accessibility/node/accessibilityService'; -import { IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement'; +import { IExtensionEnablementService, IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement'; import { ExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService'; +import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; +import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService'; +import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService'; +import { IRequestService } from 'vs/platform/request/node/request'; +import { RequestService } from 'vs/platform/request/electron-browser/requestService'; import 'vs/workbench/services/bulkEdit/browser/bulkEditService'; import 'vs/workbench/services/integrity/node/integrityService'; @@ -98,9 +103,7 @@ import 'vs/workbench/services/commands/common/commandService'; import 'vs/workbench/services/themes/browser/workbenchThemeService'; import 'vs/workbench/services/extensions/electron-browser/extensionService'; import 'vs/workbench/services/contextmenu/electron-browser/contextmenuService'; -import 'vs/platform/contextview/browser/contextViewService'; import 'vs/workbench/services/extensionManagement/node/multiExtensionManagement'; -import 'vs/platform/extensionManagement/node/extensionGalleryService'; registerSingleton(IMenuService, MenuService, true); registerSingleton(IListService, ListService, true); @@ -115,6 +118,9 @@ registerSingleton(IModelService, ModelServiceImpl, true); registerSingleton(ITextResourceConfigurationService, TextResourceConfigurationService); registerSingleton(IAccessibilityService, AccessibilityService, true); registerSingleton(IExtensionEnablementService, ExtensionEnablementService, true); +registerSingleton(IContextViewService, ContextViewService, true); +registerSingleton(IExtensionGalleryService, ExtensionGalleryService, true); +registerSingleton(IRequestService, RequestService, true); //#endregion -- GitLab