Merge remote-tracking branch 'origin/main' into tyriar/utility_ptyhost

Author: Tyriar

.git-blame-ignore

@@ -15,6 +15,9 @@ ae1452eea678f5266ef513f22dacebb90955d6c9
 # joaomoreno: add ghooks dev dependency
 0dfc06e0f9de5925de792cdf9f0e6597bb25908f
 
+# joaomoreno: line endings
+12ab70d329a13dd5b18d892cd40edd7138259bc3
+
 # mjbvz: organize imports
 494cbbd02d67e87727ec885f98d19551aa33aad1
 a3cb14be7f2cceadb17adf843675b1a59537dbbd

.vscode/launch.json

@@ -159,7 +159,7 @@
 				"--disable-extensions"
 			],
 			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
+				"${workspaceFolder}/extensions/vscode-api-tests/out/**/*.js"
 			],
 			"presentation": {
 				"group": "5_tests",
@@ -177,7 +177,7 @@
 				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-api-tests/out/workspace-tests"
 			],
 			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
+				"${workspaceFolder}/extensions/vscode-api-tests/out/**/*.js"
 			],
 			"presentation": {
 				"group": "5_tests",

build/azure-pipelines/cli/prepare.js

@@ -54,6 +54,7 @@ const setLauncherEnvironmentVars = () => {
 		['VSCODE_CLI_TUNNEL_SERVICE_MUTEX', product.win32TunnelServiceMutex],
 		['VSCODE_CLI_TUNNEL_CLI_MUTEX', product.win32TunnelMutex],
 		['VSCODE_CLI_COMMIT', commit],
+		['VSCODE_CLI_DEFAULT_PARENT_DATA_DIR', product.dataFolderName],
 		[
 			'VSCODE_CLI_WIN32_APP_IDS',
 			!isOSS && JSON.stringify(

build/azure-pipelines/cli/prepare.ts

@@ -36,7 +36,7 @@ async fn main() -> Result<(), std::convert::Infallible> {
 		});
 
 	let core = parsed.core();
-	let context_paths = LauncherPaths::new(&core.global_options.cli_data_dir).unwrap();
+	let context_paths = LauncherPaths::migrate(core.global_options.cli_data_dir.clone()).unwrap();
 	let context_args = core.clone();
 
 	// gets a command context without installing the global logger

cli/src/bin/code/main.rs

@@ -75,6 +75,12 @@ pub const TUNNEL_ACTIVITY_NAME: &str = concatcp!(PRODUCT_NAME_LONG, " Tunnel");
 
 const NONINTERACTIVE_VAR: &str = "VSCODE_CLI_NONINTERACTIVE";
 
+/// Default data CLI data directory.
+pub const DEFAULT_DATA_PARENT_DIR: &str = match option_env!("VSCODE_CLI_DEFAULT_PARENT_DATA_DIR") {
+	Some(n) => n,
+	None => ".vscode-oss",
+};
+
 pub fn get_default_user_agent() -> String {
 	format!(
 		"vscode-server-launcher/{}",

cli/src/constants.rs

@@ -6,15 +6,15 @@
 extern crate dirs;
 
 use std::{
-	fs::{create_dir, read_to_string, remove_dir_all, write},
+	fs::{create_dir_all, read_to_string, remove_dir_all, write},
 	path::{Path, PathBuf},
 	sync::{Arc, Mutex},
 };
 
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
-	constants::VSCODE_CLI_QUALITY,
+	constants::{DEFAULT_DATA_PARENT_DIR, VSCODE_CLI_QUALITY},
 	download_cache::DownloadCache,
 	util::errors::{wrap, AnyError, NoHomeForLauncherError, WrappedError},
 };
@@ -107,8 +107,38 @@ where
 }
 
 impl LauncherPaths {
-	pub fn new(root: &Option<String>) -> Result<LauncherPaths, AnyError> {
-		let root = root.as_deref().unwrap_or("~/.vscode-cli");
+	/// todo@conno4312: temporary migration from the old CLI data directory
+	pub fn migrate(root: Option<String>) -> Result<LauncherPaths, AnyError> {
+		if root.is_some() {
+			return Self::new(root);
+		}
+
+		let home_dir = match dirs::home_dir() {
+			None => return Self::new(root),
+			Some(d) => d,
+		};
+
+		let old_dir = home_dir.join(".vscode-cli");
+		let mut new_dir = home_dir;
+		new_dir.push(DEFAULT_DATA_PARENT_DIR);
+		new_dir.push("cli");
+		if !old_dir.exists() || new_dir.exists() {
+			return Self::new_for_path(new_dir);
+		}
+
+		if let Err(e) = std::fs::rename(&old_dir, &new_dir) {
+			// no logger exists at this point in the lifecycle, so just log to stderr
+			eprintln!(
+				"Failed to migrate old CLI data directory, will create a new one ({})",
+				e
+			);
+		}
+
+		Self::new_for_path(new_dir)
+	}
+
+	pub fn new(root: Option<String>) -> Result<LauncherPaths, AnyError> {
+		let root = root.unwrap_or_else(|| format!("~/{}/cli", DEFAULT_DATA_PARENT_DIR));
 		let mut replaced = root.to_owned();
 		for token in HOME_DIR_ALTS {
 			if root.contains(token) {
@@ -120,14 +150,16 @@ impl LauncherPaths {
 			}
 		}
 
-		if !Path::new(&replaced).exists() {
-			create_dir(&replaced)
-				.map_err(|e| wrap(e, format!("error creating directory {}", &replaced)))?;
+		Self::new_for_path(PathBuf::from(replaced))
+	}
+
+	fn new_for_path(root: PathBuf) -> Result<LauncherPaths, AnyError> {
+		if !root.exists() {
+			create_dir_all(&root)
+				.map_err(|e| wrap(e, format!("error creating directory {}", root.display())))?;
 		}
 
-		Ok(LauncherPaths::new_without_replacements(PathBuf::from(
-			replaced,
-		)))
+		Ok(LauncherPaths::new_without_replacements(root))
 	}
 
 	pub fn new_without_replacements(root: PathBuf) -> LauncherPaths {

cli/src/state.rs

@@ -482,11 +482,10 @@
     "@types/node": "16.x"
   },
   "dependencies": {
-    "@emmetio/abbreviation": "^2.2.0",
     "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
     "@emmetio/html-matcher": "^0.3.3",
-    "@emmetio/math-expression": "^1.0.4",
-    "@vscode/emmet-helper": "^2.3.0",
+    "@emmetio/math-expression": "^1.0.5",
+    "@vscode/emmet-helper": "^2.8.8",
     "image-size": "~1.0.0",
     "vscode-languageserver-textdocument": "^1.0.1"
   },