Merge branch 'install-count' of https://github.com/wadeanderson/vscode into...

Merge branch 'install-count' of https://github.com/wadeanderson/vscode into wadeanderson-install-count

src/vs/workbench/parts/extensions/common/extensions.ts

@@ -15,6 +15,7 @@ export interface IExtensionManifest {
 	version: string;
 	displayName?: string;
 	description?: string;
+	installs: number;
 }
 
 export interface IGalleryInformation {

src/vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen.ts

@@ -56,7 +56,7 @@ interface ITemplateData {
 	root: HTMLElement;
 	displayName: HighlightedLabel;
 	version: HTMLElement;
-	since: HTMLElement;
+	installs: HTMLElement;
 	author: HTMLElement;
 	actionbar: ActionBar;
 	description: HighlightedLabel;
@@ -79,10 +79,11 @@ function extensionEquals(one: IExtension, other: IExtension): boolean {
 	return one.publisher === other.publisher && one.name === other.name;
 }
 
+/**
+ * Compare by Install count descending.
+ */
 function extensionEntryCompare(one: IExtensionEntry, other: IExtensionEntry): number {
-	const oneName = one.extension.displayName || one.extension.name;
-	const otherName = other.extension.displayName || other.extension.name;
-	return oneName.localeCompare(otherName);
+	return other.extension.installs - one.extension.installs;
 }
 
 class OpenInGalleryAction extends Action {
@@ -171,19 +172,22 @@ class Renderer implements IRenderer<IExtensionEntry> {
 	}
 
 	renderTemplate(templateId: string, container: HTMLElement): ITemplateData {
+		// Important to preserve order here.
 		const root = dom.append(container, $('.extension'));
 		const firstRow = dom.append(root, $('.row'));
 		const secondRow = dom.append(root, $('.row'));
 		const published = dom.append(firstRow, $('.published'));
-		const since = dom.append(published, $('span.since'));
+		const displayName = new HighlightedLabel(dom.append(firstRow, $('span.name')));
+		const installs = dom.append(firstRow, $('span.installs'));
+		const version = dom.append(published, $('span.version'));
 		const author = dom.append(published, $('span.author'));
 
 		return {
 			root,
 			author,
-			since,
-			displayName: new HighlightedLabel(dom.append(firstRow, $('span.name'))),
-			version: dom.append(firstRow, $('span.version')),
+			displayName,
+			version,
+			installs,
 			actionbar: new ActionBar(dom.append(secondRow, $('.actions'))),
 			description: new HighlightedLabel(dom.append(secondRow, $('span.description'))),
 			disposables: []
@@ -194,6 +198,7 @@ class Renderer implements IRenderer<IExtensionEntry> {
 		const extension = entry.extension;
 		const date = extension.galleryInformation ? extension.galleryInformation.date : null;
 		const publisher = extension.galleryInformation ? extension.galleryInformation.publisherDisplayName : extension.publisher;
+		const installs = extension.installs;
 		const actionOptions = { icon: true, label: false };
 
 		const updateActions = () => {
@@ -236,7 +241,7 @@ class Renderer implements IRenderer<IExtensionEntry> {
 		data.displayName.set(extension.displayName, entry.highlights.displayName);
 		data.displayName.element.title = extension.name;
 		data.version.textContent = extension.version;
-		data.since.textContent = date ? since(new Date(date)) : '';
+		data.installs.textContent = String(installs);
 		data.author.textContent = publisher;
 		data.description.set(extension.description, entry.highlights.description);
 		data.description.element.title = extension.description;

src/vs/workbench/parts/extensions/electron-browser/media/extensions.css

@@ -28,12 +28,12 @@
 	opacity: 0.6;
 }
 
-.quick-open-widget .extension .version {
+.quick-open-widget .extension .installs {
 	font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
 	font-size: smaller;
 }
 
-.quick-open-widget .extension .version {
+.quick-open-widget .extension .installs {
 	padding-left: 6px;
 	opacity: 0.7;
 }
@@ -44,7 +44,7 @@
 	font-size: smaller;
 }
 
-.quick-open-widget .extension .published > .since {
+.quick-open-widget .extension .published > .version {
 	opacity: 0.6;
 	margin-right: 0.5em;
 }

src/vs/workbench/parts/extensions/node/extensionsService.ts

@@ -64,7 +64,8 @@ function createExtension(manifest: IExtensionManifest, galleryInformation?: IGal
 		displayName: manifest.displayName || manifest.name,
 		publisher: manifest.publisher,
 		version: manifest.version,
-		description: manifest.description || ''
+		description: manifest.description || '',
+		installs: 0
 	};
 
 	if (galleryInformation) {

src/vs/workbench/parts/extensions/node/vsoGalleryService.ts

@@ -33,6 +33,12 @@ export interface IGalleryExtension {
 	publisher: { displayName: string, publisherId: string, publisherName: string; };
 	versions: IGalleryExtensionVersion[];
 	galleryApiUrl: string;
+	statistics: IGalleryExtensionStatistic[];
+}
+
+export interface IGalleryExtensionStatistic {
+	statisticName: string;
+	value: number;
 }
 
 export class GalleryService implements IGalleryService {
@@ -53,10 +59,32 @@ export class GalleryService implements IGalleryService {
 		return `${ this.extensionsGalleryUrl }${ path }`;
 	}
 
+	/**
+	 * Extracts install count statistic.
+	 */
+	private extractInstalls(statistics: IGalleryExtensionStatistic[]): number {
+		// Sometimes there are no statistics.
+		if (!statistics) {
+			return 0;
+		}
+		var result = 0;
+		statistics.forEach(stat => {
+			if (stat.statisticName === 'install') {
+				result = stat.value;
+			}
+		})
+		return result;
+	}
+
 	public isEnabled(): boolean {
 		return !!this.extensionsGalleryUrl;
 	}
 
+	/**
+	 * Queries VS Code Extension marketplace for extensions.
+	 *
+	 * Sorts by install count.
+	 */
 	public query(): TPromise<IExtension[]> {
 		if (!this.extensionsGalleryUrl) {
 			return TPromise.wrapError(new Error('No extension gallery service configured.'));
@@ -69,7 +97,7 @@ export class GalleryService implements IGalleryService {
 					value: 'vscode'
 				}]
 			}],
-			flags: 0x1 | 0x4 | 0x80
+			flags: 0x1 | 0x4 | 0x80 | 0x100
 		});
 
 		const request = {
@@ -92,13 +120,14 @@ export class GalleryService implements IGalleryService {
 					publisher: extension.publisher.publisherName,
 					version: extension.versions[0].version,
 					description: extension.shortDescription || '',
+					installs: this.extractInstalls(extension.statistics),
 					galleryInformation: {
 						galleryApiUrl: this.extensionsGalleryUrl,
 						id: extension.extensionId,
 						downloadUrl: `${ extension.versions[0].assetUri }/Microsoft.VisualStudio.Services.VSIXPackage?install=true`,
 						publisherId: extension.publisher.publisherId,
 						publisherDisplayName: extension.publisher.displayName,
-						date: extension.versions[0].lastUpdated
+						date: extension.versions[0].lastUpdated,
 					}
 				}));
 			});