Show recommendation reason always Fixes microsoft#37419

ramya-rao-a · ramya-rao-a · commit 1d632ec12cd4 · 2017-11-02T16:32:44.000-07:00
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsList.ts b/src/vs/workbench/parts/extensions/browser/extensionsList.ts
@@ -48,19 +48,15 @@ const actionOptions = { icon: true, label: true };
 
 export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 
-	private showRecommendedLabel: boolean;
 	constructor(
-		showRecommendedLabel: boolean,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IMessageService private messageService: IMessageService,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionService private extensionService: IExtensionService,
 		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
 		@IThemeService private themeService: IThemeService
-	) {
-		this.showRecommendedLabel = showRecommendedLabel;
-	}
+	) { }
 
 	get templateId() { return 'extension'; }
 
@@ -167,12 +163,10 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 		removeClass(data.root, 'recommended');
 
 		const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
-		if (extRecommendations[extension.id.toLowerCase()] && !isInstalled) {
+		if (extRecommendations[extension.id.toLowerCase()]) {
 			data.root.setAttribute('aria-label', extension.displayName + '. ' + extRecommendations[extension.id]);
-			if (this.showRecommendedLabel) {
-				addClass(data.root, 'recommended');
-				data.root.title = extRecommendations[extension.id.toLowerCase()];
-			}
+			addClass(data.root, 'recommended');
+			data.root.title = extRecommendations[extension.id.toLowerCase()];
 		}
 
 		data.name.textContent = extension.displayName;
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
@@ -41,7 +41,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 	_serviceBrand: any;
 
 	private _fileBasedRecommendations: { [id: string]: number; } = Object.create(null);
-	private _exeBasedRecommendations: string[] = [];
+	private _exeBasedRecommendations: { [id: string]: string; } = Object.create(null);
 	private _availableRecommendations: { [pattern: string]: string[] } = Object.create(null);
 	private importantRecommendations: { [id: string]: { name: string; pattern: string; } } = Object.create(null);
 	private importantRecommendationsIgnoreList: string[];
@@ -83,6 +83,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		let output: { [id: string]: string; } = Object.create(null);
 		Object.keys(this._fileBasedRecommendations).forEach(x => output[x.toLowerCase()] = localize('fileBasedRecommendation', "This extension is recommended based on the files you recently opened."));
 		this._allWorkspaceRecommendedExtensions.forEach(x => output[x.toLowerCase()] = localize('workspaceRecommendation', "This extension is recommended by users of the current workspace."));
+		forEach(this._exeBasedRecommendations, entry => output[entry.key.toLowerCase()] = localize('exeBasedRecommendation', "This extension is recommended because you have {0} installed.", entry.value));
 		return output;
 	}
 
@@ -148,8 +149,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 	}
 
 	getOtherRecommendations(): string[] {
-
-		return distinct(this._exeBasedRecommendations);
+		return Object.keys(this._exeBasedRecommendations);
 	}
 
 
@@ -439,15 +439,20 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		});
 	}
 
-	private _suggestBasedOnExecutables(recommendations: string[]): void {
+	private _suggestBasedOnExecutables(recommendations: { [id: string]: string; }): void {
 		const homeDir = os.homedir();
 		let foundExecutables: Set<string> = new Set<string>();
 
 		let findExecutable = (exeName, path) => {
 			return pfs.fileExists(path).then(exists => {
 				if (exists && !foundExecutables.has(exeName)) {
 					foundExecutables.add(exeName);
-					recommendations.push(...product.exeBasedExtensionTips[exeName]['recommendations']);
+					(product.exeBasedExtensionTips[exeName]['recommendations'] || [])
+						.forEach(x => {
+							if (product.exeBasedExtensionTips[exeName]['friendlyName']) {
+								recommendations[x] = product.exeBasedExtensionTips[exeName]['friendlyName'];
+							}
+						});
 				}
 			});
 		};
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -81,15 +81,11 @@ export class ExtensionsListView extends ViewsViewletPanel {
 		this.disposables.push(attachBadgeStyler(this.badge, this.themeService));
 	}
 
-	showRecommendedLabel() {
-		return true;
-	}
-
 	renderBody(container: HTMLElement): void {
 		this.extensionsList = append(container, $('.extensions-list'));
 		this.messageBox = append(container, $('.message'));
 		const delegate = new Delegate();
-		const renderer = this.instantiationService.createInstance(Renderer, this.showRecommendedLabel());
+		const renderer = this.instantiationService.createInstance(Renderer);
 		this.list = new PagedList(this.extensionsList, delegate, [renderer], {
 			ariaLabel: localize('extensions', "Extensions"),
 			keyboardSupport: false
@@ -541,23 +537,13 @@ export class InstalledExtensionsView extends ExtensionsListView {
 		searchInstalledQuery = query ? searchInstalledQuery + ' ' + query : searchInstalledQuery;
 		return super.show(searchInstalledQuery);
 	}
-
-	showRecommendedLabel() {
-		return false;
-	}
-
 }
 
 export class RecommendedExtensionsView extends ExtensionsListView {
 
 	async show(query: string): TPromise<IPagedModel<IExtension>> {
 		return super.show(!query.trim() ? '@recommended:all' : '@recommended');
 	}
-
-	showRecommendedLabel() {
-		return false;
-	}
-
 }
 
 export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
@@ -590,8 +576,4 @@ export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
 		return model;
 	}
 
-	showRecommendedLabel() {
-		return false;
-	}
-
 }
