From 5809e9eb031d9b4ba6d4e613f8d53a7ed21eaab1 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Fri, 22 Jan 2021 15:48:21 +0100 Subject: [PATCH] testresolver: support server extensions --- extensions/vscode-test-resolver/src/extension.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts index 92aa3d3d9c9..fed26d59426 100644 --- a/extensions/vscode-test-resolver/src/extension.ts +++ b/extensions/vscode-test-resolver/src/extension.ts @@ -82,6 +82,13 @@ export function activate(context: vscode.ExtensionContext) { const commandArgs = ['--port=0', '--disable-telemetry']; const env = getNewEnv(); const remoteDataDir = process.env['TESTRESOLVER_DATA_FOLDER'] || path.join(os.homedir(), serverDataFolderName || `${dataFolderName}-testresolver`); + + const remoteExtension = process.env['TESTRESOLVER_REMOTE_EXTENSION']; + if (remoteExtension) { + commandArgs.push('--install-extension', remoteExtension); + commandArgs.push('--start-server'); + } + env['VSCODE_AGENT_FOLDER'] = remoteDataDir; outputChannel.appendLine(`Using data folder at ${remoteDataDir}`); @@ -100,6 +107,7 @@ export function activate(context: vscode.ExtensionContext) { } outputChannel.appendLine(`Using server build at ${serverLocation}`); + outputChannel.appendLine(`Server arguments ${commandArgs.join(' ')}`); extHostProcess = cp.spawn(path.join(serverLocation, serverCommand), commandArgs, { env, cwd: serverLocation }); }