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

Improve pre-release indicators #148705

Merged
merged 1 commit into from
May 4, 2022
Merged

Improve pre-release indicators #148705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 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 @@ -342,7 +342,7 @@ export class ExtensionEditor extends EditorPane {
this.instantiationService.createInstance(InstallAnotherVersionAction),
]
]),
this.instantiationService.createInstance(SwitchToPreReleaseVersionAction),
this.instantiationService.createInstance(SwitchToPreReleaseVersionAction, false),
this.instantiationService.createInstance(SwitchToReleasedVersionAction),
this.instantiationService.createInstance(ToggleSyncExtensionAction),
new ExtensionEditorManageExtensionAction(this.scopedContextKeyService || this.contextKeyService, this.instantiationService),
Expand Down
8 changes: 4 additions & 4 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 @@ -55,7 +55,7 @@ import { ActionWithDropdownActionViewItem, IActionWithDropdownActionViewItemOpti
import { IContextMenuProvider } from 'vs/base/browser/contextmenu';
import { ILogService } from 'vs/platform/log/common/log';
import * as Constants from 'vs/workbench/contrib/logs/common/logConstants';
import { errorIcon, infoIcon, manageExtensionIcon, syncEnabledIcon, syncIgnoredIcon, trustIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
import { errorIcon, infoIcon, manageExtensionIcon, preReleaseIcon, syncEnabledIcon, syncIgnoredIcon, trustIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
import { isIOS, isWeb } from 'vs/base/common/platform';
import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
Expand Down Expand Up @@ -1059,12 +1059,12 @@ export class SwitchToPreReleaseVersionAction extends ExtensionAction {
static readonly ID = 'workbench.extensions.action.switchToPreReleaseVersion';
static readonly TITLE = { value: localize('switch to pre-release version', "Switch to Pre-Release Version"), original: 'Switch to Pre-Release Version' };

private static readonly Class = `${ExtensionAction.LABEL_ACTION_CLASS} hide-when-disabled`;

constructor(
icon: boolean,
@ICommandService private readonly commandService: ICommandService,
) {
super(SwitchToPreReleaseVersionAction.ID, SwitchToPreReleaseVersionAction.TITLE.value, SwitchToPreReleaseVersionAction.Class);
super(SwitchToPreReleaseVersionAction.ID, icon ? '' : SwitchToPreReleaseVersionAction.TITLE.value, `${icon ? ExtensionAction.ICON_ACTION_CLASS + ' ' + ThemeIcon.asClassName(preReleaseIcon) : ExtensionAction.LABEL_ACTION_CLASS} hide-when-disabled`);
this.tooltip = localize('switch to pre-release version tooltip', "Switch to Pre-Release version of this extension");
this.update();
}

Expand Down
7 changes: 3 additions & 4 deletions src/vs/workbench/contrib/extensions/browser/extensionsList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
import { IPagedRenderer } from 'vs/base/browser/ui/list/listPaging';
import { Event } from 'vs/base/common/event';
import { IExtension, ExtensionContainers, ExtensionState, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
import { UpdateAction, ManageExtensionAction, ReloadAction, ExtensionStatusLabelAction, RemoteInstallAction, ExtensionStatusAction, LocalInstallAction, ActionWithDropDownAction, InstallDropdownAction, InstallingLabelAction, ExtensionActionWithDropdownActionViewItem, ExtensionDropDownAction, WebInstallAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
import { UpdateAction, ManageExtensionAction, ReloadAction, ExtensionStatusLabelAction, RemoteInstallAction, ExtensionStatusAction, LocalInstallAction, ActionWithDropDownAction, InstallDropdownAction, InstallingLabelAction, ExtensionActionWithDropdownActionViewItem, ExtensionDropDownAction, WebInstallAction, SwitchToPreReleaseVersionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
import { RatingsWidget, InstallCountWidget, RecommendationWidget, RemoteBadgeWidget, ExtensionPackCountWidget as ExtensionPackBadgeWidget, SyncIgnoredWidget, ExtensionHoverWidget, ExtensionActivationStatusWidget, PreReleaseBookmarkWidget, RunningPreReleaseVersionIndicatorWidget, extensionVerifiedPublisherIconColor } from 'vs/workbench/contrib/extensions/browser/extensionsWidgets';
import { RatingsWidget, InstallCountWidget, RecommendationWidget, RemoteBadgeWidget, ExtensionPackCountWidget as ExtensionPackBadgeWidget, SyncIgnoredWidget, ExtensionHoverWidget, ExtensionActivationStatusWidget, PreReleaseBookmarkWidget, extensionVerifiedPublisherIconColor } from 'vs/workbench/contrib/extensions/browser/extensionsWidgets';
import { IExtensionService, toExtension } from 'vs/workbench/services/extensions/common/extensions';
import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
import { INotificationService } from 'vs/platform/notification/common/notification';
Expand Down Expand Up @@ -92,7 +92,6 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
const ratings = append(header, $('span.ratings'));
const syncIgnore = append(header, $('span.sync-ignored'));
const activationStatus = append(header, $('span.activation-status'));
const preRelease = append(header, $('span.pre-release'));
const headerRemoteBadgeWidget = this.instantiationService.createInstance(RemoteBadgeWidget, header, false);
const description = append(details, $('.description.ellipsis'));
const footer = append(details, $('.footer'));
Expand Down Expand Up @@ -127,6 +126,7 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
this.instantiationService.createInstance(LocalInstallAction),
this.instantiationService.createInstance(WebInstallAction),
extensionStatusIconAction,
this.instantiationService.createInstance(SwitchToPreReleaseVersionAction, true),
this.instantiationService.createInstance(ManageExtensionAction)
];
const extensionHoverWidget = this.instantiationService.createInstance(ExtensionHoverWidget, { target: root, position: this.options.hoverOptions.position }, extensionStatusIconAction, reloadAction);
Expand All @@ -138,7 +138,6 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
extensionPackBadgeWidget,
headerRemoteBadgeWidget,
extensionHoverWidget,
this.instantiationService.createInstance(RunningPreReleaseVersionIndicatorWidget, preRelease),
this.instantiationService.createInstance(SyncIgnoredWidget, syncIgnore),
this.instantiationService.createInstance(ExtensionActivationStatusWidget, activationStatus, true),
this.instantiationService.createInstance(InstallCountWidget, installCount, true),
Expand Down
25 changes: 1 addition & 24 deletions src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,29 +159,6 @@ export class RatingsWidget extends ExtensionWidget {
}
}

export class RunningPreReleaseVersionIndicatorWidget extends ExtensionWidget {

constructor(
private readonly container: HTMLElement,
) {
super();
container.classList.add('extension-pre-release');
this.render();
}

render(): void {
this.container.innerText = '';

if (!this.extension
|| this.extension.state !== ExtensionState.Installed
|| !this.extension.local?.isPreReleaseVersion) {
return;
}

append(this.container, $('span' + ThemeIcon.asCSSSelector(preReleaseIcon)));
}
}

export class RecommendationWidget extends ExtensionWidget {

private element?: HTMLElement;
Expand Down Expand Up @@ -252,7 +229,7 @@ export class PreReleaseBookmarkWidget extends ExtensionWidget {
if (!this.extension.hasPreReleaseVersion) {
return;
}
if (this.extension.state === ExtensionState.Installed && this.extension.local?.isPreReleaseVersion) {
if (this.extension.state === ExtensionState.Installed && !this.extension.local?.isPreReleaseVersion) {
return;
}
this.element = append(this.parent, $('div.extension-bookmark'));
Expand Down
8 changes: 0 additions & 8 deletions src/vs/workbench/contrib/extensions/browser/media/extension.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@
overflow: hidden;
}

.extension-list-item > .details > .header-container > .header > .extension-pre-release .codicon {
color: var(--vscode-extensionIcon-preReleaseForeground) !important;
}

.extension-list-item > .details > .header-container > .header > .activation-status,
.extension-list-item > .details > .header-container > .header > .install-count,
.extension-list-item > .details > .header-container > .header > .ratings {
Expand Down Expand Up @@ -143,10 +139,6 @@
color: currentColor;
}

.extension-list-item > .details > .header-container > .header .pre-release {
display: flex;
}

.extension-list-item > .details > .header-container > .header .sync-ignored {
display: flex;
}
Expand Down
5 changes: 0 additions & 5 deletions src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,3 @@
color: inherit;
font-size: 80%;
}

/* codicon colors */
.codicon.codicon-extensions-pre-release {
color: var(--vscode-extensionIcon-preReleaseForeground);
}