Skip to content

Commit 0a5289e

Browse files
author
Benjamin Pasero
committed
debt - declarative request service
1 parent 4df729a commit 0a5289e

4 files changed

Lines changed: 11 additions & 16 deletions

File tree

‎src/vs/platform/contextview/browser/contextViewService.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { IContextViewService, IContextViewDelegate } from './contextView';
77
import { ContextView } from 'vs/base/browser/ui/contextview/contextview';
88
import { Disposable } from 'vs/base/common/lifecycle';
99
import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
10-
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
1110

1211
export class ContextViewService extends Disposable implements IContextViewService {
1312
_serviceBrand: any;
@@ -42,6 +41,4 @@ export class ContextViewService extends Disposable implements IContextViewServic
4241
hideContextView(data?: any): void {
4342
this.contextView.hide(data);
4443
}
45-
}
46-
47-
registerSingleton(IContextViewService, ContextViewService, true);
44+
}

‎src/vs/platform/extensionManagement/node/extensionGalleryService.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { values } from 'vs/base/common/map';
2525
import { CancellationToken } from 'vs/base/common/cancellation';
2626
import { ILogService } from 'vs/platform/log/common/log';
2727
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
28-
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
2928

3029
interface IRawGalleryExtensionFile {
3130
assetType: string;
@@ -855,6 +854,4 @@ export function resolveMarketplaceHeaders(environmentService: IEnvironmentServic
855854
'X-Market-User-Id': uuid
856855
};
857856
});
858-
}
859-
860-
registerSingleton(IExtensionGalleryService, ExtensionGalleryService, true);
857+
}

‎src/vs/workbench/electron-browser/workbench.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net';
7676
import { DialogChannel } from 'vs/platform/dialogs/node/dialogIpc';
7777
import { TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc';
7878
import { resolveWorkbenchCommonProperties } from 'vs/platform/telemetry/node/workbenchCommonProperties';
79-
import { IRequestService } from 'vs/platform/request/node/request';
8079
import { IRemoteAgentService } from 'vs/workbench/services/remote/node/remoteAgentService';
8180
import { DownloadServiceChannel } from 'vs/platform/download/node/downloadIpc';
8281
import { LogLevelSetterChannel } from 'vs/platform/log/node/logIpc';
@@ -90,7 +89,6 @@ import { LifecycleService } from 'vs/platform/lifecycle/electron-browser/lifecyc
9089
import { WindowService } from 'vs/platform/windows/electron-browser/windowService';
9190
import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-browser/remoteAuthorityResolverService';
9291
import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
93-
import { RequestService } from 'vs/platform/request/electron-browser/requestService';
9492
import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
9593
import { IActivityBarService } from 'vs/workbench/services/activityBar/browser/activityBarService';
9694

@@ -338,9 +336,6 @@ export class Workbench extends Disposable implements IWorkbenchLayoutService {
338336
// Lifecycle
339337
serviceCollection.set(ILifecycleService, new SyncDescriptor(LifecycleService));
340338

341-
// Request Service
342-
serviceCollection.set(IRequestService, new SyncDescriptor(RequestService, undefined, true));
343-
344339
// Remote Resolver
345340
serviceCollection.set(IRemoteAuthorityResolverService, new SyncDescriptor(RemoteAuthorityResolverService, undefined, true));
346341

‎src/vs/workbench/workbench.main.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,13 @@ import { ITextResourceConfigurationService } from 'vs/editor/common/services/res
6262
import { TextResourceConfigurationService } from 'vs/editor/common/services/resourceConfigurationImpl';
6363
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
6464
import { AccessibilityService } from 'vs/platform/accessibility/node/accessibilityService';
65-
import { IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
65+
import { IExtensionEnablementService, IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
6666
import { ExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
67+
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
68+
import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
69+
import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService';
70+
import { IRequestService } from 'vs/platform/request/node/request';
71+
import { RequestService } from 'vs/platform/request/electron-browser/requestService';
6772

6873
import 'vs/workbench/services/bulkEdit/browser/bulkEditService';
6974
import 'vs/workbench/services/integrity/node/integrityService';
@@ -98,9 +103,7 @@ import 'vs/workbench/services/commands/common/commandService';
98103
import 'vs/workbench/services/themes/browser/workbenchThemeService';
99104
import 'vs/workbench/services/extensions/electron-browser/extensionService';
100105
import 'vs/workbench/services/contextmenu/electron-browser/contextmenuService';
101-
import 'vs/platform/contextview/browser/contextViewService';
102106
import 'vs/workbench/services/extensionManagement/node/multiExtensionManagement';
103-
import 'vs/platform/extensionManagement/node/extensionGalleryService';
104107

105108
registerSingleton(IMenuService, MenuService, true);
106109
registerSingleton(IListService, ListService, true);
@@ -115,6 +118,9 @@ registerSingleton(IModelService, ModelServiceImpl, true);
115118
registerSingleton(ITextResourceConfigurationService, TextResourceConfigurationService);
116119
registerSingleton(IAccessibilityService, AccessibilityService, true);
117120
registerSingleton(IExtensionEnablementService, ExtensionEnablementService, true);
121+
registerSingleton(IContextViewService, ContextViewService, true);
122+
registerSingleton(IExtensionGalleryService, ExtensionGalleryService, true);
123+
registerSingleton(IRequestService, RequestService, true);
118124

119125
//#endregion
120126

0 commit comments

Comments
 (0)