Skip to content

Commit 7d8d01a

Browse files
sandy081sandy081
committed
simplify warning messages
1 parent ff6ef95 commit 7d8d01a

1 file changed

Lines changed: 28 additions & 31 deletions

File tree

‎src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts‎

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@ export class InstallAction extends ExtensionAction {
164164
@IWorkbenchThemeService private readonly workbenchThemeService: IWorkbenchThemeService,
165165
@IWorkbenchEnvironmentService private readonly workbenchEnvironmentService: IWorkbenchEnvironmentService,
166166
@IConfigurationService private readonly configurationService: IConfigurationService,
167-
@ILabelService private readonly labelService: ILabelService,
168-
@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
167+
@ILabelService private readonly labelService: ILabelService
169168
) {
170169
super(`extensions.install`, InstallAction.INSTALL_LABEL, InstallAction.Class, false);
171170
this.update();
@@ -192,12 +191,12 @@ export class InstallAction extends ExtensionAction {
192191
} else {
193192
if (this._manifest && this.workbenchEnvironmentService.configuration.remoteAuthority) {
194193
if (isUIExtension(this._manifest, this.configurationService)) {
195-
this.label = `${InstallAction.INSTALL_LABEL} (${this.extensionManagementServerService.localExtensionManagementServer.label})`;
196-
this.tooltip = `${InstallAction.INSTALL_LABEL} (${this.extensionManagementServerService.localExtensionManagementServer.label})`;
194+
this.label = `${InstallAction.INSTALL_LABEL} ${localize('locally', "Locally")}`;
195+
this.tooltip = `${InstallAction.INSTALL_LABEL} ${localize('locally', "Locally")}`;
197196
} else {
198197
const host = this.labelService.getHostLabel(REMOTE_HOST_SCHEME, this.workbenchEnvironmentService.configuration.remoteAuthority) || localize('remote', "Remote");
199-
this.label = `${InstallAction.INSTALL_LABEL} (${host})`;
200-
this.tooltip = `${InstallAction.INSTALL_LABEL} (${host})`;
198+
this.label = `${InstallAction.INSTALL_LABEL} on ${host}`;
199+
this.tooltip = `${InstallAction.INSTALL_LABEL} on ${host}`;
201200
}
202201
} else {
203202
this.label = InstallAction.INSTALL_LABEL;
@@ -306,7 +305,7 @@ export class RemoteInstallAction extends ExtensionAction {
306305
const remoteAuthority = this.environmentService.configuration.remoteAuthority;
307306
if (remoteAuthority) {
308307
const host = this.labelService.getHostLabel(REMOTE_HOST_SCHEME, this.environmentService.configuration.remoteAuthority) || localize('remote', "Remote");
309-
this.label = `${RemoteInstallAction.INSTALL_LABEL} (${host})`;
308+
this.label = `${RemoteInstallAction.INSTALL_LABEL} on ${host}`;
310309
return;
311310
}
312311
}
@@ -2604,32 +2603,30 @@ export class SystemDisabledWarningAction extends ExtensionAction {
26042603
this.class = `${SystemDisabledWarningAction.Class} hide`;
26052604
this.tooltip = '';
26062605
if (this.extension && this.extension.local && this.extension.server && this._runningExtensions && this.workbenchEnvironmentService.configuration.remoteAuthority && this.extensionManagementServerService.remoteExtensionManagementServer) {
2607-
if (
2608-
// Local Workspace Extension
2609-
this.extension.server === this.extensionManagementServerService.localExtensionManagementServer && !isUIExtension(this.extension.local.manifest, this.configurationService)
2610-
) {
2611-
this.enabled = true;
2612-
this.class = `${SystemDisabledWarningAction.Class}`;
2613-
this.tooltip = localize('disabled workspace Extension', "This extension from {0} server is disabled because it cannot run in a window connected to the remote server.", this.getServerLabel(this.extensionManagementServerService.localExtensionManagementServer));
2614-
if (!this.extensionsWorkbenchService.local.some(e => areSameExtensions(e.identifier, this.extension.identifier) && e.server === this.extensionManagementServerService.remoteExtensionManagementServer)
2615-
&& this.extensionsWorkbenchService.canInstall(this.extension)
2616-
) {
2617-
// Extension does not exist in remote
2618-
this.tooltip = `${this.tooltip} ${localize('Install in remote server', "Install it in {0} server to enable.", this.getServerLabel(this.extensionManagementServerService.remoteExtensionManagementServer))}`;
2606+
if (this.extension.server === this.extensionManagementServerService.localExtensionManagementServer) {
2607+
const runningExtension = this._runningExtensions.filter(e => areSameExtensions({ id: e.identifier.value }, this.extension.identifier))[0];
2608+
const runningExtensionServer = runningExtension ? this.extensionManagementServerService.getExtensionManagementServer(runningExtension.extensionLocation) : null;
2609+
if (runningExtensionServer === this.extensionManagementServerService.remoteExtensionManagementServer) {
2610+
this.enabled = true;
2611+
this.class = `${SystemDisabledWarningAction.Class}`;
2612+
this.tooltip = localize('disabled locally', "Extension is enabled on '{0}' and disabled locally.", this.getServerLabel(this.extensionManagementServerService.remoteExtensionManagementServer));
2613+
return;
2614+
}
2615+
if (!isUIExtension(this.extension.local.manifest, this.configurationService)) {
2616+
this.enabled = true;
2617+
this.class = `${SystemDisabledWarningAction.Class}`;
2618+
if (!this.extensionsWorkbenchService.local.some(e => areSameExtensions(e.identifier, this.extension.identifier) && e.server === this.extensionManagementServerService.remoteExtensionManagementServer)
2619+
&& this.extensionsWorkbenchService.canInstall(this.extension)
2620+
) {
2621+
// Extension does not exist in remote
2622+
this.tooltip = localize('Install in remote server', "Install the extension on '{0}' to enable it there.", this.getServerLabel(this.extensionManagementServerService.remoteExtensionManagementServer));
2623+
} else {
2624+
this.tooltip = localize('disabled workspace Extension', "This extension is disabled because it cannot run in a window connected to the remote server.");
2625+
}
2626+
return;
26192627
}
2620-
return;
2621-
}
2622-
const runningExtension = this._runningExtensions.filter(e => areSameExtensions({ id: e.identifier.value }, this.extension.identifier))[0];
2623-
const runningExtensionServer = runningExtension ? this.extensionManagementServerService.getExtensionManagementServer(runningExtension.extensionLocation) : null;
2624-
if (
2625-
// Not same as running extension
2626-
runningExtensionServer && this.extension.server !== runningExtensionServer
2627-
) {
2628-
this.enabled = true;
2629-
this.class = `${SystemDisabledWarningAction.Class}`;
2630-
this.tooltip = localize('disabled because running in another server', "This extension from {0} server is disabled because another instance of same extension from {1} server is enabled.", this.getServerLabel(this.extension.server), this.getServerLabel(runningExtensionServer));
2631-
return;
26322628
}
2629+
26332630
}
26342631
}
26352632

0 commit comments

Comments
 (0)