From a5deafe72479e608553ba9a63e9f3b84dfbb0f4a Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 24 Oct 2016 16:25:34 +0200 Subject: [PATCH] use user-friendly names for extension recommendations fixes #13888 --- package.json | 4 ++-- src/vs/platform/product.ts | 2 +- .../extensions/electron-browser/extensionTipsService.ts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4c4bb9bc004..5ae70a24dfe 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "code-oss-dev", "version": "1.7.0", "electronVersion": "1.3.8", - "distro": "b1e023235579beebbb3cc127676cc91cc7f3e823", + "distro": "d919533e6cd6a495abe667cb3d47bc6ac2a4846b", "author": { "name": "Microsoft Corporation" }, @@ -113,4 +113,4 @@ "windows-mutex": "^0.2.0", "fsevents": "0.3.8" } -} +} \ No newline at end of file diff --git a/src/vs/platform/product.ts b/src/vs/platform/product.ts index 89f22716453..73b68a981a5 100644 --- a/src/vs/platform/product.ts +++ b/src/vs/platform/product.ts @@ -25,7 +25,7 @@ export interface IProductConfiguration { itemUrl: string; }; extensionTips: { [id: string]: string; }; - extensionImportantTips: { [id: string]: string; }; + extensionImportantTips: { [id: string]: { name: string; pattern: string; }; }; crashReporter: Electron.CrashReporterStartOptions; welcomePage: string; enableTelemetry: boolean; diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts index 661aa0763d9..8c5c2161f9b 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts @@ -26,7 +26,7 @@ export class ExtensionTipsService implements IExtensionTipsService { private _recommendations: { [id: string]: boolean; } = Object.create(null); private _availableRecommendations: { [pattern: string]: string[] } = Object.create(null); - private importantRecommendations: { [pattern: string]: string[] }; + private importantRecommendations: { [id: string]: { name: string; pattern: string; } }; private importantRecommendationsIgnoreList: string[]; private _disposables: IDisposable[] = []; @@ -127,13 +127,13 @@ export class ExtensionTipsService implements IExtensionTipsService { .filter(id => this.importantRecommendationsIgnoreList.indexOf(id) === -1) .filter(id => local.every(local => `${local.manifest.publisher}.${local.manifest.name}` !== id)) .forEach(id => { - const pattern = this.importantRecommendations[id]; + const { pattern, name } = this.importantRecommendations[id]; if (!match(pattern, uri.fsPath)) { return; } - const message = localize('reallyRecommended', "It is recommended to install the '{0}' extension.", id); + const message = localize('reallyRecommended', "It is recommended to install the '{0}' extension.", name); const recommendationsAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations")); const options = [ recommendationsAction.label, -- GitLab