chore: pull more strings from the product.json (microsoft#166769)

Fixes the bulk of microsoft/vscode-remote-tunnels#560

Author: connor4312

build/azure-pipelines/cli/prepare.js

@@ -48,7 +48,9 @@ const setLauncherEnvironmentVars = () => {
 		['VSCODE_CLI_QUALITY', product.quality],
 		['VSCODE_CLI_NAME_SHORT', product.nameShort],
 		['VSCODE_CLI_NAME_LONG', product.nameLong],
+		['VSCODE_CLI_QUALITYLESS_PRODUCT_NAME', product.nameLong.replace(/ - [a-z]+$/i, '')],
 		['VSCODE_CLI_APPLICATION_NAME', product.applicationName],
+		['VSCODE_CLI_EDITOR_WEB_URL', product.editorWebUrl],
 		['VSCODE_CLI_COMMIT', commit],
 		[
 			'VSCODE_CLI_WIN32_APP_IDS',
@@ -58,13 +60,25 @@ const setLauncherEnvironmentVars = () => {
 					.map(([, value]) => String(value).replace(/[{}]/g, ''))),
 			),
 		],
+		[
+			'VSCODE_CLI_NAME_LONG_MAP',
+			!isOSS && JSON.stringify(makeQualityMap(json => json.nameLong)),
+		],
+		[
+			'VSCODE_CLI_APPLICATION_NAME_MAP',
+			!isOSS && JSON.stringify(makeQualityMap(json => json.applicationName)),
+		],
+		[
+			'VSCODE_CLI_SERVER_NAME_MAP',
+			!isOSS && JSON.stringify(makeQualityMap(json => json.serverApplicationName)),
+		],
 		[
 			'VSCODE_CLI_QUALITY_DOWNLOAD_URIS',
 			!isOSS && JSON.stringify(makeQualityMap(json => json.downloadUrl)),
 		],
 	]);
 
-	console.log(JSON.stringify([...vars].reduce((obj, kv) => ({...obj, [kv[0]]: kv[1]}), {})));
+	console.log(JSON.stringify([...vars].reduce((obj, kv) => ({ ...obj, [kv[0]]: kv[1] }), {})));
 
 	for (const [key, value] of vars) {
 		if (value) {

build/azure-pipelines/cli/prepare.ts

@@ -46,6 +46,7 @@ clap_lex = "0.2"
 url = "2.3"
 async-trait = "0.1"
 log = "0.4"
+const_format = "0.2"
 
 [target.'cfg(windows)'.dependencies]
 windows-service = "0.5"

cli/Cargo.lock

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 use crate::{
-	constants::get_default_user_agent,
+	constants::{get_default_user_agent, PRODUCT_NAME_LONG},
 	info, log,
 	state::{LauncherPaths, PersistedState},
 	trace,
@@ -500,7 +500,7 @@ impl Auth {
 		}
 
 		let provider = prompt_options(
-			"How would you like to log in to VS Code?",
+			format!("How would you like to log in to {}?", PRODUCT_NAME_LONG),
 			&[AuthProvider::Microsoft, AuthProvider::Github],
 		)?;
 

cli/Cargo.toml

@@ -157,12 +157,7 @@ async fn start_code(context: CommandContext, args: Vec<String>) -> Result<i32, A
 		.args(args)
 		.status()
 		.map(|s| s.code().unwrap_or(1))
-		.map_err(|e| {
-			wrap(
-				e,
-				format!("error running VS Code from {}", binary.display()),
-			)
-		})?;
+		.map_err(|e| wrap(e, format!("error running editor from {}", binary.display())))?;
 
 	Ok(code)
 }

cli/src/auth.rs

@@ -7,21 +7,29 @@ use std::{fmt, path::PathBuf};
 
 use crate::{constants, log, options, tunnels::code_server::CodeServerArgs};
 use clap::{ArgEnum, Args, Parser, Subcommand};
+use const_format::concatcp;
 
-const TEMPLATE: &str = "
- Visual Studio Code CLI - {version}
+const CLI_NAME: &str = concatcp!(constants::PRODUCT_NAME_LONG, " CLI");
+const TEMPLATE: &str = concatcp!(
+	CLI_NAME,
+	" - {version}
 
- Usage: code-insiders.exe [options][paths...]
+Usage: ",
+	constants::APPLICATION_NAME,
+	" [options][paths...]
 
- To read output from another program, append '-' (e.g. 'echo Hello World | code-insiders.exe -')
+To read output from another program, append '-' (e.g. 'echo Hello World | ",
+	constants::APPLICATION_NAME,
+	" -')
 
- {all-args}";
+{all-args}"
+);
 
 #[derive(Parser, Debug, Default)]
 #[clap(
    help_template = TEMPLATE,
    long_about = None,
-   name = "Visual Studio Code CLI",
+   name = CLI_NAME,
    version = match constants::VSCODE_CLI_VERSION { Some(v) => v, None => "dev" },
  )]
 pub struct IntegratedCli {
@@ -53,7 +61,7 @@ pub struct CliCore {
 #[clap(
    help_template = TEMPLATE,
    long_about = None,
-   name = "Visual Studio Code CLI",
+   name = CLI_NAME,
    version = match constants::VSCODE_CLI_VERSION { Some(v) => v, None => "dev" },
  )]
 pub struct StandaloneCli {
@@ -115,7 +123,7 @@ impl<'a> From<&'a CliCore> for CodeServerArgs {
 
 #[derive(Subcommand, Debug, Clone)]
 pub enum StandaloneCommands {
-	/// Updates the VS Code CLI.
+	/// Updates the CLI.
 	Update(StandaloneUpdateArgs),
 }
 
@@ -133,14 +141,14 @@ pub enum Commands {
 	/// Run `code tunnel --help` for more usage info.
 	Tunnel(TunnelArgs),
 
-	/// Manage VS Code extensions.
+	/// Manage editor extensions.
 	#[clap(name = "ext")]
 	Extension(ExtensionArgs),
 
 	/// Print process usage and diagnostics information.
 	Status,
 
-	/// Changes the version of VS Code you're using.
+	/// Changes the version of the editor you're using.
 	Version(VersionArgs),
 }
 
@@ -251,16 +259,16 @@ pub struct VersionArgs {
 
 #[derive(Subcommand, Debug, Clone)]
 pub enum VersionSubcommand {
-	/// Switches the instance of VS Code in use.
+	/// Switches the version of the editor in use.
 	Use(UseVersionArgs),
 
-	/// Shows the currently configured VS Code version.
+	/// Shows the currently configured editor version.
 	Show,
 }
 
 #[derive(Args, Debug, Clone)]
 pub struct UseVersionArgs {
-	/// The version of VS Code you want to use. Can be "stable", "insiders",
+	/// The version of the editor you want to use. Can be "stable", "insiders",
 	/// a version number, or an absolute path to an existing install.
 	#[clap(value_name = "stable | insiders | x.y.z | path")]
 	pub name: String,
@@ -346,19 +354,19 @@ impl EditorOptions {
 	}
 }
 
-/// Arguments applicable whenever VS Code desktop is launched
+/// Arguments applicable whenever the desktop editor is launched
 #[derive(Args, Debug, Default, Clone)]
 pub struct DesktopCodeOptions {
 	/// Set the root path for extensions.
 	#[clap(long, value_name = "dir")]
 	pub extensions_dir: Option<String>,
 
 	/// Specifies the directory that user data is kept in. Can be used to
-	/// open multiple distinct instances of Code.
+	/// open multiple distinct instances of the editor.
 	#[clap(long, value_name = "dir")]
 	pub user_data_dir: Option<String>,
 
-	/// Sets the VS Code version to use for this command. The preferred version
+	/// Sets the editor version to use for this command. The preferred version
 	/// can be persisted with `code version use <version>`. Can be "stable",
 	/// "insiders", a version number, or an absolute path to an existing install.
 	#[clap(long, value_name = "stable | insiders | x.y.z | path")]
@@ -386,7 +394,7 @@ impl DesktopCodeOptions {
 
 #[derive(Args, Debug, Default, Clone)]
 pub struct GlobalOptions {
-	/// Directory where CLI metadata, such as VS Code installations, should be stored.
+	/// Directory where CLI metadata should be stored.
 	#[clap(long, env = "VSCODE_CLI_DATA_DIR", global = true)]
 	pub cli_data_dir: Option<String>,
 
@@ -464,7 +472,7 @@ pub struct EditorTroubleshooting {
 	#[clap(long, value_name = "memory")]
 	pub max_memory: Option<usize>,
 
-	/// Shows all telemetry events which VS code collects.
+	/// Shows all telemetry events which the editor collects.
 	#[clap(long)]
 	pub telemetry: bool,
 }

cli/src/bin/code/main.rs

@@ -6,6 +6,7 @@
 use indicatif::ProgressBar;
 
 use crate::{
+	constants::PRODUCT_NAME_LONG,
 	self_update::SelfUpdate,
 	update_service::UpdateService,
 	util::{errors::AnyError, http::ReqwestSimpleHttp, input::ProgressBarReporter},
@@ -23,8 +24,8 @@ pub async fn update(ctx: CommandContext, args: StandaloneUpdateArgs) -> Result<i
 	let current_version = update_service.get_current_release().await?;
 	if update_service.is_up_to_date_with(&current_version) {
 		ctx.log.result(format!(
-			"VS Code is already to to date ({})",
-			current_version.commit
+			"{} is already to to date ({})",
+			PRODUCT_NAME_LONG, current_version.commit
 		));
 		return Ok(1);
 	}

cli/src/commands/args.rs

@@ -58,9 +58,5 @@ pub async fn show(ctx: CommandContext) -> Result<i32, AnyError> {
 }
 
 fn print_now_using(log: &log::Logger, version: &RequestedVersion, path: &Path) {
-	log.result(&format!(
-		"Now using VS Code {} from {}",
-		version,
-		path.display()
-	));
+	log.result(&format!("Now using {} from {}", version, path.display()));
 }