Skip to content

Commit 43bfc2c

Browse files
sandy081sandy081
committed
rename
1 parent 2f01502 commit 43bfc2c

23 files changed

Lines changed: 199 additions & 199 deletions

‎src/vs/workbench/api/browser/mainThreadExtensionService.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensio
1212
import { INotificationService } from 'vs/platform/notification/common/notification';
1313
import { localize } from 'vs/nls';
1414
import { Action } from 'vs/base/common/actions';
15-
import { IExtensionEnablementService, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
15+
import { IWorkbenchExtensionEnablementService, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
1616
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
1717
import { IHostService } from 'vs/workbench/services/host/browser/host';
1818
import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
@@ -27,15 +27,15 @@ export class MainThreadExtensionService implements MainThreadExtensionServiceSha
2727
private readonly _notificationService: INotificationService;
2828
private readonly _extensionsWorkbenchService: IExtensionsWorkbenchService;
2929
private readonly _hostService: IHostService;
30-
private readonly _extensionEnablementService: IExtensionEnablementService;
30+
private readonly _extensionEnablementService: IWorkbenchExtensionEnablementService;
3131

3232
constructor(
3333
extHostContext: IExtHostContext,
3434
@IExtensionService extensionService: IExtensionService,
3535
@INotificationService notificationService: INotificationService,
3636
@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
3737
@IHostService hostService: IHostService,
38-
@IExtensionEnablementService extensionEnablementService: IExtensionEnablementService
38+
@IWorkbenchExtensionEnablementService extensionEnablementService: IWorkbenchExtensionEnablementService
3939
) {
4040
this._extensionService = extensionService;
4141
this._notificationService = notificationService;

‎src/vs/workbench/contrib/experiments/test/electron-browser/experimentService.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
1010
import {
1111
IExtensionManagementService, DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier, ILocalExtension
1212
} from 'vs/platform/extensionManagement/common/extensionManagement';
13-
import { IExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
13+
import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
1414
import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
1515
import { Emitter } from 'vs/base/common/event';
1616
import { TestExtensionEnablementService } from 'vs/workbench/services/extensionManagement/test/electron-browser/extensionEnablementService.test';
@@ -78,7 +78,7 @@ suite('Experiment Service', () => {
7878
instantiationService.stub(IExtensionManagementService, 'onDidInstallExtension', didInstallEvent.event);
7979
instantiationService.stub(IExtensionManagementService, 'onUninstallExtension', uninstallEvent.event);
8080
instantiationService.stub(IExtensionManagementService, 'onDidUninstallExtension', didUninstallEvent.event);
81-
instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
81+
instantiationService.stub(IWorkbenchExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
8282
instantiationService.stub(ITelemetryService, NullTelemetryService);
8383
instantiationService.stub(IURLService, URLService);
8484
instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);

‎src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
1010
import { match } from 'vs/base/common/glob';
1111
import * as json from 'vs/base/common/json';
1212
import { IExtensionManagementService, IExtensionGalleryService, EXTENSION_IDENTIFIER_PATTERN, InstallOperation, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
13-
import { IExtensionTipsService, ExtensionRecommendationReason, IExtensionsConfigContent, RecommendationChangeNotification, IExtensionRecommendation, ExtensionRecommendationSource, IExtensionEnablementService, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
13+
import { IExtensionTipsService, ExtensionRecommendationReason, IExtensionsConfigContent, RecommendationChangeNotification, IExtensionRecommendation, ExtensionRecommendationSource, IWorkbenchExtensionEnablementService, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
1414
import { IModelService } from 'vs/editor/common/services/modelService';
1515
import { ITextModel } from 'vs/editor/common/model';
1616
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -94,7 +94,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
9494
@IModelService private readonly _modelService: IModelService,
9595
@IStorageService private readonly storageService: IStorageService,
9696
@IExtensionManagementService private readonly extensionsService: IExtensionManagementService,
97-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService,
97+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
9898
@IInstantiationService private readonly instantiationService: IInstantiationService,
9999
@IFileService private readonly fileService: IFileService,
100100
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,

‎src/vs/workbench/contrib/extensions/browser/extensionsActions.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { dispose, Disposable } from 'vs/base/common/lifecycle';
1616
import { IExtension, ExtensionState, IExtensionsWorkbenchService, VIEWLET_ID, IExtensionsViewPaneContainer, AutoUpdateConfigurationKey, IExtensionContainer, EXTENSIONS_CONFIG } from 'vs/workbench/contrib/extensions/common/extensions';
1717
import { ExtensionsConfigurationInitialContent } from 'vs/workbench/contrib/extensions/common/extensionsFileTemplate';
1818
import { ExtensionsLabel, IGalleryExtension, IExtensionGalleryService, INSTALL_ERROR_MALICIOUS, INSTALL_ERROR_INCOMPATIBLE, IGalleryExtensionVersion, ILocalExtension, INSTALL_ERROR_NOT_SUPPORTED } from 'vs/platform/extensionManagement/common/extensionManagement';
19-
import { IExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionTipsService, IExtensionRecommendation, IExtensionsConfigContent, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
19+
import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionTipsService, IExtensionRecommendation, IExtensionsConfigContent, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
2020
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
2121
import { ExtensionType, ExtensionIdentifier, IExtensionDescription, IExtensionManifest, isLanguagePackExtension } from 'vs/platform/extensions/common/extensions';
2222
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -819,7 +819,7 @@ export class EnableForWorkspaceAction extends ExtensionAction {
819819

820820
constructor(
821821
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
822-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService
822+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
823823
) {
824824
super(EnableForWorkspaceAction.ID, EnableForWorkspaceAction.LABEL);
825825
this.update();
@@ -849,7 +849,7 @@ export class EnableGloballyAction extends ExtensionAction {
849849

850850
constructor(
851851
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
852-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService
852+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
853853
) {
854854
super(EnableGloballyAction.ID, EnableGloballyAction.LABEL);
855855
this.update();
@@ -880,7 +880,7 @@ export class DisableForWorkspaceAction extends ExtensionAction {
880880
constructor(readonly runningExtensions: IExtensionDescription[],
881881
@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
882882
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
883-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService
883+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
884884
) {
885885
super(DisableForWorkspaceAction.ID, DisableForWorkspaceAction.LABEL);
886886
this.update();
@@ -910,7 +910,7 @@ export class DisableGloballyAction extends ExtensionAction {
910910

911911
constructor(readonly runningExtensions: IExtensionDescription[],
912912
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
913-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService
913+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
914914
) {
915915
super(DisableGloballyAction.ID, DisableGloballyAction.LABEL);
916916
this.update();
@@ -1011,7 +1011,7 @@ export class CheckForUpdatesAction extends Action {
10111011
id = CheckForUpdatesAction.ID,
10121012
label = CheckForUpdatesAction.LABEL,
10131013
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
1014-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService,
1014+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
10151015
@IViewletService private readonly viewletService: IViewletService,
10161016
@IDialogService private readonly dialogService: IDialogService,
10171017
@INotificationService private readonly notificationService: INotificationService
@@ -1154,7 +1154,7 @@ export class ReloadAction extends ExtensionAction {
11541154
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
11551155
@IHostService private readonly hostService: IHostService,
11561156
@IExtensionService private readonly extensionService: IExtensionService,
1157-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService,
1157+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
11581158
@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
11591159
@IProductService private readonly productService: IProductService,
11601160
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -2527,7 +2527,7 @@ export class ExtensionToolTipAction extends ExtensionAction {
25272527
constructor(
25282528
private readonly warningAction: SystemDisabledWarningAction,
25292529
private readonly reloadAction: ReloadAction,
2530-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService,
2530+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
25312531
@IExtensionService private readonly extensionService: IExtensionService,
25322532
@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService
25332533
) {
@@ -2691,7 +2691,7 @@ export class DisableAllAction extends Action {
26912691
constructor(
26922692
id: string = DisableAllAction.ID, label: string = DisableAllAction.LABEL,
26932693
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
2694-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService
2694+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
26952695
) {
26962696
super(id, label);
26972697
this.update();
@@ -2717,7 +2717,7 @@ export class DisableAllWorkspaceAction extends Action {
27172717
id: string = DisableAllWorkspaceAction.ID, label: string = DisableAllWorkspaceAction.LABEL,
27182718
@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
27192719
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
2720-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService
2720+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
27212721
) {
27222722
super(id, label);
27232723
this.update();
@@ -2743,7 +2743,7 @@ export class EnableAllAction extends Action {
27432743
constructor(
27442744
id: string = EnableAllAction.ID, label: string = EnableAllAction.LABEL,
27452745
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
2746-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService
2746+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
27472747
) {
27482748
super(id, label);
27492749
this.update();
@@ -2769,7 +2769,7 @@ export class EnableAllWorkspaceAction extends Action {
27692769
id: string = EnableAllWorkspaceAction.ID, label: string = EnableAllWorkspaceAction.LABEL,
27702770
@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
27712771
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
2772-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService
2772+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
27732773
) {
27742774
super(id, label);
27752775
this.update();
@@ -2918,7 +2918,7 @@ export class InstallSpecificVersionOfExtensionAction extends Action {
29182918
@IHostService private readonly hostService: IHostService,
29192919
@IInstantiationService private readonly instantiationService: IInstantiationService,
29202920
@IExtensionService private readonly extensionService: IExtensionService,
2921-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService,
2921+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
29222922
) {
29232923
super(id, label);
29242924
}

‎src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
EnableAutoUpdateAction, DisableAutoUpdateAction, ShowBuiltInExtensionsAction, InstallVSIXAction
2626
} from 'vs/workbench/contrib/extensions/browser/extensionsActions';
2727
import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
28-
import { IExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
28+
import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
2929
import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
3030
import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, BuiltInExtensionsView, BuiltInThemesExtensionsView, BuiltInBasicsExtensionsView, ServerExtensionsView, DefaultRecommendedExtensionsView } from 'vs/workbench/contrib/extensions/browser/extensionsViews';
3131
import { OpenGlobalSettingsAction } from 'vs/workbench/contrib/preferences/browser/preferencesActions';
@@ -624,7 +624,7 @@ export class StatusUpdater extends Disposable implements IWorkbenchContribution
624624
constructor(
625625
@IActivityService private readonly activityService: IActivityService,
626626
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
627-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService
627+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
628628
) {
629629
super();
630630
this._register(extensionsWorkbenchService.onChange(this.onServiceChange, this));

‎src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions,
1717
InstallExtensionEvent, DidInstallExtensionEvent, DidUninstallExtensionEvent, IExtensionIdentifier, InstallOperation
1818
} from 'vs/platform/extensionManagement/common/extensionManagement';
19-
import { IExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
19+
import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
2020
import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, getMaliciousExtensionsSet, groupByExtension, ExtensionIdentifierWithVersion } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
2121
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
2222
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -319,7 +319,7 @@ class Extensions extends Disposable {
319319
private readonly server: IExtensionManagementServer,
320320
private readonly stateProvider: IExtensionStateProvider<ExtensionState>,
321321
@IExtensionGalleryService private readonly galleryService: IExtensionGalleryService,
322-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService,
322+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
323323
@IInstantiationService private readonly instantiationService: IInstantiationService
324324
) {
325325
super();
@@ -496,7 +496,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
496496
@ITelemetryService private readonly telemetryService: ITelemetryService,
497497
@INotificationService private readonly notificationService: INotificationService,
498498
@IURLService urlService: IURLService,
499-
@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService,
499+
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
500500
@IHostService private readonly hostService: IHostService,
501501
@IProgressService private readonly progressService: IProgressService,
502502
@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,

0 commit comments

Comments
 (0)