add publisherDisplayName to IExtensionDescription (microsoft#209968)

Author: sandy081

src/vs/platform/extensionManagement/common/extensionManagement.ts

@@ -255,7 +255,6 @@ export interface ILocalExtension extends IExtension {
 	isMachineScoped: boolean;
 	isApplicationScoped: boolean;
 	publisherId: string | null;
-	publisherDisplayName: string | null;
 	installedTimestamp?: number;
 	isPreReleaseVersion: boolean;
 	hasPreReleaseVersion: boolean;

src/vs/platform/extensionManagement/common/extensionsScannerService.ts

@@ -46,6 +46,7 @@ interface IRelaxedScannedExtension {
 	manifest: IRelaxedExtensionManifest;
 	location: URI;
 	targetPlatform: TargetPlatform;
+	publisherDisplayName?: string;
 	metadata: Metadata | undefined;
 	isValid: boolean;
 	validations: readonly [Severity, string][];
@@ -652,13 +653,14 @@ class ExtensionsScanner extends Disposable {
 				const type = metadata?.isSystem ? ExtensionType.System : input.type;
 				const isBuiltin = type === ExtensionType.System || !!metadata?.isBuiltin;
 				manifest = await this.translateManifest(input.location, manifest, ExtensionScannerInput.createNlsConfiguration(input));
-				const extension = {
+				const extension: IRelaxedScannedExtension = {
 					type,
 					identifier,
 					manifest,
 					location: input.location,
 					isBuiltin,
 					targetPlatform: metadata?.targetPlatform ?? TargetPlatform.UNDEFINED,
+					publisherDisplayName: metadata?.publisherDisplayName,
 					metadata,
 					isValid: true,
 					validations: []
@@ -979,6 +981,7 @@ export function toExtensionDescription(extension: IScannedExtension, isUnderDeve
 		extensionLocation: extension.location,
 		uuid: extension.identifier.uuid,
 		targetPlatform: extension.targetPlatform,
+		publisherDisplayName: extension.publisherDisplayName,
 		...extension.manifest,
 	};
 }

src/vs/platform/extensionManagement/node/extensionManagementService.ts

@@ -705,7 +705,7 @@ export class ExtensionsScanner extends Disposable {
 			isValid: extension.isValid,
 			readmeUrl,
 			changelogUrl,
-			publisherDisplayName: extension.metadata?.publisherDisplayName || null,
+			publisherDisplayName: extension.metadata?.publisherDisplayName,
 			publisherId: extension.metadata?.publisherId || null,
 			isApplicationScoped: !!extension.metadata?.isApplicationScoped,
 			isMachineScoped: !!extension.metadata?.isMachineScoped,

src/vs/platform/extensions/common/extensions.ts

@@ -324,6 +324,7 @@ export interface IExtension {
 	readonly manifest: IExtensionManifest;
 	readonly location: URI;
 	readonly targetPlatform: TargetPlatform;
+	readonly publisherDisplayName?: string;
 	readonly readmeUrl?: URI;
 	readonly changelogUrl?: URI;
 	readonly isValid: boolean;
@@ -460,6 +461,7 @@ export interface IRelaxedExtensionDescription extends IRelaxedExtensionManifest
 	id?: string;
 	identifier: ExtensionIdentifier;
 	uuid?: string;
+	publisherDisplayName?: string;
 	targetPlatform: TargetPlatform;
 	isBuiltin: boolean;
 	isUserBuiltin: boolean;

src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts

@@ -59,6 +59,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/uti
 import { IUpdateService, State } from 'vs/platform/update/common/update';
 import { IFileService } from 'vs/platform/files/common/files';
 import { FileService } from 'vs/platform/files/common/fileService';
+import { Mutable } from 'vs/base/common/types';
 
 let instantiationService: TestInstantiationService;
 let installEvent: Emitter<InstallExtensionEvent>,
@@ -100,7 +101,7 @@ function setupTest(disposables: Pick<DisposableStore, 'add'>) {
 		async getInstalled() { return []; },
 		async getInstalledWorkspaceExtensions() { return []; },
 		async getExtensionsControlManifest() { return { malicious: [], deprecated: {}, search: [] }; },
-		async updateMetadata(local: ILocalExtension, metadata: Partial<Metadata>) {
+		async updateMetadata(local: Mutable<ILocalExtension>, metadata: Partial<Metadata>) {
 			local.identifier.uuid = metadata.id;
 			local.publisherDisplayName = metadata.publisherDisplayName!;
 			local.publisherId = metadata.publisherId!;
@@ -2637,7 +2638,7 @@ function createExtensionManagementService(installed: ILocalExtension[] = []): IP
 		getInstalled: () => Promise.resolve<ILocalExtension[]>(installed),
 		canInstall: async (extension: IGalleryExtension) => { return true; },
 		installFromGallery: (extension: IGalleryExtension) => Promise.reject(new Error('not supported')),
-		updateMetadata: async (local: ILocalExtension, metadata: Partial<Metadata>) => {
+		updateMetadata: async (local: Mutable<ILocalExtension>, metadata: Partial<Metadata>) => {
 			local.identifier.uuid = metadata.id;
 			local.publisherDisplayName = metadata.publisherDisplayName!;
 			local.publisherId = metadata.publisherId!;

src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts

@@ -100,7 +100,7 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 			async getInstalled() { return []; },
 			async getInstalledWorkspaceExtensions() { return []; },
 			async getExtensionsControlManifest() { return { malicious: [], deprecated: {}, search: [] }; },
-			async updateMetadata(local: ILocalExtension, metadata: Partial<Metadata>) {
+			async updateMetadata(local: Mutable<ILocalExtension>, metadata: Partial<Metadata>) {
 				local.identifier.uuid = metadata.id;
 				local.publisherDisplayName = metadata.publisherDisplayName!;
 				local.publisherId = metadata.publisherId!;
@@ -1740,7 +1740,7 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 			onDidUpdateExtensionMetadata: Event.None,
 			getInstalled: () => Promise.resolve<ILocalExtension[]>(installed),
 			installFromGallery: (extension: IGalleryExtension) => Promise.reject(new Error('not supported')),
-			updateMetadata: async (local: ILocalExtension, metadata: Partial<Metadata>) => {
+			updateMetadata: async (local: Mutable<ILocalExtension>, metadata: Partial<Metadata>) => {
 				local.identifier.uuid = metadata.id;
 				local.publisherDisplayName = metadata.publisherDisplayName!;
 				local.publisherId = metadata.publisherId!;

src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts

@@ -1020,7 +1020,7 @@ class WorkspaceExtensionsManagementService extends Disposable {
 			isValid,
 			readmeUrl,
 			changelogUrl,
-			publisherDisplayName: extension.metadata?.publisherDisplayName || null,
+			publisherDisplayName: extension.metadata?.publisherDisplayName,
 			publisherId: extension.metadata?.publisherId || null,
 			isApplicationScoped: !!extension.metadata?.isApplicationScoped,
 			isMachineScoped: !!extension.metadata?.isMachineScoped,

src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts

@@ -227,7 +227,7 @@ function toLocalExtension(extension: IExtension): ILocalExtension {
 		isMachineScoped: !!metadata.isMachineScoped,
 		isApplicationScoped: !!metadata.isApplicationScoped,
 		publisherId: metadata.publisherId || null,
-		publisherDisplayName: metadata.publisherDisplayName || null,
+		publisherDisplayName: metadata.publisherDisplayName,
 		installedTimestamp: metadata.installedTimestamp,
 		isPreReleaseVersion: !!metadata.isPreReleaseVersion,
 		hasPreReleaseVersion: !!metadata.hasPreReleaseVersion,

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

@@ -564,7 +564,8 @@ export function toExtensionDescription(extension: IExtension, isUnderDevelopment
 		extensionLocation: extension.location,
 		...extension.manifest,
 		uuid: extension.identifier.uuid,
-		targetPlatform: extension.targetPlatform
+		targetPlatform: extension.targetPlatform,
+		publisherDisplayName: extension.publisherDisplayName,
 	};
 }