development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 05:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Shuffle extension recommendations a little

Browse source
This commit is contained in:
Ramya Achutha Rao 2017-09-28 19:13:42 -07:00
parent c82799d6a4
commit f896835722
3 changed files with 45 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/platform/extensionManagement/common/extensionManagement.ts
View file

@ -299,7 +299,7 @@ export const IExtensionTipsService = createDecorator<IExtensionTipsService>('ext
export interface IExtensionTipsService {
_serviceBrand: any;
getRecommendations(): string[];
getRecommendations(installedExtensions: string[], searchText: string): string[];
getWorkspaceRecommendations(): TPromise<string[]>;
getKeymapRecommendations(): string[];
getKeywordsForExtension(extension: string): string[];

27
src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
View file

@ -104,15 +104,32 @@ export class ExtensionTipsService implements IExtensionTipsService {
return [];
}
getRecommendations(): string[] {
getRecommendations(installedExtensions: string[], searchText: string): string[] {
const allRecomendations = this._getAllRecommendationsInProduct();
const fileBased = Object.keys(this._fileBasedRecommendations)
.filter(recommendation => allRecomendations.indexOf(recommendation) !== -1)
.sort((a, b) => {
.filter(recommendation => {
return allRecomendations.indexOf(recommendation) > -1
&& installedExtensions.indexOf(recommendation) === -1
&& recommendation.toLowerCase().indexOf(searchText) > -1;
}).sort((a, b) => {
return this._fileBasedRecommendations[a] > this._fileBasedRecommendations[b] ? -1 : 1;
});
const exeBased = distinct(this._exeBasedRecommendations);
const exeBased = this._exeBasedRecommendations
.filter((recommendation, index) => {
return this._exeBasedRecommendations.indexOf(recommendation) === index
&& installedExtensions.indexOf(recommendation) === -1
&& fileBased.indexOf(recommendation) === -1
&& recommendation.toLowerCase().indexOf(searchText) > -1;
});
// Sort recommendations such that few of the exeBased ones show up earliar
const x = Math.min(6, fileBased.length);
const y = Math.min(4, exeBased.length);
const sortedRecommendations = fileBased.slice(0, x);
sortedRecommendations.push(...exeBased.slice(0, y));
sortedRecommendations.push(...fileBased.slice(x));
sortedRecommendations.push(...exeBased.slice(y));
/* __GDPR__
"extensionRecommendations:unfiltered" : {
@ -122,7 +139,7 @@ export class ExtensionTipsService implements IExtensionTipsService {
*/
this.telemetryService.publicLog('extensionRecommendations:unfiltered', { fileBased, exeBased });
return distinct([...fileBased, ...exeBased]);
return sortedRecommendations;
}
getKeymapRecommendations(): string[] {

34
src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
View file

@ -9,7 +9,6 @@ import { localize } from 'vs/nls';
import { TPromise } from 'vs/base/common/winjs.base';
import { dispose } from 'vs/base/common/lifecycle';
import { assign } from 'vs/base/common/objects';
import { distinct } from 'vs/base/common/arrays';
import { chain } from 'vs/base/common/event';
import { isPromiseCanceledError, create as createError } from 'vs/base/common/errors';
import Severity from 'vs/base/common/severity';
@ -277,11 +276,24 @@ export class ExtensionsListView extends ViewsViewletPanel {
return this.extensionsWorkbenchService.queryLocal()
.then(result => result.filter(e => e.type === LocalExtensionType.User))
.then(local => {
return TPromise.join([TPromise.as(this.tipsService.getRecommendations()), this.tipsService.getWorkspaceRecommendations()])
const installedExtensions = local.map(x => `${x.publisher}.${x.name}`);
return TPromise.join([TPromise.as(this.tipsService.getRecommendations(installedExtensions, value)), this.tipsService.getWorkspaceRecommendations()])
.then(([recommendations, workspaceRecommendations]) => {
const names = distinct([...recommendations, ...workspaceRecommendations])
.filter(name => local.every(ext => `${ext.publisher}.${ext.name}` !== name))
.filter(name => name.toLowerCase().indexOf(value) > -1);
workspaceRecommendations = workspaceRecommendations
.filter(name => {
return recommendations.indexOf(name) === -1
&& installedExtensions.indexOf(name) === -1
&& name.toLowerCase().indexOf(value) > -1;
});
// Sort recommendations such that few of the workspace ones show up earliar
const x = Math.min(4, recommendations.length);
const y = Math.min(4, workspaceRecommendations.length);
const names = recommendations.slice(0, x);
names.push(...workspaceRecommendations.slice(0, y));
names.push(...recommendations.slice(x));
names.push(...workspaceRecommendations.slice(y));
this.telemetryService.publicLog('extensionAllRecommendations:open', { count: names.length });
if (!names.length) {
@ -303,9 +315,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
return this.extensionsWorkbenchService.queryLocal()
.then(result => result.filter(e => e.type === LocalExtensionType.User))
.then(local => {
const names = this.tipsService.getRecommendations()
.filter(name => local.every(ext => `${ext.publisher}.${ext.name}` !== name))
.filter(name => name.toLowerCase().indexOf(value) > -1);
const names = this.tipsService.getRecommendations(local.map(x => `${x.publisher}.${x.name}`), value);
/* __GDPR__
"extensionRecommendations:open" : {
@ -332,10 +342,10 @@ export class ExtensionsListView extends ViewsViewletPanel {
.then(recommendations => {
const names = recommendations.filter(name => name.toLowerCase().indexOf(value) > -1);
/* __GDPR__
"extensionWorkspaceRecommendations:open" : {
"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"extensionWorkspaceRecommendations:open" : {
"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
this.telemetryService.publicLog('extensionWorkspaceRecommendations:open', { count: names.length });
if (!names.length) {