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

Author: Tyriar

.vscode/settings.json

@@ -168,7 +168,6 @@
 	"[github-issues]": {
 		"editor.wordWrap": "on"
 	},
-	"extensions.experimental.supportWorkspaceExtensions": true,
 	"css.format.spaceAroundSelectorSeparator": true,
 	"inlineChat.mode": "live",
 	"typescript.enablePromptUseWorkspaceTsdk": true,

build/npm/gyp/yarn.lock

@@ -493,11 +493,6 @@ minipass@^3.0.0:
   dependencies:
     yallist "^4.0.0"
 
-minipass@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.3.tgz#00bfbaf1e16e35e804f4aa31a7c1f6b8d9f0ee72"
-  integrity sha512-OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw==
-
 minipass@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
@@ -743,10 +738,10 @@ strip-ansi@^7.0.1:
   dependencies:
     ansi-regex "^6.0.1"
 
-tar@^6.1.11:
-  version "6.1.15"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69"
-  integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
+tar@^6.1.11, tar@^6.1.2:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -755,18 +750,6 @@ tar@^6.1.11:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-tar@^6.1.2:
-  version "6.1.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
-  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^4.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
 unique-filename@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"

cli/Cargo.lock

@@ -606,7 +606,9 @@ impl<'a> ServerBuilder<'a> {
 		// Original issue: https://github.com/microsoft/vscode/issues/184058
 		// Partial fix: https://github.com/microsoft/vscode/pull/184621
 		#[cfg(target_os = "windows")]
-		let cmd = cmd.creation_flags(winapi::um::winbase::CREATE_NO_WINDOW);
+		let cmd = cmd.creation_flags(
+			winapi::um::winbase::CREATE_NO_WINDOW | winapi::um::winbase::CREATE_NEW_PROCESS_GROUP | winapi::um::winbase::CREATE_BREAKAWAY_FROM_JOB,
+		);
 
 		let child = cmd
 			.stderr(std::process::Stdio::piped())

cli/src/tunnels/code_server.rs

@@ -86,7 +86,7 @@ impl ServiceManager for LaunchdService {
 		match capture_command_and_check_status("launchctl", &["stop", &get_service_label()]).await {
 			Ok(_) => {}
 			// status 3 == "no such process"
-			Err(CodeError::CommandFailed { code, .. }) if code == 3 => {}
+			Err(CodeError::CommandFailed { code: 3, .. }) => {}
 			Err(e) => return Err(wrap(e, "error stopping service").into()),
 		};
 

cli/src/tunnels/service_macos.rs

@@ -494,7 +494,7 @@
           ]
         },
         "markdown.editor.filePaste.enabled": {
-          "type": "boolean",
+          "type": "string",
           "scope": "resource",
           "markdownDescription": "%configuration.markdown.editor.filePaste.enabled%",
           "default": "smart",

extensions/markdown-language-features/package.json

@@ -18,30 +18,26 @@ import { conditionalRegistration, requireMinVersion, requireSomeCapability } fro
 
 
 interface OrganizeImportsCommandMetadata {
-	readonly ids: readonly string[];
 	readonly title: string;
 	readonly minVersion?: API;
 	readonly kind: vscode.CodeActionKind;
 	readonly mode: OrganizeImportsMode;
 }
 
 const organizeImportsCommand: OrganizeImportsCommandMetadata = {
-	ids: ['typescript.organizeImports'],
 	title: vscode.l10n.t("Organize Imports"),
 	kind: vscode.CodeActionKind.SourceOrganizeImports,
 	mode: OrganizeImportsMode.All,
 };
 
 const sortImportsCommand: OrganizeImportsCommandMetadata = {
-	ids: ['typescript.sortImports', 'javascript.sortImports'],
 	minVersion: API.v430,
 	title: vscode.l10n.t("Sort Imports"),
 	kind: vscode.CodeActionKind.Source.append('sortImports'),
 	mode: OrganizeImportsMode.SortAndCombine,
 };
 
 const removeUnusedImportsCommand: OrganizeImportsCommandMetadata = {
-	ids: ['typescript.removeUnusedImports', 'javascript.removeUnusedImports'],
 	minVersion: API.v490,
 	title: vscode.l10n.t("Remove Unused Imports"),
 	kind: vscode.CodeActionKind.Source.append('removeUnusedImports'),
@@ -50,14 +46,14 @@ const removeUnusedImportsCommand: OrganizeImportsCommandMetadata = {
 
 class OrganizeImportsCommand implements Command {
 
+	public static readonly ID = '_typescript.organizeImports';
+	public readonly id = OrganizeImportsCommand.ID;
+
 	constructor(
-		public readonly id: string,
-		private readonly commandMetadata: OrganizeImportsCommandMetadata,
-		private readonly client: ITypeScriptServiceClient,
 		private readonly telemetryReporter: TelemetryReporter,
 	) { }
 
-	public async execute(file?: string): Promise<any> {
+	public async execute(): Promise<any> {
 		/* __GDPR__
 			"organizeImports.execute" : {
 				"owner": "mjbvz",
@@ -67,48 +63,20 @@ class OrganizeImportsCommand implements Command {
 			}
 		*/
 		this.telemetryReporter.logTelemetry('organizeImports.execute', {});
-		if (!file) {
-			const activeEditor = vscode.window.activeTextEditor;
-			if (!activeEditor) {
-				vscode.window.showErrorMessage(vscode.l10n.t("Organize Imports failed. No resource provided."));
-				return;
-			}
-
-			const resource = activeEditor.document.uri;
-			const document = await vscode.workspace.openTextDocument(resource);
-			const openedFiledPath = this.client.toOpenTsFilePath(document);
-			if (!openedFiledPath) {
-				vscode.window.showErrorMessage(vscode.l10n.t("Organize Imports failed. Unknown file type."));
-				return;
-			}
-
-			file = openedFiledPath;
-		}
-
-		const args: Proto.OrganizeImportsRequestArgs = {
-			scope: {
-				type: 'file',
-				args: {
-					file
-				}
-			},
-			// Deprecated in 4.9; `mode` takes priority
-			skipDestructiveCodeActions: this.commandMetadata.mode === OrganizeImportsMode.SortAndCombine,
-			mode: typeConverters.OrganizeImportsMode.toProtocolOrganizeImportsMode(this.commandMetadata.mode),
-		};
-		const response = await this.client.interruptGetErr(() => this.client.execute('organizeImports', args, nulToken));
-		if (response.type !== 'response' || !response.body) {
-			return;
-		}
+	}
+}
 
-		if (response.body.length) {
-			const edits = typeConverters.WorkspaceEdit.fromFileCodeEdits(this.client, response.body);
-			return vscode.workspace.applyEdit(edits);
-		}
+class ImportCodeAction extends vscode.CodeAction {
+	constructor(
+		title: string,
+		kind: vscode.CodeActionKind,
+		public readonly document: vscode.TextDocument,
+	) {
+		super(title, kind);
 	}
 }
 
-class ImportsCodeActionProvider implements vscode.CodeActionProvider {
+class ImportsCodeActionProvider implements vscode.CodeActionProvider<ImportCodeAction> {
 
 	constructor(
 		private readonly client: ITypeScriptServiceClient,
@@ -117,31 +85,62 @@ class ImportsCodeActionProvider implements vscode.CodeActionProvider {
 		private readonly fileConfigManager: FileConfigurationManager,
 		telemetryReporter: TelemetryReporter,
 	) {
-		for (const id of commandMetadata.ids) {
-			commandManager.register(new OrganizeImportsCommand(id, commandMetadata, client, telemetryReporter));
-		}
+		commandManager.register(new OrganizeImportsCommand(telemetryReporter));
 	}
 
 	public provideCodeActions(
 		document: vscode.TextDocument,
 		_range: vscode.Range,
 		context: vscode.CodeActionContext,
-		token: vscode.CancellationToken
-	): vscode.CodeAction[] {
+		_token: vscode.CancellationToken
+	): ImportCodeAction[] {
+		if (!context.only?.contains(this.commandMetadata.kind)) {
+			return [];
+		}
+
 		const file = this.client.toOpenTsFilePath(document);
 		if (!file) {
 			return [];
 		}
 
-		if (!context.only?.contains(this.commandMetadata.kind)) {
-			return [];
+		return [new ImportCodeAction(this.commandMetadata.title, this.commandMetadata.kind, document)];
+	}
+
+	async resolveCodeAction(codeAction: ImportCodeAction, token: vscode.CancellationToken): Promise<ImportCodeAction | undefined> {
+		const response = await this.client.interruptGetErr(async () => {
+			await this.fileConfigManager.ensureConfigurationForDocument(codeAction.document, token);
+			if (token.isCancellationRequested) {
+				return;
+			}
+
+			const file = this.client.toOpenTsFilePath(codeAction.document);
+			if (!file) {
+				return;
+			}
+
+			const args: Proto.OrganizeImportsRequestArgs = {
+				scope: {
+					type: 'file',
+					args: { file }
+				},
+				// Deprecated in 4.9; `mode` takes priority
+				skipDestructiveCodeActions: this.commandMetadata.mode === OrganizeImportsMode.SortAndCombine,
+				mode: typeConverters.OrganizeImportsMode.toProtocolOrganizeImportsMode(this.commandMetadata.mode),
+			};
+
+			return this.client.execute('organizeImports', args, nulToken);
+		});
+		if (response?.type !== 'response' || !response.body || token.isCancellationRequested) {
+			return;
+		}
+
+		if (response.body.length) {
+			codeAction.edit = typeConverters.WorkspaceEdit.fromFileCodeEdits(this.client, response.body);
 		}
 
-		this.fileConfigManager.ensureConfigurationForDocument(document, token);
+		codeAction.command = { command: OrganizeImportsCommand.ID, title: '', arguments: [] };
 
-		const action = new vscode.CodeAction(this.commandMetadata.title, this.commandMetadata.kind);
-		action.command = { title: '', command: this.commandMetadata.ids[0], arguments: [file] };
-		return [action];
+		return codeAction;
 	}
 }
 

extensions/typescript-language-features/src/languageFeatures/organizeImports.ts

@@ -53,8 +53,7 @@
     "treeViewActiveItem",
     "treeViewReveal",
     "workspaceTrust",
-    "telemetry",
-    "windowActivity"
+    "telemetry"
   ],
   "private": true,
   "activationEvents": [],

extensions/vscode-api-tests/package.json

@@ -81,14 +81,14 @@
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-canvas": "0.7.0-beta.12",
-    "@xterm/addon-image": "0.8.0-beta.12",
-    "@xterm/addon-search": "0.15.0-beta.12",
-    "@xterm/addon-serialize": "0.13.0-beta.12",
-    "@xterm/addon-unicode11": "0.8.0-beta.12",
-    "@xterm/addon-webgl": "0.18.0-beta.12",
-    "@xterm/headless": "5.5.0-beta.12",
-    "@xterm/xterm": "5.5.0-beta.12",
+    "@xterm/addon-canvas": "0.8.0-beta.2",
+    "@xterm/addon-image": "0.9.0-beta.2",
+    "@xterm/addon-search": "0.16.0-beta.2",
+    "@xterm/addon-serialize": "0.14.0-beta.2",
+    "@xterm/addon-unicode11": "0.9.0-beta.2",
+    "@xterm/addon-webgl": "0.19.0-beta.2",
+    "@xterm/headless": "5.6.0-beta.2",
+    "@xterm/xterm": "5.6.0-beta.2",
     "graceful-fs": "4.2.11",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",

package.json

@@ -13,14 +13,14 @@
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-canvas": "0.7.0-beta.12",
-    "@xterm/addon-image": "0.8.0-beta.12",
-    "@xterm/addon-search": "0.15.0-beta.12",
-    "@xterm/addon-serialize": "0.13.0-beta.12",
-    "@xterm/addon-unicode11": "0.8.0-beta.12",
-    "@xterm/addon-webgl": "0.18.0-beta.12",
-    "@xterm/headless": "5.5.0-beta.12",
-    "@xterm/xterm": "5.5.0-beta.12",
+    "@xterm/addon-canvas": "0.8.0-beta.2",
+    "@xterm/addon-image": "0.9.0-beta.2",
+    "@xterm/addon-search": "0.16.0-beta.2",
+    "@xterm/addon-serialize": "0.14.0-beta.2",
+    "@xterm/addon-unicode11": "0.9.0-beta.2",
+    "@xterm/addon-webgl": "0.19.0-beta.2",
+    "@xterm/headless": "5.6.0-beta.2",
+    "@xterm/xterm": "5.6.0-beta.2",
     "cookie": "^0.4.0",
     "graceful-fs": "4.2.11",
     "http-proxy-agent": "^7.0.0",