ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-29 16:20:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 892353d48e17303de203bb5071f21ea69573367d

Browse Source
This commit is contained in:
ADS Merger
2020-09-05 03:17:42 +00:00
parent b8d0e2a9e3
commit 6718c7565d
40 changed files with 330 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts
View File

@@ -117,9 +117,9 @@ export class ExtensionRecommendationsService extends Disposable implements IExte
this.staticRecommendations.activate(), // {{SQL CARBON EDIT}} add ours
this.scenarioRecommendations.activate(), // {{SQL CARBON EDIT}} add ours
this.lifecycleService.when(LifecyclePhase.Eventually)
.then(() => {
.then(async () => {
if (!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey)) {
this.activateProactiveRecommendations();
await this.activateProactiveRecommendations();
}
})
]);

2
src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
View File

@@ -686,7 +686,7 @@ export class ExtensionsListView extends ViewPane {
const recommendations = await this.extensionRecommendationsService.getWorkspaceRecommendations();
const { important } = await this.extensionRecommendationsService.getConfigBasedRecommendations();
for (const configBasedRecommendation of important) {
if (recommendations.some(r => r.extensionId !== configBasedRecommendation.extensionId)) {
if (!recommendations.find(r => r.extensionId === configBasedRecommendation.extensionId)) {
recommendations.push(configBasedRecommendation);
}
}