refactor getReadme()

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

@@ -242,15 +242,9 @@ export class ExtensionEditor extends BaseEditor {
 	}
 
 	private openReadme(extension: IExtension) {
-		if (!extension.readmeUrl) {
-			const p = append(this.content, $('p'));
-			p.textContent = localize('noReadme', "No README available.");
-			return;
-		}
-
 		addClass(this.content, 'loading');
 
-		const promise = this.extensionsWorkbenchService.getReadmeContents(extension)
+		const promise = extension.getReadme()
 			.then(marked.parse)
 			.then<void>(body => {
 				const webview = new WebView(
@@ -265,6 +259,10 @@ export class ExtensionEditor extends BaseEditor {
 				const themeListener = this.themeService.onDidColorThemeChange(themeId => webview.style(themeId));
 				this.contentDisposables.push(webview, linkListener, themeListener);
 			})
+			.then(null, () => {
+				const p = append(this.content, $('p'));
+				p.textContent = localize('noReadme', "No README available.");
+			})
 			.then(null, () => null)
 			.then(() => removeClass(this.content, 'loading'));
 

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

@@ -8,7 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import Event from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IPager } from 'vs/base/common/paging';
-import { IQueryOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IQueryOptions, IExtensionManifest } from 'vs/platform/extensionManagement/common/extensionManagement';
 
 export const VIEWLET_ID = 'workbench.view.extensions';
 
@@ -32,7 +32,6 @@ export interface IExtension {
 	version: string;
 	latestVersion: string;
 	description: string;
-	readmeUrl: string;
 	iconUrl: string;
 	licenseUrl: string;
 	installCount: number;
@@ -40,6 +39,8 @@ export interface IExtension {
 	ratingCount: number;
 	outdated: boolean;
 	telemetryData: any;
+	getManifest(): TPromise<IExtensionManifest>;
+	getReadme(): TPromise<string>;
 }
 
 export const SERVICE_ID = 'extensionsWorkbenchService';
@@ -56,5 +57,4 @@ export interface IExtensionsWorkbenchService {
 	canInstall(extension: IExtension): boolean;
 	install(extension: IExtension): TPromise<void>;
 	uninstall(extension: IExtension): TPromise<void>;
-	getReadmeContents(extension: IExtension): TPromise<string>;
 }
\ No newline at end of file

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

@@ -14,7 +14,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IPager, mapPager, singlePagePager } from 'vs/base/common/paging';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, ILocalExtension, IGalleryExtension, IQueryOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, ILocalExtension, IGalleryExtension, IQueryOptions, IExtensionManifest } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData } from 'vs/platform/extensionManagement/common/extensionTelemetry';
 import * as semver from 'semver';
 import * as path from 'path';
@@ -32,6 +32,7 @@ class Extension implements IExtension {
 	public needsRestart = false;
 
 	constructor(
+		private galleryService: IExtensionGalleryService,
 		private stateProvider: IExtensionStateProvider,
 		public local: ILocalExtension,
 		public gallery: IGalleryExtension = null
@@ -126,6 +127,32 @@ class Extension implements IExtension {
 			return getLocalExtensionTelemetryData(local);
 		}
 	}
+
+	getManifest(): TPromise<IExtensionManifest> {
+		if (this.local) {
+			return TPromise.as(this.local.manifest);
+		}
+
+		return this.galleryService.getAsset(this.gallery.assets.manifest)
+			.then(asText)
+			.then(raw => JSON.parse(raw) as IExtensionManifest);
+	}
+
+	getReadme(): TPromise<string> {
+		const readmeUrl = this.local && this.local.readmeUrl ? this.local.readmeUrl : this.gallery && this.gallery.assets.readme;
+
+		if (!readmeUrl) {
+			return TPromise.wrapError('not available');
+		}
+
+		const uri = URI.parse(readmeUrl);
+
+		if (uri.scheme === 'file') {
+			return readFile(uri.fsPath, 'utf8');
+		}
+
+		return this.galleryService.getAsset(readmeUrl).then(asText);
+	}
 }
 
 function stripVersion(id: string): string {
@@ -201,7 +228,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 			const installedById = index(this.installed, e => e.local.id);
 
 			this.installed = result.map(local => {
-				const extension = installedById[local.id] || new Extension(this.stateProvider, local);
+				const extension = installedById[local.id] || new Extension(this.galleryService, this.stateProvider, local);
 				extension.local = local;
 				return extension;
 			});
@@ -242,7 +269,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 			return installed;
 		}
 
-		return new Extension(this.stateProvider, null, gallery);
+		return new Extension(this.galleryService, this.stateProvider, null, gallery);
 	}
 
 	private syncWithGallery(immediate = false): void {
@@ -310,7 +337,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 		let extension = this.installed.filter(e => (e.local.metadata && e.local.metadata.id) === gallery.id)[0];
 
 		if (!extension) {
-			extension = new Extension(this.stateProvider, null, gallery);
+			extension = new Extension(this.galleryService, this.stateProvider, null, gallery);
 		}
 
 		extension.gallery = gallery;
@@ -404,21 +431,6 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 		this.telemetryService.publicLog(eventName, assign(data, { success, duration }));
 	}
 
-	getReadmeContents(extension: IExtension): TPromise<string> {
-		if (!extension.readmeUrl) {
-			return TPromise.as('');
-		}
-
-		const uri = URI.parse(extension.readmeUrl);
-
-		if (uri.scheme === 'file') {
-			return readFile(uri.fsPath, 'utf8');
-		}
-
-		return this.galleryService.getAsset(extension.readmeUrl)
-			.then(asText);
-	}
-
 	dispose(): void {
 		this.disposables = dispose(this.disposables);
 	}