support extension packs in exe recommendations

sandy081 · sandy081 · commit 79d85e4076ec · 2020-07-08T12:46:40.000+02:00
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -237,7 +237,8 @@ export type IConfigBasedExtensionTip = {
 
 export type IExecutableBasedExtensionTip = {
 	readonly extensionId: string,
-	readonly friendlyName: string,
+	readonly extensionName: string,
+	readonly isExtensionPack: boolean,
 	readonly exeFriendlyName: string,
 	readonly windowsPath?: string,
 };
diff --git a/src/vs/platform/extensionManagement/node/extensionTipsService.ts b/src/vs/platform/extensionManagement/node/extensionTipsService.ts
@@ -21,7 +21,7 @@ import { ExtensionTipsService as BaseExtensionTipsService } from 'vs/platform/ex
 type IExeBasedExtensionTips = {
 	readonly exeFriendlyName: string,
 	readonly windowsPath?: string,
-	readonly recommendations: { extensionId: string, extensionName: string }[];
+	readonly recommendations: { extensionId: string, extensionName: string, isExtensionPack: boolean }[];
 };
 
 export class ExtensionTipsService extends BaseExtensionTipsService {
@@ -41,13 +41,13 @@ export class ExtensionTipsService extends BaseExtensionTipsService {
 		super(fileService, productService, requestService, logService);
 		if (productService.exeBasedExtensionTips) {
 			forEach(productService.exeBasedExtensionTips, ({ key, value }) => {
-				const importantRecommendations: { extensionId: string, extensionName: string }[] = [];
-				const otherRecommendations: { extensionId: string, extensionName: string }[] = [];
+				const importantRecommendations: { extensionId: string, extensionName: string, isExtensionPack: boolean }[] = [];
+				const otherRecommendations: { extensionId: string, extensionName: string, isExtensionPack: boolean }[] = [];
 				forEach(value.recommendations, ({ key: extensionId, value }) => {
 					if (value.important) {
-						importantRecommendations.push({ extensionId, extensionName: value.name });
+						importantRecommendations.push({ extensionId, extensionName: value.name, isExtensionPack: !!value.isExtensionPack });
 					} else {
-						otherRecommendations.push({ extensionId, extensionName: value.name });
+						otherRecommendations.push({ extensionId, extensionName: value.name, isExtensionPack: !!value.isExtensionPack });
 					}
 				});
 				if (importantRecommendations.length) {
@@ -99,10 +99,11 @@ export class ExtensionTipsService extends BaseExtensionTipsService {
 					checkedExecutables.set(exePath, exists);
 				}
 				if (exists) {
-					for (const { extensionId, extensionName: friendlyName } of extensionTip.recommendations) {
+					for (const { extensionId, extensionName, isExtensionPack } of extensionTip.recommendations) {
 						result.push({
 							extensionId,
-							friendlyName,
+							extensionName,
+							isExtensionPack,
 							exeFriendlyName: extensionTip.exeFriendlyName,
 							windowsPath: extensionTip.windowsPath,
 						});
diff --git a/src/vs/platform/product/common/productService.ts b/src/vs/platform/product/common/productService.ts
@@ -131,7 +131,7 @@ export interface IConfigBasedExtensionTip {
 export interface IExeBasedExtensionTip {
 	friendlyName: string;
 	windowsPath?: string;
-	recommendations: IStringDictionary<{ name: string, important?: boolean }>;
+	recommendations: IStringDictionary<{ name: string, important?: boolean, isExtensionPack?: boolean }>;
 }
 
 export interface IRemoteExtensionTip {
diff --git a/src/vs/workbench/contrib/extensions/browser/exeBasedRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/exeBasedRecommendations.ts
@@ -87,7 +87,8 @@ export class ExeBasedRecommendations extends ExtensionRecommendations {
 
 		for (const extensionId of recommendations) {
 			const tip = importantExeBasedRecommendations[extensionId];
-			const message = localize('exeRecommended', "The '{0}' extension is recommended as you have {1} installed on your system.", tip.friendlyName!, tip.exeFriendlyName || basename(tip.windowsPath!));
+			const message = tip.isExtensionPack ? localize('extensionPackRecommended', "The '{0}' extension pack is recommended as you have {1} installed on your system.", tip.extensionName!, tip.exeFriendlyName || basename(tip.windowsPath!))
+				: localize('exeRecommended', "The '{0}' extension is recommended as you have {1} installed on your system.", tip.extensionName!, tip.exeFriendlyName || basename(tip.windowsPath!));
 			this.promptImportantExtensionInstallNotification(extensionId, message);
 		}
 	}
@@ -111,7 +112,7 @@ export class ExeBasedRecommendations extends ExtensionRecommendations {
 			source: 'executable',
 			reason: {
 				reasonId: ExtensionRecommendationReason.Executable,
-				reasonText: localize('exeBasedRecommendation', "This extension is recommended because you have {0} installed.", tip.friendlyName)
+				reasonText: localize('exeBasedRecommendation', "This extension is recommended because you have {0} installed.", tip.extensionName)
 			}
 		};
 	}

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ export interface IConfigBasedExtensionTip {`
`131`	`131`	`export interface IExeBasedExtensionTip {`
`132`	`132`	`friendlyName: string;`
`133`	`133`	`windowsPath?: string;`
`134`		`- recommendations: IStringDictionary<{ name: string, important?: boolean }>;`
	`134`	`+ recommendations: IStringDictionary<{ name: string, important?: boolean, isExtensionPack?: boolean }>;`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`export interface IRemoteExtensionTip {`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ export class ExeBasedRecommendations extends ExtensionRecommendations {`
`87`	`87`
`88`	`88`	`for (const extensionId of recommendations) {`
`89`	`89`	`const tip = importantExeBasedRecommendations[extensionId];`
`90`		`- const message = localize('exeRecommended', "The '{0}' extension is recommended as you have {1} installed on your system.", tip.friendlyName!, tip.exeFriendlyName \|\| basename(tip.windowsPath!));`
	`90`	`+ const message = tip.isExtensionPack ? localize('extensionPackRecommended', "The '{0}' extension pack is recommended as you have {1} installed on your system.", tip.extensionName!, tip.exeFriendlyName \|\| basename(tip.windowsPath!))`
	`91`	`+ : localize('exeRecommended', "The '{0}' extension is recommended as you have {1} installed on your system.", tip.extensionName!, tip.exeFriendlyName \|\| basename(tip.windowsPath!));`
`91`	`92`	`this.promptImportantExtensionInstallNotification(extensionId, message);`
`92`	`93`	`}`
`93`	`94`	`}`
`@@ -111,7 +112,7 @@ export class ExeBasedRecommendations extends ExtensionRecommendations {`
`111`	`112`	`source: 'executable',`
`112`	`113`	`reason: {`
`113`	`114`	`reasonId: ExtensionRecommendationReason.Executable,`
`114`		`- reasonText: localize('exeBasedRecommendation', "This extension is recommended because you have {0} installed.", tip.friendlyName)`
	`115`	`+ reasonText: localize('exeBasedRecommendation', "This extension is recommended because you have {0} installed.", tip.extensionName)`
`115`	`116`	`}`
`116`	`117`	`};`
`117`	`118`	`}`