Skip to content

Commit 6ddaba3

Browse files
sandy081sandy081
committed
microsoft#105562 use instantiation service
1 parent 8735ebc commit 6ddaba3

3 files changed

Lines changed: 5 additions & 13 deletions

File tree

‎src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ async function setupTest() {
100100
instantiationService.stub(IExtensionManagementServerService, new class extends ExtensionManagementServerService {
101101
#localExtensionManagementServer: IExtensionManagementServer = { extensionManagementService: instantiationService.get(IExtensionManagementService), label: 'local', id: 'vscode-local' };
102102
constructor() {
103-
super(instantiationService.get(ISharedProcessService), instantiationService.get(IRemoteAgentService), instantiationService.get(ILabelService), instantiationService.get(IExtensionGalleryService), instantiationService.get(IProductService), instantiationService.get(IConfigurationService), instantiationService.get(ILogService), instantiationService.get(INativeWorkbenchEnvironmentService));
103+
super(instantiationService.get(ISharedProcessService), instantiationService.get(IRemoteAgentService), instantiationService.get(ILabelService), instantiationService.get(IExtensionGalleryService), instantiationService);
104104
}
105105
get localExtensionManagementServer(): IExtensionManagementServer { return this.#localExtensionManagementServer; }
106106
set localExtensionManagementServer(server: IExtensionManagementServer) { }

‎src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKe
4444
import { IMenuService } from 'vs/platform/actions/common/actions';
4545
import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
4646
import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
47-
import { IProductService } from 'vs/platform/product/common/productService';
48-
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
4947

5048
suite('ExtensionsListView Tests', () => {
5149

@@ -105,7 +103,7 @@ suite('ExtensionsListView Tests', () => {
105103
instantiationService.stub(IExtensionManagementServerService, new class extends ExtensionManagementServerService {
106104
#localExtensionManagementServer: IExtensionManagementServer = { extensionManagementService: instantiationService.get(IExtensionManagementService), label: 'local', id: 'vscode-local' };
107105
constructor() {
108-
super(instantiationService.get(ISharedProcessService), instantiationService.get(IRemoteAgentService), instantiationService.get(ILabelService), instantiationService.get(IExtensionGalleryService), instantiationService.get(IProductService), instantiationService.get(IConfigurationService), instantiationService.get(ILogService), instantiationService.get(INativeWorkbenchEnvironmentService));
106+
super(instantiationService.get(ISharedProcessService), instantiationService.get(IRemoteAgentService), instantiationService.get(ILabelService), instantiationService.get(IExtensionGalleryService), instantiationService);
109107
}
110108
get localExtensionManagementServer(): IExtensionManagementServer { return this.#localExtensionManagementServer; }
111109
set localExtensionManagementServer(server: IExtensionManagementServer) { }

‎src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService.ts‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ import { NativeRemoteExtensionManagementService } from 'vs/workbench/services/ex
1515
import { ILabelService } from 'vs/platform/label/common/label';
1616
import { IExtension } from 'vs/platform/extensions/common/extensions';
1717
import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
18-
import { IProductService } from 'vs/platform/product/common/productService';
19-
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
20-
import { ILogService } from 'vs/platform/log/common/log';
21-
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
18+
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
2219

2320
export class ExtensionManagementServerService implements IExtensionManagementServerService {
2421

@@ -34,17 +31,14 @@ export class ExtensionManagementServerService implements IExtensionManagementSer
3431
@IRemoteAgentService remoteAgentService: IRemoteAgentService,
3532
@ILabelService labelService: ILabelService,
3633
@IExtensionGalleryService galleryService: IExtensionGalleryService,
37-
@IProductService productService: IProductService,
38-
@IConfigurationService configurationService: IConfigurationService,
39-
@ILogService logService: ILogService,
40-
@INativeWorkbenchEnvironmentService environmentService: INativeWorkbenchEnvironmentService
34+
@IInstantiationService instantiationService: IInstantiationService,
4135
) {
4236
const localExtensionManagementService = new ExtensionManagementChannelClient(sharedProcessService.getChannel('extensions'));
4337

4438
this._localExtensionManagementServer = { extensionManagementService: localExtensionManagementService, id: 'local', label: localize('local', "Local") };
4539
const remoteAgentConnection = remoteAgentService.getConnection();
4640
if (remoteAgentConnection) {
47-
const extensionManagementService = new NativeRemoteExtensionManagementService(remoteAgentConnection.getChannel<IChannel>('extensions'), this.localExtensionManagementServer, logService, galleryService, configurationService, productService, environmentService);
41+
const extensionManagementService = instantiationService.createInstance(NativeRemoteExtensionManagementService, remoteAgentConnection.getChannel<IChannel>('extensions'), this.localExtensionManagementServer);
4842
this.remoteExtensionManagementServer = {
4943
id: 'remote',
5044
extensionManagementService,

0 commit comments

Comments
 (0)