render private extension (microsoft#243503)

* render private extension

* fix all repsitory signed flag

Author: sandy081

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

@@ -48,8 +48,6 @@ const enum ExtensionGalleryResourceType {
 	PublisherViewUri = 'PublisherViewUriTemplate',
 	ExtensionDetailsViewUri = 'ExtensionDetailsViewUriTemplate',
 	ExtensionRatingViewUri = 'ExtensionRatingViewUriTemplate',
-	WebLanguagePackService = 'WebLanguagePackService',
-	ExtensionUriTemplate = 'ExtensionUriTemplate',
 }
 
 const enum Flag {
@@ -187,6 +185,7 @@ const PropertyType = {
 	SponsorLink: 'Microsoft.VisualStudio.Code.SponsorLink',
 	SupportLink: 'Microsoft.VisualStudio.Services.Links.Support',
 	ExecutesCode: 'Microsoft.VisualStudio.Code.ExecutesCode',
+	Private: 'PrivateMarketplace',
 };
 
 interface ICriterium {
@@ -402,6 +401,11 @@ function isPreReleaseVersion(version: IRawGalleryExtensionVersion): boolean {
 	return values.length > 0 && values[0].value === 'true';
 }
 
+function isPrivateExtension(version: IRawGalleryExtensionVersion): boolean {
+	const values = version.properties ? version.properties.filter(p => p.key === PropertyType.Private) : [];
+	return values.length > 0 && values[0].value === 'true';
+}
+
 function executesCode(version: IRawGalleryExtensionVersion): boolean | undefined {
 	const values = version.properties ? version.properties.filter(p => p.key === PropertyType.ExecutesCode) : [];
 	return values.length > 0 ? values[0].value === 'true' : undefined;
@@ -557,6 +561,7 @@ function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGaller
 		},
 		hasPreReleaseVersion: isPreReleaseVersion(latestVersion),
 		hasReleaseVersion: true,
+		private: isPrivateExtension(latestVersion),
 		preview: getIsPreview(galleryExtension.flags),
 		isSigned: !!assets.signature,
 		queryContext,
@@ -646,7 +651,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 				sortBy,
 				filters
 			},
-			allRepositorySigned: !extensionGalleryManifest.capabilities.signing?.allRepositorySigned,
+			allRepositorySigned: !!extensionGalleryManifest.capabilities.signing?.allRepositorySigned,
 		};
 	}
 
@@ -1940,20 +1945,6 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			});
 		}
 
-		if (extensionsGallery.resourceUrlTemplate) {
-			resources.push({
-				id: extensionsGallery.resourceUrlTemplate,
-				type: ExtensionGalleryResourceType.ExtensionUriTemplate
-			});
-		}
-
-		if (extensionsGallery.nlsBaseUrl) {
-			resources.push({
-				id: extensionsGallery.nlsBaseUrl,
-				type: ExtensionGalleryResourceType.WebLanguagePackService
-			});
-		}
-
 		const filtering = [
 			{
 				name: FilterType.Tag,

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

@@ -229,6 +229,7 @@ export interface IGalleryExtension {
 	releaseDate: number;
 	lastUpdated: number;
 	preview: boolean;
+	private: boolean;
 	hasPreReleaseVersion: boolean;
 	hasReleaseVersion: boolean;
 	isSigned: boolean;
@@ -247,6 +248,7 @@ export type InstallSource = 'gallery' | 'vsix' | 'resource';
 export interface IGalleryMetadata {
 	id: string;
 	publisherId: string;
+	private: boolean;
 	publisherDisplayName: string;
 	isPreReleaseVersion: boolean;
 	targetPlatform?: TargetPlatform;
@@ -274,6 +276,7 @@ export interface ILocalExtension extends IExtension {
 	installedTimestamp?: number;
 	isPreReleaseVersion: boolean;
 	hasPreReleaseVersion: boolean;
+	private: boolean;
 	preRelease: boolean;
 	updated: boolean;
 	pinned: boolean;

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

@@ -869,6 +869,7 @@ export class ExtensionsScanner extends Disposable {
 			installedTimestamp: extension.metadata?.installedTimestamp,
 			updated: !!extension.metadata?.updated,
 			pinned: !!extension.metadata?.pinned,
+			private: !!extension.metadata?.private,
 			isWorkspaceScoped: false,
 			source: extension.metadata?.source ?? (extension.identifier.uuid ? 'gallery' : 'vsix'),
 			size: extension.metadata?.size ?? 0,
@@ -1041,6 +1042,7 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			metadata.publisherDisplayName = this.source.publisherDisplayName;
 			metadata.targetPlatform = this.source.properties.targetPlatform;
 			metadata.updated = !!existingExtension;
+			metadata.private = this.source.private;
 			metadata.isPreReleaseVersion = this.source.properties.isPreReleaseVersion;
 			metadata.hasPreReleaseVersion = existingExtension?.hasPreReleaseVersion || this.source.properties.isPreReleaseVersion;
 			metadata.preRelease = isBoolean(this.options.preRelease)

src/vs/workbench/contrib/extensions/browser/extensionEditor.ts

@@ -42,7 +42,6 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { defaultCheckboxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { buttonForeground, buttonHoverBackground, editorBackground, textLinkActiveForeground, textLinkForeground } from '../../../../platform/theme/common/colorRegistry.js';
 import { IColorTheme, ICssStyleCollector, IThemeService, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
 import { IEditorOpenContext } from '../../../common/editor.js';
 import { ExtensionFeaturesTab } from './extensionFeaturesTab.js';
@@ -73,18 +72,15 @@ import {
 } from './extensionsActions.js';
 import { Delegate } from './extensionsList.js';
 import { ExtensionData, ExtensionsGridView, ExtensionsTree, getExtensions } from './extensionsViewer.js';
-import { ExtensionRecommendationWidget, ExtensionStatusWidget, ExtensionWidget, InstallCountWidget, RatingsWidget, RemoteBadgeWidget, SponsorWidget, VerifiedPublisherWidget, onClick } from './extensionsWidgets.js';
+import { ExtensionRecommendationWidget, ExtensionStatusWidget, ExtensionWidget, InstallCountWidget, RatingsWidget, RemoteBadgeWidget, SponsorWidget, PublisherWidget, onClick, ExtensionKindIndicatorWidget } from './extensionsWidgets.js';
 import { ExtensionContainers, ExtensionEditorTab, ExtensionState, IExtension, IExtensionContainer, IExtensionsWorkbenchService } from '../common/extensions.js';
 import { ExtensionsInput, IExtensionEditorOptions } from '../common/extensionsInput.js';
-import { IExplorerService } from '../../files/browser/files.js';
 import { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument } from '../../markdown/browser/markdownDocumentRenderer.js';
 import { IWebview, IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '../../webview/browser/webview.js';
 import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { VIEW_ID as EXPLORER_VIEW_ID } from '../../files/common/files.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { ByteSize, IFileService } from '../../../../platform/files/common/files.js';
@@ -161,11 +157,6 @@ interface IExtensionEditorTemplate {
 	name: HTMLElement;
 	preview: HTMLElement;
 	builtin: HTMLElement;
-	publisher: HTMLElement;
-	publisherDisplayName: HTMLElement;
-	resource: HTMLElement;
-	installCount: HTMLElement;
-	rating: HTMLElement;
 	description: HTMLElement;
 	actionsAndStatusContainer: HTMLElement;
 	extensionActionBar: ActionBar;
@@ -257,10 +248,6 @@ export class ExtensionEditor extends EditorPane {
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@IExplorerService private readonly explorerService: IExplorerService,
-		@IViewsService private readonly viewsService: IViewsService,
-		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IHoverService private readonly hoverService: IHoverService,
 	) {
 		super(ExtensionEditor.ID, group, telemetryService, themeService, storageService);
@@ -302,29 +289,33 @@ export class ExtensionEditor extends EditorPane {
 		builtin.textContent = localize('builtin', "Built-in");
 
 		const subtitle = append(details, $('.subtitle'));
-		const publisher = append(append(subtitle, $('.subtitle-entry')), $('.publisher.clickable', { tabIndex: 0 }));
-		publisher.setAttribute('role', 'button');
-		const publisherDisplayName = append(publisher, $('.publisher-name'));
-		const verifiedPublisherWidget = this.instantiationService.createInstance(VerifiedPublisherWidget, append(publisher, $('.verified-publisher')), false);
+		const subTitleEntryContainers: HTMLElement[] = [];
+
+		const publisherContainer = append(subtitle, $('.subtitle-entry'));
+		subTitleEntryContainers.push(publisherContainer);
+		const publisherWidget = this.instantiationService.createInstance(PublisherWidget, publisherContainer, false);
 
-		const resource = append(append(subtitle, $('.subtitle-entry.resource')), $('', { tabIndex: 0 }));
-		resource.setAttribute('role', 'button');
+		const extensionKindContainer = append(subtitle, $('.subtitle-entry'));
+		subTitleEntryContainers.push(extensionKindContainer);
+		const extensionKindWidget = this.instantiationService.createInstance(ExtensionKindIndicatorWidget, extensionKindContainer, false);
 
-		const installCount = append(append(subtitle, $('.subtitle-entry')), $('span.install', { tabIndex: 0 }));
-		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), installCount, localize('install count', "Install count")));
-		const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCount, false);
+		const installCountContainer = append(subtitle, $('.subtitle-entry'));
+		subTitleEntryContainers.push(installCountContainer);
+		const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCountContainer, false);
 
-		const rating = append(append(subtitle, $('.subtitle-entry')), $('span.rating.clickable', { tabIndex: 0 }));
-		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), rating, localize('rating', "Rating")));
-		rating.setAttribute('role', 'link'); // #132645
-		const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, rating, false);
+		const ratingsContainer = append(subtitle, $('.subtitle-entry'));
+		subTitleEntryContainers.push(ratingsContainer);
+		const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, ratingsContainer, false);
 
-		const sponsorWidget = this.instantiationService.createInstance(SponsorWidget, append(subtitle, $('.subtitle-entry')));
+		const sponsorContainer = append(subtitle, $('.subtitle-entry'));
+		subTitleEntryContainers.push(sponsorContainer);
+		const sponsorWidget = this.instantiationService.createInstance(SponsorWidget, sponsorContainer);
 
 		const widgets: ExtensionWidget[] = [
 			remoteBadge,
 			versionWidget,
-			verifiedPublisherWidget,
+			publisherWidget,
+			extensionKindWidget,
 			installCountWidget,
 			ratingsWidget,
 			sponsorWidget,
@@ -440,18 +431,23 @@ export class ExtensionEditor extends EditorPane {
 			header,
 			icon,
 			iconContainer,
-			installCount,
 			name,
 			navbar,
 			preview,
-			publisher,
-			publisherDisplayName,
-			resource,
-			rating,
 			actionsAndStatusContainer,
 			extensionActionBar,
 			set extension(extension: IExtension) {
 				extensionContainers.extension = extension;
+				let lastNonEmptySubtitleEntryContainer;
+				for (const subTitleEntryElement of subTitleEntryContainers) {
+					subTitleEntryElement.classList.remove('last-non-empty');
+					if (subTitleEntryElement.children.length > 0) {
+						lastNonEmptySubtitleEntryContainer = subTitleEntryElement;
+					}
+				}
+				if (lastNonEmptySubtitleEntryContainer) {
+					lastNonEmptySubtitleEntryContainer.classList.add('last-non-empty');
+				}
 			},
 			set gallery(gallery: IGalleryExtension | null) {
 				versionWidget.gallery = gallery;
@@ -559,41 +555,8 @@ export class ExtensionEditor extends EditorPane {
 
 		template.description.textContent = extension.description;
 
-		// subtitle
-		template.publisher.classList.toggle('clickable', !!extension.url);
-		template.publisherDisplayName.textContent = extension.publisherDisplayName;
-		template.publisher.parentElement?.classList.toggle('hide', !!extension.resourceExtension || extension.local?.source === 'resource');
-		this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.publisher, localize('publisher', "Publisher ({0})", extension.publisher)));
-
-		const location = extension.resourceExtension?.location ?? (extension.local?.source === 'resource' ? extension.local?.location : undefined);
-		template.resource.parentElement?.classList.toggle('hide', !location);
-		if (location) {
-			const workspaceFolder = this.contextService.getWorkspaceFolder(location);
-			if (workspaceFolder && extension.isWorkspaceScoped) {
-				template.resource.parentElement?.classList.add('clickable');
-				this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.resource, this.uriIdentityService.extUri.relativePath(workspaceFolder.uri, location)));
-				template.resource.textContent = localize('workspace extension', "Workspace Extension");
-				this.transientDisposables.add(onClick(template.resource, () => {
-					this.viewsService.openView(EXPLORER_VIEW_ID, true).then(() => this.explorerService.select(location, true));
-				}));
-			} else {
-				template.resource.parentElement?.classList.remove('clickable');
-				this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.resource, location.path));
-				template.resource.textContent = localize('local extension', "Local Extension");
-			}
-		}
-
-		template.installCount.parentElement?.classList.toggle('hide', !extension.url);
-		template.rating.parentElement?.classList.toggle('hide', !extension.url);
-		template.rating.classList.toggle('clickable', !!extension.url);
-
 		if (extension.url) {
 			this.transientDisposables.add(onClick(template.name, () => this.openerService.open(URI.parse(extension.url!))));
-			this.transientDisposables.add(onClick(template.publisher, () => this.extensionsWorkbenchService.openSearch(`publisher:"${extension.publisherDisplayName}"`)));
-		}
-
-		if (extension.ratingUrl) {
-			this.transientDisposables.add(onClick(template.rating, () => this.openerService.open(URI.parse(extension.ratingUrl!))));
 		}
 
 		const manifest = await this.extensionManifest.get().promise;

src/vs/workbench/contrib/extensions/browser/extensionsIcons.ts

@@ -23,6 +23,7 @@ export const syncEnabledIcon = registerIcon('extensions-sync-enabled', Codicon.s
 export const syncIgnoredIcon = registerIcon('extensions-sync-ignored', Codicon.syncIgnored, localize('syncIgnoredIcon', 'Icon to indicate that an extension is ignored when syncing.'));
 export const remoteIcon = registerIcon('extensions-remote', Codicon.remote, localize('remoteIcon', 'Icon to indicate that an extension is remote in the extensions view and editor.'));
 export const installCountIcon = registerIcon('extensions-install-count', Codicon.cloudDownload, localize('installCountIcon', 'Icon shown along with the install count in the extensions view and editor.'));
+export const privateExtensionIcon = registerIcon('extensions-private', Codicon.lock, localize('lockIcon', 'Icon shown for private extensions in the extensions view and editor.'));
 export const ratingIcon = registerIcon('extensions-rating', Codicon.star, localize('ratingIcon', 'Icon shown along with the rating in the extensions view and editor.'));
 export const preReleaseIcon = registerIcon('extensions-pre-release', Codicon.versions, localize('preReleaseIcon', 'Icon shown for extensions having pre-release versions in extensions view and editor.'));
 export const sponsorIcon = registerIcon('extensions-sponsor', Codicon.heartFilled, localize('sponsorIcon', 'Icon used for sponsoring extensions in the extensions view and editor.'));