diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts index d7927c8ece4790ee8d4a9e29adcc40f9a55a6275..965928a8979eb302300334b885d1e82f057417c9 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts @@ -2565,12 +2565,10 @@ export class DisabledLabelAction extends ExtensionAction { update(): void { this.class = `${DisabledLabelAction.Class} hide`; this.label = ''; - this.enabled = false; if (this.extension && this.extension.local && isLanguagePackExtension(this.extension.local.manifest)) { return; } - if (this.warningAction.enabled) { - this.enabled = true; + if (this.warningAction.tooltip) { this.class = DisabledLabelAction.Class; this.label = this.warningAction.tooltip; return; @@ -2579,7 +2577,6 @@ export class DisabledLabelAction extends ExtensionAction { const isEnabled = this.extensionEnablementService.isEnabled(this.extension.local); const isExtensionRunning = this._runningExtensions.some(e => areSameExtensions({ id: e.identifier.value }, this.extension.identifier)); if (!isExtensionRunning && !isEnabled) { - this.enabled = true; this.class = DisabledLabelAction.Class; this.label = localize('disabled by user', "This extension is disabled by the user."); return; @@ -2625,7 +2622,6 @@ export class SystemDisabledWarningAction extends ExtensionAction { } update(): void { - this.enabled = false; this.class = `${SystemDisabledWarningAction.Class} hide`; this.tooltip = ''; if (this.extension && this.extension.local && isLanguagePackExtension(this.extension.local.manifest)) { @@ -2638,13 +2634,11 @@ export class SystemDisabledWarningAction extends ExtensionAction { const localExtensionServer = localExtension ? localExtension.server : null; if (this.extension.server === this.extensionManagementServerService.localExtensionManagementServer && !isUIExtension(this.extension.local.manifest, this.configurationService)) { if (runningExtensionServer === this.extensionManagementServerService.remoteExtensionManagementServer) { - this.enabled = true; this.class = `${SystemDisabledWarningAction.Class}`; this.tooltip = localize('disabled locally', "Extension is enabled on '{0}' and disabled locally.", this.getServerLabel(this.extensionManagementServerService.remoteExtensionManagementServer)); return; } if (localExtensionServer !== this.extensionManagementServerService.remoteExtensionManagementServer) { - this.enabled = true; this.class = `${SystemDisabledWarningAction.Class}`; this.tooltip = localize('Install in remote server', "Install the extension on '{0}' to enable.", this.getServerLabel(this.extensionManagementServerService.remoteExtensionManagementServer)); return; @@ -2652,13 +2646,11 @@ export class SystemDisabledWarningAction extends ExtensionAction { } if (this.extension.server === this.extensionManagementServerService.remoteExtensionManagementServer && isUIExtension(this.extension.local.manifest, this.configurationService)) { if (runningExtensionServer === this.extensionManagementServerService.localExtensionManagementServer) { - this.enabled = true; this.class = `${SystemDisabledWarningAction.Class}`; this.tooltip = localize('disabled remotely', "Extension is enabled locally and disabled on '{0}'.", this.getServerLabel(this.extensionManagementServerService.remoteExtensionManagementServer)); return; } if (localExtensionServer !== this.extensionManagementServerService.localExtensionManagementServer) { - this.enabled = true; this.class = `${SystemDisabledWarningAction.Class}`; this.tooltip = localize('Install in local server', "Install the extension locally to enable."); return; diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsWidgets.ts index 7a1e5ab359c76d74d7e268189bf5d0322e29e72a..08912a7d14a963844c651f538ce029e7f5649ed5 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsWidgets.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsWidgets.ts @@ -174,7 +174,7 @@ export class TooltipWidget extends ExtensionWidget { if (this.reloadAction.enabled) { return this.reloadAction.tooltip; } - if (this.extensionLabelAction.enabled) { + if (this.extensionLabelAction.label) { return this.extensionLabelAction.label; } return this.recommendationWidget.tooltip; diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/extensionActions.css b/src/vs/workbench/contrib/extensions/electron-browser/media/extensionActions.css index 886155dccb450d44a7969b4c29567a88af0f89e9..c2eaab12e13f943ec1da2bd6825be1bc8e7a55e5 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/media/extensionActions.css +++ b/src/vs/workbench/contrib/extensions/electron-browser/media/extensionActions.css @@ -69,7 +69,6 @@ .extension-editor > .header > .details > .actions > .monaco-action-bar > .actions-container > .action-item > .action-label.disable-warning, .extensions-viewlet>.extensions .extension>.details>.footer>.monaco-action-bar .action-item .action-label.disable-warning { - cursor: default; margin: 0.1em; }