Merge branch 'main' into merogge/quick-fix-api

Author: Tyriar

build/azure-pipelines/cli/prepare.js

@@ -8,7 +8,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as packageJson from '../../../package.json';
 
-const root = path.dirname(path.dirname(path.dirname(__dirname)));
+const root = process.env.VSCODE_CLI_PREPARE_ROOT || path.dirname(path.dirname(path.dirname(__dirname)));
 const readJSON = (path: string) => JSON.parse(fs.readFileSync(path, 'utf8'));
 
 let productJsonPath: string;
@@ -19,8 +19,7 @@ if (isOSS) {
 	productJsonPath = path.join(root, 'quality', process.env.VSCODE_QUALITY!, 'product.json');
 }
 
-
-console.log('Loading product.json from', productJsonPath);
+console.error('Loading product.json from', productJsonPath);
 const product = readJSON(productJsonPath);
 const allProductsAndQualities = isOSS ? [product] : fs.readdirSync(path.join(root, 'quality'))
 	.map(quality => ({ quality, json: readJSON(path.join(root, 'quality', quality, 'product.json')) }));
@@ -48,7 +47,10 @@ 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_DOCUMENTATION_URL', product.documentationUrl],
 		['VSCODE_CLI_APPLICATION_NAME', product.applicationName],
+		['VSCODE_CLI_EDITOR_WEB_URL', product.tunnelApplicationConfig?.editorWebUrl],
 		['VSCODE_CLI_COMMIT', commit],
 		[
 			'VSCODE_CLI_WIN32_APP_IDS',
@@ -58,19 +60,34 @@ 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]}), {})));
-
-	for (const [key, value] of vars) {
-		if (value) {
-			console.log(`##vso[task.setvariable variable=${key}]${value}`);
+	if (process.env.VSCODE_CLI_PREPARE_OUTPUT === 'json') {
+		console.log(JSON.stringify([...vars].filter(([, v]) => !!v)));
+	} else {
+		for (const [key, value] of vars) {
+			if (value) {
+				console.log(`##vso[task.setvariable variable=${key}]${value}`);
+			}
 		}
 	}
+
 };
 
 if (require.main === module) {

build/azure-pipelines/cli/prepare.ts

@@ -378,7 +378,8 @@ function tweakProductForServerWeb(product) {
 						// TODO: we cannot inline `product.json` because
 						// it is being changed during build time at a later
 						// point in time (such as `checksums`)
-						'../product.json'
+						'../product.json',
+						'../package.json'
 					]
 				}
 			}

build/gulpfile.reh.js

@@ -119,7 +119,8 @@ const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
 					// TODO: we cannot inline `product.json` because
 					// it is being changed during build time at a later
 					// point in time (such as `checksums`)
-					'../product.json'
+					'../product.json',
+					'../package.json',
 				]
 			},
 			manual: [

build/gulpfile.vscode.js

@@ -46,6 +46,11 @@ clap_lex = "0.2"
 url = "2.3"
 async-trait = "0.1"
 log = "0.4"
+const_format = "0.2"
+
+[build-dependencies]
+serde = { version = "1.0" }
+serde_json = { version = "1.0" }
 
 [target.'cfg(windows)'.dependencies]
 windows-service = "0.5"

cli/Cargo.lock

@@ -5,11 +5,54 @@
 
 const FILE_HEADER: &str = "/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/";
 
-use std::{env, fs, io, path::PathBuf, process};
+use std::{
+	env, fs, io,
+	path::PathBuf,
+	process::{self, Command},
+	str::FromStr,
+};
 
 fn main() {
 	let files = enumerate_source_files().expect("expected to enumerate files");
 	ensure_file_headers(&files).expect("expected to ensure file headers");
+	apply_build_environment_variables();
+}
+
+fn apply_build_environment_variables() {
+	// only do this for local, debug builds
+	if env::var("PROFILE").unwrap() != "debug" {
+		return;
+	}
+
+	let pkg_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+	let mut cmd = Command::new("node");
+	cmd.arg("../build/azure-pipelines/cli/prepare.js");
+	cmd.current_dir(&pkg_dir);
+	cmd.env("VSCODE_CLI_PREPARE_OUTPUT", "json");
+
+	let mut distro_location = PathBuf::from_str(&pkg_dir).unwrap();
+	distro_location.pop(); // vscode dir
+	distro_location.pop(); // parent dir
+	distro_location.push("vscode-distro"); // distro dir, perhaps?
+	if distro_location.exists() {
+		cmd.env("VSCODE_CLI_PREPARE_ROOT", distro_location);
+		cmd.env("VSCODE_QUALITY", "insider");
+	}
+
+	let output = cmd.output().expect("expected to run prepare script");
+	if !output.status.success() {
+		eprint!(
+			"error running prepare script: {}",
+			String::from_utf8_lossy(&output.stderr)
+		);
+		process::exit(output.status.code().unwrap_or(1));
+	}
+
+	let vars = serde_json::from_slice::<Vec<(String, String)>>(&output.stdout)
+		.expect("expected to deserialize output");
+	for (key, value) in vars {
+		println!("cargo:rustc-env={}={}", key, value);
+	}
 }
 
 fn ensure_file_headers(files: &[PathBuf]) -> Result<(), io::Error> {

cli/Cargo.toml

@@ -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/build.rs

@@ -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)
 }