Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-09 16:24:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #196640 (#196738)

Browse Source
This commit is contained in:
Sandeep Somavarapu
2023-10-26 18:39:35 +02:00
committed by GitHub
parent 5a8659ad66
commit a7ad1bf686
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts
+9 -5
View File
@@ -149,6 +149,7 @@ export class FileBasedRecommendations extends ExtensionRecommendations {
const matchedRecommendations: IStringDictionary<IFileOpenCondition[]> = {};
const unmatchedRecommendations: IStringDictionary<IFileOpenCondition[]> = {};
let listenOnLanguageChange = false;
const languageId = model.getLanguageId();
for (const [extensionId, conditions] of extensionRecommendationEntries) {
const conditionsByPattern: IFileOpenCondition[] = [];
@@ -165,7 +166,7 @@ export class FileBasedRecommendations extends ExtensionRecommendations {
}
if (isLanguageCondition) {
if ((<IFileLanguageCondition>condition).languages.includes(model.getLanguageId())) {
if ((<IFileLanguageCondition>condition).languages.includes(languageId)) {
languageMatched = true;
}
}
@@ -178,12 +179,13 @@ export class FileBasedRecommendations extends ExtensionRecommendations {
processedPathGlobs.set(pathGlob, pathGlobMatched);
}
if (!languageMatched && !pathGlobMatched) {
// If the language is not matched and the path glob is not matched, then we don't need to check the other conditions
let matched = languageMatched || pathGlobMatched;
// If the resource has pattern (extension) and not matched, then we don't need to check the other conditions
if (pattern && !matched) {
continue;
}
let matched = true;
if (matched && condition.whenInstalled) {
if (!condition.whenInstalled.every(id => installed.some(local => areSameExtensions({ id }, local.identifier)))) {
matched = false;
@@ -226,7 +228,9 @@ export class FileBasedRecommendations extends ExtensionRecommendations {
}
}
this.recommendationsByPattern.set(pattern, recommendationsByPattern);
if (pattern) {
this.recommendationsByPattern.set(pattern, recommendationsByPattern);
}
if (Object.keys(unmatchedRecommendations).length) {
if (listenOnLanguageChange) {
const disposables = new DisposableStore();