Skip to content

Commit 60ea8cb

Browse files
committed
1 parent cbab504 commit 60ea8cb

File tree

2 files changed

+4
-34
lines changed

2 files changed

+4
-34
lines changed

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

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
2323
import { ResolvedKeybinding } from 'vs/base/common/keybindings';
2424
import { ExtensionsInput, IExtensionEditorOptions } from 'vs/workbench/contrib/extensions/common/extensionsInput';
2525
import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, IExtension, ExtensionContainers, ExtensionEditorTab, ExtensionState } from 'vs/workbench/contrib/extensions/common/extensions';
26-
import { RatingsWidget, InstallCountWidget, RemoteBadgeWidget, ExtensionHoverWidget } from 'vs/workbench/contrib/extensions/browser/extensionsWidgets';
26+
import { RatingsWidget, InstallCountWidget, RemoteBadgeWidget } from 'vs/workbench/contrib/extensions/browser/extensionsWidgets';
2727
import { IEditorOpenContext } from 'vs/workbench/common/editor';
2828
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
2929
import {
@@ -68,7 +68,7 @@ import { Delegate } from 'vs/workbench/contrib/extensions/browser/extensionsList
6868
import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
6969
import { attachKeybindingLabelStyler } from 'vs/platform/theme/common/styler';
7070
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
71-
import { errorIcon, infoIcon, preReleaseIcon, starEmptyIcon, verifiedPublisherIcon as verifiedPublisherThemeIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
71+
import { errorIcon, infoIcon, starEmptyIcon, verifiedPublisherIcon as verifiedPublisherThemeIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
7272
import { MarkdownString } from 'vs/base/common/htmlContent';
7373
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
7474
import { ViewContainerLocation } from 'vs/workbench/common/views';
@@ -151,7 +151,6 @@ interface IExtensionEditorTemplate {
151151
actionsAndStatusContainer: HTMLElement;
152152
extensionActionBar: ActionBar;
153153
status: HTMLElement;
154-
preReleaseText: HTMLElement;
155154
recommendation: HTMLElement;
156155
navbar: NavBar;
157156
content: HTMLElement;
@@ -303,7 +302,6 @@ export class ExtensionEditor extends EditorPane {
303302
}));
304303

305304
const status = append(actionsAndStatusContainer, $('.status'));
306-
const preReleaseText = append(details, $('.pre-release-text'));
307305
const recommendation = append(details, $('.recommendation'));
308306

309307
this._register(Event.chain(extensionActionBar.onDidRun)
@@ -336,7 +334,6 @@ export class ExtensionEditor extends EditorPane {
336334
rating,
337335
actionsAndStatusContainer,
338336
extensionActionBar,
339-
preReleaseText,
340337
status,
341338
recommendation
342339
};
@@ -526,7 +523,6 @@ export class ExtensionEditor extends EditorPane {
526523
this.transientDisposables.add(disposable);
527524
}
528525

529-
this.setPreReleaseText(extension, template);
530526
this.setStatus(extension, extensionStatus, template);
531527
this.setRecommendationText(extension, template);
532528

@@ -575,33 +571,6 @@ export class ExtensionEditor extends EditorPane {
575571
this.editorLoadComplete = true;
576572
}
577573

578-
private setPreReleaseText(extension: IExtension, template: IExtensionEditorTemplate): void {
579-
let preReleaseText: string | undefined;
580-
reset(template.preReleaseText);
581-
const disposables = this.transientDisposables.add(new DisposableStore());
582-
const updatePreReleaseText = (layout: boolean) => {
583-
const newPreReleaseText = ExtensionHoverWidget.getPreReleaseMessage(extension);
584-
if (preReleaseText !== newPreReleaseText) {
585-
preReleaseText = newPreReleaseText;
586-
disposables.clear();
587-
reset(template.preReleaseText);
588-
if (preReleaseText) {
589-
append(template.preReleaseText, $(`span${ThemeIcon.asCSSSelector(preReleaseIcon)}`));
590-
disposables.add(this.renderMarkdownText(preReleaseText, template.preReleaseText));
591-
}
592-
if (layout && this.dimension) {
593-
this.layout(this.dimension);
594-
}
595-
}
596-
};
597-
updatePreReleaseText(false);
598-
this.transientDisposables.add(this.extensionsWorkbenchService.onChange(e => {
599-
if (e && areSameExtensions(e.identifier, extension.identifier)) {
600-
updatePreReleaseText(true);
601-
}
602-
}));
603-
}
604-
605574
private setStatus(extension: IExtension, extensionStatus: ExtensionStatusAction, template: IExtensionEditorTemplate): void {
606575
const disposables = new DisposableStore();
607576
this.transientDisposables.add(disposables);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,8 @@ export class ExtensionHoverWidget extends ExtensionWidget {
591591
if (extension.local?.isPreReleaseVersion || extension.gallery?.properties.isPreReleaseVersion) {
592592
return undefined;
593593
}
594-
return localize('has prerelease', "This extension has a Pre-Release version available");
594+
const preReleaseVersionLink = `[${localize('Show prerelease version', "Pre-Release version")}](${URI.parse(`command:workbench.extensions.action.showPreReleaseVersion?${encodeURIComponent(JSON.stringify([extension.identifier.id]))}`)})`;
595+
return localize('has prerelease', "This extension has a {0} available", preReleaseVersionLink);
595596
}
596597

597598
}

0 commit comments

Comments
 (0)