From cc33c911d12eb1e3442fa4b0dc8845747e7dd797 Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Thu, 22 Oct 2020 16:47:14 +0200 Subject: [PATCH] Remove remote explorer badge Fixes #108798 --- .../contrib/remote/browser/remoteExplorer.ts | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts index 14528dafac9..5b7658f65d5 100644 --- a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts +++ b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts @@ -6,7 +6,6 @@ import * as nls from 'vs/nls'; import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { Extensions, IViewDescriptorService, IViewsRegistry, IViewsService } from 'vs/workbench/common/views'; -import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity'; import { IRemoteExplorerService, MakeAddress, mapHasTunnelLocalhostOrAllInterfaces, TUNNEL_VIEW_ID } from 'vs/workbench/services/remote/common/remoteExplorerService'; import { forwardedPortsViewEnabled, ForwardPortAction, OpenPortInBrowserAction, TunnelPanelDescriptor, TunnelViewModel } from 'vs/workbench/contrib/remote/browser/tunnelView'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -24,7 +23,6 @@ export const VIEWLET_ID = 'workbench.view.remote'; export class ForwardedPortsView extends Disposable implements IWorkbenchContribution { private contextKeyListener?: IDisposable; - private _activityBadge?: IDisposable; private entryAccessor: IStatusbarEntryAccessor | undefined; constructor( @@ -32,7 +30,6 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu @IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService, @IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService, @IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService, - @IActivityService private readonly activityService: IActivityService, @IStatusbarService private readonly statusbarService: IStatusbarService ) { super(); @@ -68,36 +65,19 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu private enableBadgeAndStatusBar() { this._register(this.remoteExplorerService.tunnelModel.onForwardPort(() => { - this.updateActivityBadge(); this.updateStatusBar(); })); this._register(this.remoteExplorerService.tunnelModel.onClosePort(() => { - this.updateActivityBadge(); this.updateStatusBar(); })); const disposable = Registry.as(Extensions.ViewsRegistry).onViewsRegistered(e => { if (e.find(view => view.views.find(viewDescriptor => viewDescriptor.id === TUNNEL_VIEW_ID))) { - this.updateActivityBadge(); this.updateStatusBar(); disposable.dispose(); } }); } - private updateActivityBadge() { - if (this._activityBadge) { - this._activityBadge.dispose(); - } - if (this.remoteExplorerService.tunnelModel.forwarded.size > 0) { - const viewContainer = this.viewDescriptorService.getViewContainerByViewId(TUNNEL_VIEW_ID); - if (viewContainer) { - this._activityBadge = this.activityService.showViewContainerActivity(viewContainer.id, { - badge: new NumberBadge(this.remoteExplorerService.tunnelModel.forwarded.size, n => n === 1 ? nls.localize('1forwardedPort', "1 forwarded port") : nls.localize('nForwardedPorts', "{0} forwarded ports", n)) - }); - } - } - } - private updateStatusBar() { if (!this.entryAccessor) { this._register(this.entryAccessor = this.statusbarService.addEntry(this.entry, 'status.forwardedPorts', nls.localize('status.forwardedPorts', "Forwarded Ports"), StatusbarAlignment.LEFT, 40)); -- GitLab