Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extension sponsoring #150703

Merged
merged 7 commits into from
May 30, 2022
Merged

Extension sponsoring #150703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
449fb5b
- publisher sponship link from extension
sandy081 May 27, 2022
2e38d32
show sponsor button in additional details
sandy081 May 27, 2022
a585277
remove sponsor action from header
sandy081 May 27, 2022
7925014
rename
sandy081 May 28, 2022
e188282
add sponsorLink property to package.json schema
sandy081 May 30, 2022
a4ecd31
change property name
sandy081 May 30, 2022
d514118
set tooltip
sandy081 May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/vs/base/common/product.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export interface IProductConfiguration {
readonly extensionsGallery?: {
readonly serviceUrl: string;
readonly itemUrl: string;
readonly publisherUrl: string;
readonly resourceUrlTemplate: string;
readonly controlUrl: string;
readonly recommendationsUrl: string;
Expand Down
8 changes: 7 additions & 1 deletion src/vs/platform/extensionManagement/common/extensionGalleryService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ const PropertyType = {
Engine: 'Microsoft.VisualStudio.Code.Engine',
PreRelease: 'Microsoft.VisualStudio.Code.PreRelease',
LocalizedLanguages: 'Microsoft.VisualStudio.Code.LocalizedLanguages',
WebExtension: 'Microsoft.VisualStudio.Code.WebExtension'
WebExtension: 'Microsoft.VisualStudio.Code.WebExtension',
SponsorLink: 'Microsoft.VisualStudio.Code.SponsorLink'
};

interface ICriterium {
Expand Down Expand Up @@ -422,6 +423,10 @@ function getLocalizedLanguages(version: IRawGalleryExtensionVersion): string[] {
return value ? value.split(',') : [];
}

function getSponsorLink(version: IRawGalleryExtensionVersion): string | undefined {
return version.properties?.find(p => p.key === PropertyType.SponsorLink)?.value;
}

function getIsPreview(flags: string): boolean {
return flags.indexOf('preview') !== -1;
}
Expand Down Expand Up @@ -513,6 +518,7 @@ function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGaller
publisher: galleryExtension.publisher.publisherName,
publisherDisplayName: galleryExtension.publisher.displayName,
publisherDomain: galleryExtension.publisher.domain ? { link: galleryExtension.publisher.domain, verified: !!galleryExtension.publisher.isDomainVerified } : undefined,
publisherSponsorLink: getSponsorLink(version),
description: galleryExtension.shortDescription || '',
installCount: getStatistic(galleryExtension.statistics, 'install'),
rating: getStatistic(galleryExtension.statistics, 'averagerating'),
Expand Down
1 change: 1 addition & 0 deletions src/vs/platform/extensionManagement/common/extensionManagement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ export interface IGalleryExtension {
publisher: string;
publisherDisplayName: string;
publisherDomain?: { link: string; verified: boolean };
publisherSponsorLink?: string;
description: string;
installCount: number;
rating: number;
Expand Down
44 changes: 28 additions & 16 deletions src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
UpdateAction, ReloadAction, EnableDropDownAction, DisableDropDownAction, ExtensionStatusLabelAction, SetFileIconThemeAction, SetColorThemeAction,
RemoteInstallAction, ExtensionStatusAction, LocalInstallAction, ToggleSyncExtensionAction, SetProductIconThemeAction,
ActionWithDropDownAction, InstallDropdownAction, InstallingLabelAction, UninstallAction, ExtensionActionWithDropdownActionViewItem, ExtensionDropDownAction,
InstallAnotherVersionAction, ExtensionEditorManageExtensionAction, WebInstallAction, SwitchToPreReleaseVersionAction, SwitchToReleasedVersionAction, MigrateDeprecatedExtension
InstallAnotherVersionAction, ExtensionEditorManageExtensionAction, WebInstallAction, SwitchToPreReleaseVersionAction, SwitchToReleasedVersionAction, MigrateDeprecatedExtension, SponsorExtensionAction, SponsorExtensionActionViewItem
} from 'vs/workbench/contrib/extensions/browser/extensionsActions';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
Expand Down Expand Up @@ -356,6 +356,9 @@ export class ExtensionEditor extends EditorPane {
if (action instanceof ExtensionDropDownAction) {
return action.createActionViewItem();
}
if (action instanceof SponsorExtensionAction) {
return new SponsorExtensionActionViewItem(undefined, action, { icon: true, label: true });
}
if (action instanceof ActionWithDropDownAction) {
return new ExtensionActionWithDropdownActionViewItem(action, { icon: true, label: true, menuActionsOrProvider: { getActions: () => action.menuActions }, menuActionClassNames: (action.class || '').split(' ') }, this.contextMenuService);
}
Expand Down Expand Up @@ -944,7 +947,7 @@ export class ExtensionEditor extends EditorPane {
this.contentDisposables.add(scrollableContent);

this.renderCategories(content, extension);
this.renderResources(content, extension);
this.renderExtensionResources(content, extension);
this.renderMoreInfo(content, extension);

append(container, scrollableContent.getDomNode());
Expand All @@ -953,7 +956,7 @@ export class ExtensionEditor extends EditorPane {

private renderCategories(container: HTMLElement, extension: IExtension): void {
if (extension.categories.length) {
const categoriesContainer = append(container, $('.categories-container'));
const categoriesContainer = append(container, $('.categories-container.additional-details-element'));
append(categoriesContainer, $('.additional-details-title', undefined, localize('categories', "Categories")));
const categoriesElement = append(categoriesContainer, $('.categories'));
for (const category of extension.categories) {
Expand All @@ -966,7 +969,7 @@ export class ExtensionEditor extends EditorPane {
}
}

private renderResources(container: HTMLElement, extension: IExtension): void {
private renderExtensionResources(container: HTMLElement, extension: IExtension): void {
const resources: [string, URI][] = [];
if (extension.url) {
resources.push([localize('Marketplace', "Marketplace"), URI.parse(extension.url)]);
Expand All @@ -977,24 +980,33 @@ export class ExtensionEditor extends EditorPane {
if (extension.url && extension.licenseUrl) {
resources.push([localize('license', "License"), URI.parse(extension.licenseUrl)]);
}
if (extension.publisherDomain?.verified) {
const publisherDomainUri = URI.parse(extension.publisherDomain.link);
resources.push([publisherDomainUri.authority, publisherDomainUri]);
if (extension.publisherUrl) {
resources.push([extension.publisherDisplayName, extension.publisherUrl]);
}
if (resources.length) {
const resourcesContainer = append(container, $('.resources-container'));
append(resourcesContainer, $('.additional-details-title', undefined, localize('resources', "Resources")));
const resourcesElement = append(resourcesContainer, $('.resources'));
if (resources.length || extension.publisherSponsorLink) {
const extensionResourcesContainer = append(container, $('.resources-container.additional-details-element'));
append(extensionResourcesContainer, $('.additional-details-title', undefined, localize('resources', "Extension Resources")));
const resourcesElement = append(extensionResourcesContainer, $('.resources'));
for (const [label, uri] of resources) {
this.transientDisposables.add(this.onClick(append(resourcesElement, $('a.resource', { title: uri.toString() }, label)), () => this.openerService.open(uri)));
}
if (extension.publisherSponsorLink) {
const extensionSponsorContainer = append(resourcesElement, $('.extension-sponsor-container'));
const extensionActionBar = this.transientDisposables.add(new ActionBar(extensionSponsorContainer, {
animated: false,
actionViewItemProvider: (action: IAction) => new SponsorExtensionActionViewItem(undefined, action, { icon: true, label: true }),
}));
const action = this.instantiationService.createInstance(SponsorExtensionAction);
extensionActionBar.push([action], { icon: true, label: true });
action.extension = extension;
}
}
}

private renderMoreInfo(container: HTMLElement, extension: IExtension): void {
const gallery = extension.gallery;
const moreInfoContainer = append(container, $('.more-info-container'));
append(moreInfoContainer, $('.additional-details-title', undefined, localize('Marketplace Info', "Marketplace Info")));
const moreInfoContainer = append(container, $('.more-info-container.additional-details-element'));
append(moreInfoContainer, $('.additional-details-title', undefined, localize('Marketplace Info', "More Info")));
const moreInfo = append(moreInfoContainer, $('.more-info'));
if (gallery) {
append(moreInfo,
Expand Down Expand Up @@ -1860,14 +1872,14 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =

const link = theme.getColor(textLinkForeground);
if (link) {
collector.addRule(`.monaco-workbench .extension-editor .content .details .additional-details-container .resources-container a { color: ${link}; }`);
collector.addRule(`.monaco-workbench .extension-editor .content .details .additional-details-container .resources-container a.resource { color: ${link}; }`);
collector.addRule(`.monaco-workbench .extension-editor .content .feature-contributions a { color: ${link}; }`);
}

const activeLink = theme.getColor(textLinkActiveForeground);
if (activeLink) {
collector.addRule(`.monaco-workbench .extension-editor .content .details .additional-details-container .resources-container a:hover,
.monaco-workbench .extension-editor .content .details .additional-details-container .resources-container a:active { color: ${activeLink}; }`);
collector.addRule(`.monaco-workbench .extension-editor .content .details .additional-details-container .resources-container a.resource:hover,
.monaco-workbench .extension-editor .content .details .additional-details-container .resources-container a.resource:active { color: ${activeLink}; }`);
collector.addRule(`.monaco-workbench .extension-editor .content .feature-contributions a:hover,
.monaco-workbench .extension-editor .content .feature-contributions a:active { color: ${activeLink}; }`);
}
Expand Down
80 changes: 58 additions & 22 deletions src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ import { ViewContainerLocation } from 'vs/workbench/common/views';
import { flatten } from 'vs/base/common/arrays';
import { fromNow } from 'vs/base/common/date';
import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
import { Codicon } from 'vs/base/common/codicons';
import { assertType } from 'vs/base/common/types';

export class PromptExtensionInstallFailureAction extends Action {

Expand Down Expand Up @@ -876,6 +879,47 @@ export class MigrateDeprecatedExtension extends ExtensionAction {
}
}

export class SponsorExtensionAction extends ExtensionAction {

private static readonly EnabledClass = `${SponsorExtensionAction.LABEL_ACTION_CLASS} extension-sponsor`;
private static readonly DisabledClass = `${SponsorExtensionAction.EnabledClass} disabled`;

constructor(
@IOpenerService private openerService: IOpenerService,
) {
super('extensions.sponsor', localize('sponsor', "Sponsor"), SponsorExtensionAction.DisabledClass, false);
this.update();
}

update(): void {
this.enabled = false;
this.class = SponsorExtensionAction.DisabledClass;
this.tooltip = '';
if (this.extension?.publisherSponsorLink) {
this.enabled = true;
this.class = SponsorExtensionAction.EnabledClass;
this.tooltip = this.extension.publisherSponsorLink.toString();
}
}

override async run(): Promise<any> {
if (this.extension?.publisherSponsorLink) {
return this.openerService.open(this.extension.publisherSponsorLink);
}
}
}

export class SponsorExtensionActionViewItem extends ActionViewItem {
override render(container: HTMLElement): void {
super.render(container);
assertType(this.label);
const sponsorIcon = renderIcon(Codicon.heart);
const label = document.createElement('span');
label.textContent = this.getAction().label;
DOM.reset(this.label, sponsorIcon, label);
}
}

export class ExtensionActionWithDropdownActionViewItem extends ActionWithDropdownActionViewItem {

constructor(
Expand Down Expand Up @@ -2841,75 +2885,67 @@ export const extensionButtonProminentHoverBackground = registerColor('extensionB
hcLight: null
}, localize('extensionButtonProminentHoverBackground', "Button background hover color for actions extension that stand out (e.g. install button)."));

registerColor('extensionSponsorButton.background', { light: '#E94AAA', dark: '#E90A91', hcDark: null, hcLight: '#E94AAA' }, localize('extensionSponsorButton.background', "Background color for extension sponsor button."), true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi @aeschli for new color names

registerColor('extensionSponsorButton.hoverBackground', { light: '#E90A91', dark: '#E94AAA', hcDark: null, hcLight: '#E94AAA' }, localize('extensionSponsorButton.hoverBackground', "Background hover color for extension sponsor button."), true);

registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
const foregroundColor = theme.getColor(foreground);
if (foregroundColor) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item .action-label.extension-action.built-in-status { border-color: ${foregroundColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.built-in-status { border-color: ${foregroundColor}; }`);
collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.built-in-status { border-color: ${foregroundColor}; }`);
}

const buttonBackgroundColor = theme.getColor(buttonBackground);
if (buttonBackgroundColor) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item .action-label.extension-action.label { background-color: ${buttonBackgroundColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.label { background-color: ${buttonBackgroundColor}; }`);
collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.label { background-color: ${buttonBackgroundColor}; }`);
}

const buttonForegroundColor = theme.getColor(buttonForeground);
if (buttonForegroundColor) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item .action-label.extension-action.label { color: ${buttonForegroundColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.label { color: ${buttonForegroundColor}; }`);
collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.label { color: ${buttonForegroundColor}; }`);
}

const buttonHoverBackgroundColor = theme.getColor(buttonHoverBackground);
if (buttonHoverBackgroundColor) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item:hover .action-label.extension-action.label { background-color: ${buttonHoverBackgroundColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item:hover .action-label.extension-action.label { background-color: ${buttonHoverBackgroundColor}; }`);
collector.addRule(`.monaco-action-bar .action-item:hover .action-label.extension-action.label { background-color: ${buttonHoverBackgroundColor}; }`);
}

const extensionButtonProminentBackgroundColor = theme.getColor(extensionButtonProminentBackground);
if (extensionButtonProminentBackground) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item .action-label.extension-action.label.prominent { background-color: ${extensionButtonProminentBackgroundColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.label.prominent { background-color: ${extensionButtonProminentBackgroundColor}; }`);
collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.label.prominent { background-color: ${extensionButtonProminentBackgroundColor}; }`);
}

const extensionButtonProminentForegroundColor = theme.getColor(extensionButtonProminentForeground);
if (extensionButtonProminentForeground) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item .action-label.extension-action.label.prominent { color: ${extensionButtonProminentForegroundColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.label.prominent { color: ${extensionButtonProminentForegroundColor}; }`);
collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.label.prominent { color: ${extensionButtonProminentForegroundColor}; }`);
}

const extensionButtonProminentHoverBackgroundColor = theme.getColor(extensionButtonProminentHoverBackground);
if (extensionButtonProminentHoverBackground) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item:hover .action-label.extension-action.label.prominent { background-color: ${extensionButtonProminentHoverBackgroundColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item:hover .action-label.extension-action.label.prominent { background-color: ${extensionButtonProminentHoverBackgroundColor}; }`);
collector.addRule(`.monaco-action-bar .action-item:hover .action-label.extension-action.label.prominent { background-color: ${extensionButtonProminentHoverBackgroundColor}; }`);
}

const contrastBorderColor = theme.getColor(contrastBorder);
if (contrastBorderColor) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item .action-label.extension-action:not(.disabled) { border: 1px solid ${contrastBorderColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action:not(.disabled) { border: 1px solid ${contrastBorderColor}; }`);
collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action:not(.disabled) { border: 1px solid ${contrastBorderColor}; }`);
}

const errorColor = theme.getColor(editorErrorForeground);
if (errorColor) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item .action-label.extension-action.extension-status-error { color: ${errorColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.extension-status-error { color: ${errorColor}; }`);
collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.extension-status-error { color: ${errorColor}; }`);
collector.addRule(`.extension-editor .body .subcontent .runtime-status ${ThemeIcon.asCSSSelector(errorIcon)} { color: ${errorColor}; }`);
collector.addRule(`.monaco-hover.extension-hover .markdown-hover .hover-contents ${ThemeIcon.asCSSSelector(errorIcon)} { color: ${errorColor}; }`);
}

const warningColor = theme.getColor(editorWarningForeground);
if (warningColor) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item .action-label.extension-action.extension-status-warning { color: ${warningColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.extension-status-warning { color: ${warningColor}; }`);
collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.extension-status-warning { color: ${warningColor}; }`);
collector.addRule(`.extension-editor .body .subcontent .runtime-status ${ThemeIcon.asCSSSelector(warningIcon)} { color: ${warningColor}; }`);
collector.addRule(`.monaco-hover.extension-hover .markdown-hover .hover-contents ${ThemeIcon.asCSSSelector(warningIcon)} { color: ${warningColor}; }`);
}

const infoColor = theme.getColor(editorInfoForeground);
if (infoColor) {
collector.addRule(`.extension-list-item .monaco-action-bar .action-item .action-label.extension-action.extension-status-info { color: ${infoColor}; }`);
collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.extension-status-info { color: ${infoColor}; }`);
collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.extension-status-info { color: ${infoColor}; }`);
collector.addRule(`.extension-editor .body .subcontent .runtime-status ${ThemeIcon.asCSSSelector(infoIcon)} { color: ${infoColor}; }`);
collector.addRule(`.monaco-hover.extension-hover .markdown-hover .hover-contents ${ThemeIcon.asCSSSelector(infoIcon)} { color: ${infoColor}; }`);
}
Expand Down