Skip to content

Commit 9fdfbbc

Browse files
sandy081sandy081
committed
microsoft#94599 Rename to IExtensionRecommendationsService
1 parent 9ec0783 commit 9fdfbbc

15 files changed

Lines changed: 77 additions & 77 deletions

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
1919
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
2020
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
2121
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
22-
import { IExtensionTipsService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
22+
import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
2323
import { IExtensionManifest, IKeyBinding, IView, IViewContainer, ExtensionType } from 'vs/platform/extensions/common/extensions';
2424
import { ResolvedKeybinding, KeyMod, KeyCode } from 'vs/base/common/keyCodes';
2525
import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
@@ -189,7 +189,7 @@ export class ExtensionEditor extends BaseEditor {
189189
@IKeybindingService private readonly keybindingService: IKeybindingService,
190190
@INotificationService private readonly notificationService: INotificationService,
191191
@IOpenerService private readonly openerService: IOpenerService,
192-
@IExtensionTipsService private readonly extensionTipsService: IExtensionTipsService,
192+
@IExtensionRecommendationsService private readonly extensionRecommendationsService: IExtensionRecommendationsService,
193193
@IStorageService storageService: IStorageService,
194194
@IExtensionService private readonly extensionService: IExtensionService,
195195
@IWorkbenchThemeService private readonly workbenchThemeService: IWorkbenchThemeService,
@@ -347,7 +347,7 @@ export class ExtensionEditor extends BaseEditor {
347347
template.version.textContent = extension.version;
348348
template.description.textContent = extension.description;
349349

350-
const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
350+
const extRecommendations = this.extensionRecommendationsService.getAllRecommendationsWithReason();
351351
let recommendationsData = {};
352352
if (extRecommendations[extension.identifier.id.toLowerCase()]) {
353353
recommendationsData = { recommendationReason: extRecommendations[extension.identifier.id.toLowerCase()].reasonId };
@@ -472,12 +472,12 @@ export class ExtensionEditor extends BaseEditor {
472472
this.transientDisposables.add(ignoreAction);
473473
this.transientDisposables.add(undoIgnoreAction);
474474

475-
const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
475+
const extRecommendations = this.extensionRecommendationsService.getAllRecommendationsWithReason();
476476
if (extRecommendations[extension.identifier.id.toLowerCase()]) {
477477
ignoreAction.enabled = true;
478478
template.subtext.textContent = extRecommendations[extension.identifier.id.toLowerCase()].reasonText;
479479
show(template.subtextContainer);
480-
} else if (this.extensionTipsService.getAllIgnoredRecommendations().global.indexOf(extension.identifier.id.toLowerCase()) !== -1) {
480+
} else if (this.extensionRecommendationsService.getAllIgnoredRecommendations().global.indexOf(extension.identifier.id.toLowerCase()) !== -1) {
481481
undoIgnoreAction.enabled = true;
482482
template.subtext.textContent = localize('recommendationHasBeenIgnored', "You have chosen not to receive recommendations for this extension.");
483483
show(template.subtextContainer);
@@ -486,11 +486,11 @@ export class ExtensionEditor extends BaseEditor {
486486
template.subtext.textContent = '';
487487
}
488488

489-
this.extensionTipsService.onRecommendationChange(change => {
489+
this.extensionRecommendationsService.onRecommendationChange(change => {
490490
if (change.extensionId.toLowerCase() === extension.identifier.id.toLowerCase()) {
491491
if (change.isRecommended) {
492492
undoIgnoreAction.enabled = false;
493-
const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
493+
const extRecommendations = this.extensionRecommendationsService.getAllRecommendationsWithReason();
494494
if (extRecommendations[extension.identifier.id.toLowerCase()]) {
495495
ignoreAction.enabled = true;
496496
template.subtext.textContent = extRecommendations[extension.identifier.id.toLowerCase()].reasonText;

src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts renamed to src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
99
import { match } from 'vs/base/common/glob';
1010
import * as json from 'vs/base/common/json';
1111
import { IExtensionManagementService, IExtensionGalleryService, EXTENSION_IDENTIFIER_PATTERN, InstallOperation, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
12-
import { IExtensionTipsService, ExtensionRecommendationReason, IExtensionsConfigContent, RecommendationChangeNotification, IExtensionRecommendation, ExtensionRecommendationSource, IWorkbenchExtensionEnablementService, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
12+
import { IExtensionRecommendationsService, ExtensionRecommendationReason, IExtensionsConfigContent, RecommendationChangeNotification, IExtensionRecommendation, ExtensionRecommendationSource, IWorkbenchExtensionEnablementService, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
1313
import { IModelService } from 'vs/editor/common/services/modelService';
1414
import { ITextModel } from 'vs/editor/common/model';
1515
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -56,7 +56,7 @@ function caseInsensitiveGet<T>(obj: { [key: string]: T }, key: string): T | unde
5656
return undefined;
5757
}
5858

59-
export class ExtensionTipsService extends Disposable implements IExtensionTipsService {
59+
export class ExtensionRecommendationsService extends Disposable implements IExtensionRecommendationsService {
6060

6161
_serviceBrand: undefined;
6262

‎src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
7-
import { IExtensionTipsService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
8-
import { ExtensionTipsService } from 'vs/workbench/contrib/extensions/browser/extensionTipsService';
7+
import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
8+
import { ExtensionRecommendationsService } from 'vs/workbench/contrib/extensions/browser/extensionRecommendationsService';
99

1010
// Singletons
11-
registerSingleton(IExtensionTipsService, ExtensionTipsService);
11+
registerSingleton(IExtensionRecommendationsService, ExtensionRecommendationsService);
1212

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

Lines changed: 3 additions & 3 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, TOGGLE_IGNORE_EXTENSION_ACTION_ID } from 'vs/workbench/contrib/extensions/common/extensions';
1717
import { ExtensionsConfigurationInitialContent } from 'vs/workbench/contrib/extensions/common/extensionsFileTemplate';
1818
import { IGalleryExtension, IExtensionGalleryService, INSTALL_ERROR_MALICIOUS, INSTALL_ERROR_INCOMPATIBLE, IGalleryExtensionVersion, ILocalExtension, INSTALL_ERROR_NOT_SUPPORTED } from 'vs/platform/extensionManagement/common/extensionManagement';
19-
import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionTipsService, IExtensionRecommendation, IExtensionsConfigContent, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
19+
import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionRecommendationsService, 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';
@@ -1802,7 +1802,7 @@ export class IgnoreExtensionRecommendationAction extends Action {
18021802

18031803
constructor(
18041804
private readonly extension: IExtension,
1805-
@IExtensionTipsService private readonly extensionsTipsService: IExtensionTipsService,
1805+
@IExtensionRecommendationsService private readonly extensionsTipsService: IExtensionRecommendationsService,
18061806
) {
18071807
super(IgnoreExtensionRecommendationAction.ID, 'Ignore Recommendation');
18081808

@@ -1825,7 +1825,7 @@ export class UndoIgnoreExtensionRecommendationAction extends Action {
18251825

18261826
constructor(
18271827
private readonly extension: IExtension,
1828-
@IExtensionTipsService private readonly extensionsTipsService: IExtensionTipsService,
1828+
@IExtensionRecommendationsService private readonly extensionsTipsService: IExtensionRecommendationsService,
18291829
) {
18301830
super(UndoIgnoreExtensionRecommendationAction.ID, 'Undo');
18311831

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Event, Emitter } from 'vs/base/common/event';
1010
import { isPromiseCanceledError, getErrorMessage } from 'vs/base/common/errors';
1111
import { PagedModel, IPagedModel, IPager, DelayedPagedModel } from 'vs/base/common/paging';
1212
import { SortBy, SortOrder, IQueryOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
13-
import { IExtensionManagementServer, IExtensionManagementServerService, IExtensionTipsService, IExtensionRecommendation, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
13+
import { IExtensionManagementServer, IExtensionManagementServerService, IExtensionRecommendationsService, IExtensionRecommendation, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
1414
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
1515
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
1616
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -100,7 +100,7 @@ export class ExtensionsListView extends ViewPane {
100100
@IExtensionService private readonly extensionService: IExtensionService,
101101
@IExtensionsWorkbenchService protected extensionsWorkbenchService: IExtensionsWorkbenchService,
102102
@IEditorService private readonly editorService: IEditorService,
103-
@IExtensionTipsService protected tipsService: IExtensionTipsService,
103+
@IExtensionRecommendationsService protected tipsService: IExtensionRecommendationsService,
104104
@ITelemetryService telemetryService: ITelemetryService,
105105
@IConfigurationService configurationService: IConfigurationService,
106106
@IWorkspaceContextService protected contextService: IWorkspaceContextService,
@@ -873,7 +873,7 @@ export class ServerExtensionsView extends ExtensionsListView {
873873
@IInstantiationService instantiationService: IInstantiationService,
874874
@IExtensionService extensionService: IExtensionService,
875875
@IEditorService editorService: IEditorService,
876-
@IExtensionTipsService tipsService: IExtensionTipsService,
876+
@IExtensionRecommendationsService tipsService: IExtensionRecommendationsService,
877877
@ITelemetryService telemetryService: ITelemetryService,
878878
@IConfigurationService configurationService: IConfigurationService,
879879
@IWorkspaceContextService contextService: IWorkspaceContextService,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { IExtension, IExtensionsWorkbenchService, IExtensionContainer } from 'vs
99
import { append, $, addClass, removeNode } from 'vs/base/browser/dom';
1010
import * as platform from 'vs/base/common/platform';
1111
import { localize } from 'vs/nls';
12-
import { IExtensionTipsService, IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
12+
import { IExtensionRecommendationsService, IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
1313
import { ILabelService } from 'vs/platform/label/common/label';
1414
import { extensionButtonProminentBackground, extensionButtonProminentForeground, ExtensionToolTipAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
1515
import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
@@ -198,12 +198,12 @@ export class RecommendationWidget extends ExtensionWidget {
198198
constructor(
199199
private parent: HTMLElement,
200200
@IThemeService private readonly themeService: IThemeService,
201-
@IExtensionTipsService private readonly extensionTipsService: IExtensionTipsService
201+
@IExtensionRecommendationsService private readonly extensionRecommendationsService: IExtensionRecommendationsService
202202
) {
203203
super();
204204
this.render();
205205
this._register(toDisposable(() => this.clear()));
206-
this._register(this.extensionTipsService.onRecommendationChange(() => this.render()));
206+
this._register(this.extensionRecommendationsService.onRecommendationChange(() => this.render()));
207207
}
208208

209209
private clear(): void {
@@ -221,7 +221,7 @@ export class RecommendationWidget extends ExtensionWidget {
221221
if (!this.extension) {
222222
return;
223223
}
224-
const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
224+
const extRecommendations = this.extensionRecommendationsService.getAllRecommendationsWithReason();
225225
if (extRecommendations[this.extension.identifier.id.toLowerCase()]) {
226226
this.element = append(this.parent, $('div.extension-bookmark'));
227227
const recommendation = append(this.element, $('.recommendation'));

‎src/vs/workbench/contrib/extensions/common/extensionsUtils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
1010
import { Disposable } from 'vs/base/common/lifecycle';
1111
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
1212
import { IExtensionManagementService, ILocalExtension, IExtensionIdentifier, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
13-
import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionTipsService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
13+
import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionRecommendationsService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
1414
import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
1515
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
1616
import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -28,7 +28,7 @@ export class KeymapExtensions extends Disposable implements IWorkbenchContributi
2828
constructor(
2929
@IInstantiationService private readonly instantiationService: IInstantiationService,
3030
@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
31-
@IExtensionTipsService private readonly tipsService: IExtensionTipsService,
31+
@IExtensionRecommendationsService private readonly tipsService: IExtensionRecommendationsService,
3232
@ILifecycleService lifecycleService: ILifecycleService,
3333
@INotificationService private readonly notificationService: INotificationService,
3434
@ITelemetryService private readonly telemetryService: ITelemetryService,
@@ -122,7 +122,7 @@ export async function getInstalledExtensions(accessor: ServicesAccessor): Promis
122122
});
123123
}
124124

125-
export function isKeymapExtension(tipsService: IExtensionTipsService, extension: IExtensionStatus): boolean {
125+
export function isKeymapExtension(tipsService: IExtensionRecommendationsService, extension: IExtensionStatus): boolean {
126126
const cats = extension.local.manifest.categories;
127127
return cats && cats.indexOf('Keymaps') !== -1 || tipsService.getKeymapRecommendations().some(({ extensionId }) => areSameExtensions({ id: extensionId }, extension.local.identifier));
128128
}

src/vs/workbench/contrib/extensions/electron-browser/extensionTipsService.ts renamed to src/vs/workbench/contrib/extensions/electron-browser/extensionRecommendationsService.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { ExtensionTipsService, milliSecondsInADay, choiceNever } from 'vs/workbench/contrib/extensions/browser/extensionTipsService';
7-
import { IExtensionTipsService, IWorkbenchExtensionEnablementService, ExtensionRecommendationReason, IExtensionRecommendation, ExtensionRecommendationSource } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
6+
import { ExtensionRecommendationsService, milliSecondsInADay, choiceNever } from 'vs/workbench/contrib/extensions/browser/extensionRecommendationsService';
7+
import { IExtensionRecommendationsService, IWorkbenchExtensionEnablementService, ExtensionRecommendationReason, IExtensionRecommendation, ExtensionRecommendationSource } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
88
import { URI } from 'vs/base/common/uri';
99
import { join, basename } from 'vs/base/common/path';
1010
import { distinct, shuffle } from 'vs/base/common/arrays';
@@ -41,7 +41,7 @@ interface IDynamicWorkspaceRecommendations {
4141
recommendations: string[];
4242
}
4343

44-
export class NativeExtensionTipsService extends ExtensionTipsService implements IExtensionTipsService {
44+
export class NativeExtensionRecommendationsService extends ExtensionRecommendationsService implements IExtensionRecommendationsService {
4545

4646
private _exeBasedRecommendations: { [id: string]: IExeBasedExtensionTip; } = Object.create(null);
4747
private _importantExeBasedRecommendations: { [id: string]: IExeBasedExtensionTip; } = Object.create(null);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/
2424
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
2525
import { OpenExtensionsFolderAction } from 'vs/workbench/contrib/extensions/electron-browser/extensionsActions';
2626
import { ExtensionsLabel } from 'vs/platform/extensionManagement/common/extensionManagement';
27-
import { IExtensionTipsService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
28-
import { NativeExtensionTipsService } from 'vs/workbench/contrib/extensions/electron-browser/extensionTipsService';
27+
import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
28+
import { NativeExtensionRecommendationsService } from 'vs/workbench/contrib/extensions/electron-browser/extensionRecommendationsService';
2929

3030
// Singletons
3131
registerSingleton(IExtensionHostProfileService, ExtensionHostProfileService, true);
32-
registerSingleton(IExtensionTipsService, NativeExtensionTipsService);
32+
registerSingleton(IExtensionRecommendationsService, NativeExtensionRecommendationsService);
3333

3434
const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
3535
workbenchRegistry.registerWorkbenchContribution(ExtensionsAutoProfiler, LifecyclePhase.Eventually);

0 commit comments

Comments
 (0)