move readme and changelog props to IExtension

sandy081 · sandy081 · commit eefe7b942fa2 · 2020-06-18T11:31:52.000+02:00
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -91,17 +91,11 @@ export interface IGalleryMetadata {
 }
 
 export interface ILocalExtension extends IExtension {
-	readonly manifest: IExtensionManifest;
 	isMachineScoped: boolean;
 	publisherId: string | null;
 	publisherDisplayName: string | null;
-	readmeUrl: URI | null;
-	changelogUrl: URI | null;
 }
 
-export const IExtensionManagementService = createDecorator<IExtensionManagementService>('extensionManagementService');
-export const IExtensionGalleryService = createDecorator<IExtensionGalleryService>('extensionGalleryService');
-
 export const enum SortBy {
 	NoneOrRelevance = 0,
 	LastUpdatedDate = 1,
@@ -148,6 +142,7 @@ export interface ITranslation {
 	contents: { [key: string]: {} };
 }
 
+export const IExtensionGalleryService = createDecorator<IExtensionGalleryService>('extensionGalleryService');
 export interface IExtensionGalleryService {
 	readonly _serviceBrand: undefined;
 	isEnabled(): boolean;
@@ -195,6 +190,7 @@ export class ExtensionManagementError extends Error {
 	}
 }
 
+export const IExtensionManagementService = createDecorator<IExtensionManagementService>('extensionManagementService');
 export interface IExtensionManagementService {
 	readonly _serviceBrand: undefined;
 
diff --git a/src/vs/platform/extensionManagement/node/extensionsScanner.ts b/src/vs/platform/extensionManagement/node/extensionsScanner.ts
@@ -228,9 +228,9 @@ export class ExtensionsScanner extends Disposable {
 			const children = await pfs.readdir(extensionPath);
 			const { manifest, metadata } = await this.readManifest(extensionPath);
 			const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];
-			const readmeUrl = readme ? URI.file(path.join(extensionPath, readme)) : null;
+			const readmeUrl = readme ? URI.file(path.join(extensionPath, readme)) : undefined;
 			const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
-			const changelogUrl = changelog ? URI.file(path.join(extensionPath, changelog)) : null;
+			const changelogUrl = changelog ? URI.file(path.join(extensionPath, changelog)) : undefined;
 			const identifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) };
 			const local = <ILocalExtension>{ type, identifier, manifest, location: URI.file(extensionPath), readmeUrl, changelogUrl, publisherDisplayName: null, publisherId: null, isMachineScoped: false };
 			if (metadata) {
diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
@@ -175,6 +175,8 @@ export interface IExtension {
 	readonly identifier: IExtensionIdentifier;
 	readonly manifest: IExtensionManifest;
 	readonly location: URI;
+	readonly readmeUrl?: URI;
+	readonly changelogUrl?: URI;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -91,17 +91,11 @@ export interface IGalleryMetadata {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`export interface ILocalExtension extends IExtension {`
`94`		`- readonly manifest: IExtensionManifest;`
`95`	`94`	`isMachineScoped: boolean;`
`96`	`95`	`publisherId: string \| null;`
`97`	`96`	`publisherDisplayName: string \| null;`
`98`		`- readmeUrl: URI \| null;`
`99`		`- changelogUrl: URI \| null;`
`100`	`97`	`}`
`101`	`98`
`102`		`-export const IExtensionManagementService = createDecorator<IExtensionManagementService>('extensionManagementService');`
`103`		`-export const IExtensionGalleryService = createDecorator<IExtensionGalleryService>('extensionGalleryService');`
`104`		`-`
`105`	`99`	`export const enum SortBy {`
`106`	`100`	`NoneOrRelevance = 0,`
`107`	`101`	`LastUpdatedDate = 1,`
`@@ -148,6 +142,7 @@ export interface ITranslation {`
`148`	`142`	`contents: { [key: string]: {} };`
`149`	`143`	`}`
`150`	`144`
	`145`	`+export const IExtensionGalleryService = createDecorator<IExtensionGalleryService>('extensionGalleryService');`
`151`	`146`	`export interface IExtensionGalleryService {`
`152`	`147`	`readonly _serviceBrand: undefined;`
`153`	`148`	`isEnabled(): boolean;`
`@@ -195,6 +190,7 @@ export class ExtensionManagementError extends Error {`
`195`	`190`	`}`
`196`	`191`	`}`
`197`	`192`
	`193`	`+export const IExtensionManagementService = createDecorator<IExtensionManagementService>('extensionManagementService');`
`198`	`194`	`export interface IExtensionManagementService {`
`199`	`195`	`readonly _serviceBrand: undefined;`
`200`	`196`
Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,8 @@ export interface IExtension {`
`175`	`175`	`readonly identifier: IExtensionIdentifier;`
`176`	`176`	`readonly manifest: IExtensionManifest;`
`177`	`177`	`readonly location: URI;`
	`178`	`+ readonly readmeUrl?: URI;`
	`179`	`+ readonly changelogUrl?: URI;`
`178`	`180`	`}`
`179`	`181`
`180`	`182`	`/**`