Merge branch 'main' into merogge/task-timing

Author: meganrogge

cli/src/tunnels.rs

@@ -12,6 +12,7 @@ pub mod shutdown_signal;
 pub mod singleton_client;
 pub mod singleton_server;
 
+mod wsl_detect;
 mod challenge;
 mod control_server;
 mod nosleep;

cli/src/tunnels/dev_tunnels.rs

@@ -4,8 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 use crate::auth;
 use crate::constants::{
-	CONTROL_PORT, IS_INTERACTIVE_CLI, PROTOCOL_VERSION_TAG, PROTOCOL_VERSION_TAG_PREFIX,
-	TUNNEL_SERVICE_USER_AGENT,
+	CONTROL_PORT, IS_INTERACTIVE_CLI, PROTOCOL_VERSION_TAG, TUNNEL_SERVICE_USER_AGENT,
 };
 use crate::state::{LauncherPaths, PersistedState};
 use crate::util::errors::{
@@ -32,6 +31,8 @@ use tunnels::management::{
 	NO_REQUEST_OPTIONS,
 };
 
+use super::wsl_detect::is_wsl_installed;
+
 #[derive(Clone, Serialize, Deserialize)]
 pub struct PersistedTunnel {
 	pub name: String,
@@ -304,7 +305,7 @@ impl DevTunnels {
 			return Ok((full_tunnel, persisted));
 		}
 
-		full_tunnel.tags = vec![name.to_string(), VSCODE_CLI_TUNNEL_TAG.to_string()];
+		full_tunnel.tags = self.get_tags(&name);
 
 		let new_tunnel = spanf!(
 			self.log,
@@ -383,11 +384,9 @@ impl DevTunnels {
 			}
 		};
 
-		if !tunnel.tags.iter().any(|t| t == PROTOCOL_VERSION_TAG) {
-			tunnel = self
-				.update_protocol_version_tag(tunnel, &HOST_TUNNEL_REQUEST_OPTIONS)
-				.await?;
-		}
+		tunnel = self
+			.sync_tunnel_tags(&persisted.name, tunnel, &HOST_TUNNEL_REQUEST_OPTIONS)
+			.await?;
 
 		let locator = TunnelLocator::try_from(&tunnel).unwrap();
 		let host_token = get_host_token_from_tunnel(&tunnel);
@@ -504,23 +503,40 @@ impl DevTunnels {
 		}
 	}
 
+	/// Gets the expected tunnel tags
+	fn get_tags(&self, name: &str) -> Vec<String> {
+		let mut tags = vec![
+			name.to_string(),
+			PROTOCOL_VERSION_TAG.to_string(),
+			VSCODE_CLI_TUNNEL_TAG.to_string(),
+		];
+
+		if is_wsl_installed(&self.log) {
+			tags.push("_wsl".to_string())
+		}
+
+		tags
+	}
+
 	/// Ensures the tunnel contains a tag for the current PROTCOL_VERSION, and no
 	/// other version tags.
-	async fn update_protocol_version_tag(
+	async fn sync_tunnel_tags(
 		&self,
+		name: &str,
 		tunnel: Tunnel,
 		options: &TunnelRequestOptions,
 	) -> Result<Tunnel, AnyError> {
+		let new_tags = self.get_tags(name);
+		if vec_eq_unsorted(&tunnel.tags, &new_tags) {
+			return Ok(tunnel);
+		}
+
 		debug!(
 			self.log,
-			"Updating tunnel protocol version tag to {}", PROTOCOL_VERSION_TAG
+			"Updating tunnel tags {} -> {}",
+			tunnel.tags.join(", "),
+			new_tags.join(", ")
 		);
-		let mut new_tags: Vec<String> = tunnel
-			.tags
-			.into_iter()
-			.filter(|t| !t.starts_with(PROTOCOL_VERSION_TAG_PREFIX))
-			.collect();
-		new_tags.push(PROTOCOL_VERSION_TAG.to_string());
 
 		let tunnel_update = Tunnel {
 			tags: new_tags,
@@ -982,6 +998,20 @@ fn clean_hostname_for_tunnel(hostname: &str) -> String {
 	}
 }
 
+fn vec_eq_unsorted(a: &[String], b: &[String]) -> bool {
+	if a.len() != b.len() {
+		return false;
+	}
+
+	for item in a {
+		if !b.contains(item) {
+			return false;
+		}
+	}
+
+	true
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;

cli/src/tunnels/wsl_detect.rs

@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+use crate::log;
+
+#[cfg(not(windows))]
+pub fn is_wsl_installed(_log: &log::Logger) -> bool {
+	false
+}
+
+#[cfg(windows)]
+pub fn is_wsl_installed(log: &log::Logger) -> bool {
+	use std::{path::PathBuf, process::Command};
+
+	let system32 = {
+		let sys_root = match std::env::var("SystemRoot") {
+			Ok(s) => s,
+			Err(_) => return false,
+		};
+
+		let is_32_on_64 = std::env::var("PROCESSOR_ARCHITEW6432").is_ok();
+		let mut system32 = PathBuf::from(sys_root);
+		system32.push(if is_32_on_64 { "Sysnative" } else { "System32" });
+		system32
+	};
+
+	// Windows builds < 22000
+	let mut maybe_lxss = system32.join("lxss");
+	maybe_lxss.push("LxssManager.dll");
+	if maybe_lxss.exists() {
+		trace!(log, "wsl availability detected via lxss");
+		return true;
+	}
+
+	// Windows builds >= 22000
+	let maybe_wsl = system32.join("wsl.exe");
+	if maybe_wsl.exists() {
+		if let Ok(s) = Command::new(maybe_wsl).arg("--status").output() {
+			if s.status.success() {
+				trace!(log, "wsl availability detected via subprocess");
+				return true;
+			}
+		}
+	}
+
+	trace!(log, "wsl not detected");
+
+	false
+}

extensions/emmet/yarn.lock

@@ -59,9 +59,9 @@
   integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
 
 "@vscode/emmet-helper@^2.8.8":
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.8.9.tgz#536a2cba2f78b0dd25a874b85ab95f9b5424eb39"
-  integrity sha512-ygpVStaePHt9aI9zk4NNJWI/NsRaeDSW1vQsZVmtpVRVCOdwYlsc3BfB/eppUu1OucT0x3OHDAzKcxnitjcSXQ==
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.9.2.tgz#cd5d1e64e7138ad76300e8cba5fd84f1c03e13ee"
+  integrity sha512-MaGuyW+fa13q3aYsluKqclmh62Hgp0BpKIqS66fCxfOaBcVQ1OnMQxRRgQUYnCkxFISAQlkJ0qWWPyXjro1Qrg==
   dependencies:
     emmet "^2.4.3"
     jsonc-parser "^2.3.0"

extensions/vscode-api-tests/src/singlefolder-tests/workspace.fs.test.ts

@@ -187,7 +187,6 @@ suite('vscode API - workspace-fs', () => {
 
 	test('vscode.workspace.fs error reporting is weird #132981', async function () {
 
-
 		const uri = await createRandomFile();
 
 		const source = vscode.Uri.joinPath(uri, `./${Math.random().toString(16).slice(2, 8)}`);
@@ -217,4 +216,48 @@ suite('vscode API - workspace-fs', () => {
 			assert.strictEqual(err.code, 'FileNotFound');
 		}
 	});
+
+	test('fs.createFolder creates recursively', async function () {
+
+		const folder = root.with({ path: posix.join(root.path, 'deeply', 'nested', 'folder') });
+		await vscode.workspace.fs.createDirectory(folder);
+
+		let stat = await vscode.workspace.fs.stat(folder);
+		assert.strictEqual(stat.type, vscode.FileType.Directory);
+
+		await vscode.workspace.fs.delete(folder, { recursive: true, useTrash: false });
+
+		await vscode.workspace.fs.createDirectory(folder); // calling on existing folder is also ok!
+
+		const file = root.with({ path: posix.join(folder.path, 'file.txt') });
+		await vscode.workspace.fs.writeFile(file, Buffer.from('Hello World'));
+		const folder2 = root.with({ path: posix.join(file.path, 'invalid') });
+		let e;
+		try {
+			await vscode.workspace.fs.createDirectory(folder2); // cannot create folder on file path
+		} catch (error) {
+			e = error;
+		}
+		assert.ok(e);
+
+		const folder3 = root.with({ path: posix.join(root.path, 'DEEPLY', 'NESTED', 'FOLDER') });
+		await vscode.workspace.fs.createDirectory(folder3); // calling on different cased folder is ok!
+		stat = await vscode.workspace.fs.stat(folder3);
+		assert.strictEqual(stat.type, vscode.FileType.Directory);
+
+		await vscode.workspace.fs.delete(folder, { recursive: true, useTrash: false });
+	});
+
+	test('fs.writeFile creates parents recursively', async function () {
+
+		const folder = root.with({ path: posix.join(root.path, 'other-deeply', 'nested', 'folder') });
+		const file = root.with({ path: posix.join(folder.path, 'file.txt') });
+
+		await vscode.workspace.fs.writeFile(file, Buffer.from('Hello World'));
+
+		const stat = await vscode.workspace.fs.stat(file);
+		assert.strictEqual(stat.type, vscode.FileType.File);
+
+		await vscode.workspace.fs.delete(folder, { recursive: true, useTrash: false });
+	});
 });

package.json

@@ -210,7 +210,7 @@
     "style-loader": "^3.3.2",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
-    "tsec": "0.1.4",
+    "tsec": "0.2.7",
     "typescript": "^5.2.0-dev.20230621",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.12.1",

src/tsec.exemptions.json

@@ -1,11 +1,15 @@
 {
+	"ban-document-execcommand": [
+		"vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts",
+		"vs/editor/contrib/clipboard/browser/clipboard.ts"
+	],
 	"ban-eval-calls": [
 		"vs/workbench/api/worker/extHostExtensionService.ts",
-		"vs/base/worker/workerMain"
+		"vs/base/worker/workerMain.ts"
 	],
 	"ban-function-calls": [
 		"vs/workbench/api/worker/extHostExtensionService.ts",
-		"vs/base/worker/workerMain",
+		"vs/base/worker/workerMain.ts",
 		"vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts",
 		"vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts"
 	],
@@ -18,8 +22,19 @@
 		"vs/base/browser/defaultWorkerFactory.ts",
 		"vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts"
 	],
+	"ban-worker-importscripts": [
+		"vs/workbench/services/extensions/worker/polyfillNestedWorker.ts",
+		"vs/workbench/api/worker/extensionHostWorker.ts",
+		"vs/base/worker/workerMain.ts"
+	],
 	"ban-domparser-parsefromstring": [
 		"vs/base/browser/markdownRenderer.ts",
 		"vs/base/test/browser/markdownRenderer.test.ts"
+	],
+	"ban-element-setattribute": [
+		"**/*.ts"
+	],
+	"ban-element-insertadjacenthtml": [
+		"**/*.ts"
 	]
 }

src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts

@@ -77,10 +77,9 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 	) {
 		super();
-
 		codeEditorService.willCreateDiffEditor();
 
-		this._contextKeyService.createKey(EditorContextKeys.inDiffEditor.key, true);
+		this._contextKeyService.createKey('isInDiffEditor', true);
 		this._contextKeyService.createKey('diffEditorVersion', 2);
 
 		this._options = new DiffEditorOptions(options);

src/vs/workbench/api/common/extHost.api.impl.ts

@@ -1020,7 +1020,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			registerFileSystemProvider(scheme, provider, options) {
 				return combinedDisposable(
 					extHostFileSystem.registerFileSystemProvider(extension, scheme, provider, options),
-					extHostConsumerFileSystem.addFileSystemProvider(scheme, provider)
+					extHostConsumerFileSystem.addFileSystemProvider(scheme, provider, options)
 				);
 			},
 			get fs() {