remote cli: show host label

src/vs/platform/extensionManagement/common/extensionManagementCLIService.ts

@@ -17,7 +17,6 @@ import { Schemas } from 'vs/base/common/network';
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
 
 const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
-const notInstalled = (id: string) => localize('notInstalled', "Extension '{0}' is not installed.", id);
 const useId = localize('useId', "Make sure you use the full extension ID, including the publisher, e.g.: {0}", 'ms-dotnettools.csharp');
 
 
@@ -52,6 +51,9 @@ export class ExtensionManagementCLIService implements IExtensionManagementCLISer
 		@ILocalizationsService private readonly localizationsService: ILocalizationsService
 	) { }
 
+	protected get location(): string | undefined {
+		return undefined;
+	}
 
 	public async listExtensions(showVersions: boolean, category?: string, output: CLIOutput = console): Promise<void> {
 		let extensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
@@ -75,6 +77,10 @@ export class ExtensionManagementCLIService implements IExtensionManagementCLISer
 			});
 			return;
 		}
+		if (this.location) {
+			output.log(localize('listFromLocation', "Extensions installed on {0}:", this.location));
+		}
+
 		extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
 		let lastId: string | undefined = undefined;
 		for (let extension of extensions) {
@@ -89,7 +95,7 @@ export class ExtensionManagementCLIService implements IExtensionManagementCLISer
 		const failed: string[] = [];
 		const installedExtensionsManifests: IExtensionManifest[] = [];
 		if (extensions.length) {
-			output.log(localize('installingExtensions', "Installing extensions..."));
+			output.log(this.location ? localize('installingExtensionsOnLocation', "Installing extensions on {0}...", this.location) : localize('installingExtensions', "Installing extensions..."));
 		}
 
 		const installed = await this.extensionManagementService.getInstalled(ExtensionType.User);
@@ -286,7 +292,7 @@ export class ExtensionManagementCLIService implements IExtensionManagementCLISer
 			const installed = await this.extensionManagementService.getInstalled();
 			const extensionsToUninstall = installed.filter(e => areSameExtensions(e.identifier, { id }));
 			if (!extensionsToUninstall.length) {
-				throw new Error(`${notInstalled(id)}\n${useId}`);
+				throw new Error(`${this.notInstalled(id)}\n${useId}`);
 			}
 			if (extensionsToUninstall.some(e => e.type === ExtensionType.System)) {
 				output.log(localize('builtin', "Extension '{0}' is a Built-in extension and cannot be uninstalled", id));
@@ -302,7 +308,12 @@ export class ExtensionManagementCLIService implements IExtensionManagementCLISer
 				uninstalledExtensions.push(extensionToUninstall);
 			}
 
-			output.log(localize('successUninstall', "Extension '{0}' was successfully uninstalled!", id));
+			if (this.location) {
+				output.log(localize('successUninstallFromLocation', "Extension '{0}' was successfully uninstalled from {1}!", id, this.location));
+			} else {
+				output.log(localize('successUninstall', "Extension '{0}' was successfully uninstalled!", id));
+			}
+
 		}
 
 		if (uninstalledExtensions.some(e => isLanguagePackExtension(e.manifest))) {
@@ -328,4 +339,9 @@ export class ExtensionManagementCLIService implements IExtensionManagementCLISer
 	private updateLocalizationsCache(): Promise<boolean> {
 		return this.localizationsService.update();
 	}
+
+	private notInstalled(id: string) {
+		return this.location ? localize('notInstalleddOnLocation', "Extension '{0}' is not installed on {1}.", id, this.location) : localize('notInstalled', "Extension '{0}' is not installed.", id);
+	}
+
 }

src/vs/workbench/api/browser/mainThreadCLICommands.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Schemas } from 'vs/base/common/network';
 import { isString } from 'vs/base/common/types';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
@@ -13,9 +14,11 @@ import { ExtensionManagementCLIService } from 'vs/platform/extensionManagement/c
 import { getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { ILabelService } from 'vs/platform/label/common/label';
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IProductService } from 'vs/platform/product/common/productService';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { canExecuteOnWorkspace } from 'vs/workbench/services/extensions/common/extensionsUtil';
 import { IExtensionManifest } from 'vs/workbench/workbench.web.api';
@@ -74,14 +77,25 @@ CommandsRegistry.registerCommand('_remoteCLI.manageExtensions', async function (
 
 class RemoteExtensionCLIManagementService extends ExtensionManagementCLIService {
 
+	private _location: string | undefined;
+
 	constructor(
 		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
 		@IProductService private readonly productService: IProductService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IExtensionGalleryService extensionGalleryService: IExtensionGalleryService,
 		@ILocalizationsService localizationsService: ILocalizationsService,
+		@ILabelService labelService: ILabelService,
+		@IWorkbenchEnvironmentService envService: IWorkbenchEnvironmentService
 	) {
 		super(extensionManagementService, extensionGalleryService, localizationsService);
+
+		const remoteAuthority = envService.remoteAuthority;
+		this._location = remoteAuthority ? labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority) : undefined;
+	}
+
+	protected get location(): string | undefined {
+		return this._location;
 	}
 
 	protected validateExtensionKind(manifest: IExtensionManifest, output: CLIOutput): boolean {