development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 13:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #136301

Browse source
This commit is contained in:
Sandeep Somavarapu 2022-02-11 10:04:36 +01:00
parent f0d562f2fe
commit afafd98f3f
No known key found for this signature in database
GPG key ID: 1FED25EC4646638B
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/base/common/product.ts
View file

@ -152,7 +152,7 @@ export interface IProductConfiguration {
readonly darwinUniversalAssetId?: string;
}
export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean };
export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean; whenNotInstalled?: string[] };
export interface IAppCenterConfiguration {
readonly 'win32-ia32': string;

12
src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts
View file

@ -34,6 +34,7 @@ import { disposableTimeout } from 'vs/base/common/async';
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
import { ViewContainerLocation } from 'vs/workbench/common/views';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
type FileExtensionSuggestionClassification = {
userReaction: { classification: 'SystemMetaData'; purpose: 'FeatureInsight' };
@ -197,7 +198,15 @@ export class FileBasedRecommendations extends ExtensionRecommendations {
}
private async promptRecommendations(uri: URI, language: string, fileExtension: string): Promise<void> {
const importantRecommendations: string[] = (this.fileBasedRecommendationsByLanguage.get(language) || []).filter(extensionId => this.importantExtensionTips.has(extensionId));
const installed = await this.extensionsWorkbenchService.queryLocal();
const importantRecommendations: string[] = (this.fileBasedRecommendationsByLanguage.get(language) || [])
.filter(extensionId => {
const importantTip = this.importantExtensionTips.get(extensionId);
if (importantTip) {
return !importantTip.whenNotInstalled || importantTip.whenNotInstalled.every(id => installed.every(local => !areSameExtensions(local.identifier, { id })));
}
return false;
});
let languageName: string | null = importantRecommendations.length ? this.languageService.getLanguageName(language) : null;
const fileBasedRecommendations: string[] = [...importantRecommendations];
@ -231,7 +240,6 @@ export class FileBasedRecommendations extends ExtensionRecommendations {
return;
}
const installed = await this.extensionsWorkbenchService.queryLocal();
if (importantRecommendations.length &&
await this.promptRecommendedExtensionForFileType(languageName || basename(uri), language, importantRecommendations, installed)) {
return;