Fix microsoft/vscode-remote/issues/1394

sandy081 · sandy081 · commit 57fb54fbc6c6 · 2019-04-23T11:46:04.000+02:00
diff --git 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,27 +2634,23 @@ 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;
 				}
 			}
 			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
@@ -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
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ export class TooltipWidget extends ExtensionWidget {`
`174`	`174`	`if (this.reloadAction.enabled) {`
`175`	`175`	`return this.reloadAction.tooltip;`
`176`	`176`	`}`
`177`		`- if (this.extensionLabelAction.enabled) {`
	`177`	`+ if (this.extensionLabelAction.label) {`
`178`	`178`	`return this.extensionLabelAction.label;`
`179`	`179`	`}`
`180`	`180`	`return this.recommendationWidget.tooltip;`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@`
`69`	`69`
`70`	`70`	`.extension-editor > .header > .details > .actions > .monaco-action-bar > .actions-container > .action-item > .action-label.disable-warning,`
`71`	`71`	`.extensions-viewlet>.extensions .extension>.details>.footer>.monaco-action-bar .action-item .action-label.disable-warning {`
`72`		`- cursor: default;`
`73`	`72`	`margin: 0.1em;`
`74`	`73`	`}`
`75`	`74`