From 19cd30297dc05b7a7fa9d1d02a8e9dfc1749362e Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Wed, 21 Feb 2024 14:04:39 -0800 Subject: [PATCH] fix: include launch args from test config (#1946) Refs https://github.com/microsoft/vscode/issues/199211 --- src/build/generate-contributions.ts | 2 +- src/ui/configuration/extensionHostConfigurationResolver.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/build/generate-contributions.ts b/src/build/generate-contributions.ts index 793f34580..8488b6c04 100644 --- a/src/build/generate-contributions.ts +++ b/src/build/generate-contributions.ts @@ -967,7 +967,7 @@ const extensionHostConfig: IDebugger = { testConfiguration: { markdownDescription: refString('extensionHost.launch.testConfiguration'), type: 'string', - default: '${workspaceaceFolder}/.vscode-test.js', + default: '${workspaceFolder}/.vscode-test.js', }, testConfigurationLabel: { markdownDescription: refString('extensionHost.launch.testConfigurationLabel'), diff --git a/src/ui/configuration/extensionHostConfigurationResolver.ts b/src/ui/configuration/extensionHostConfigurationResolver.ts index ef5fcdee5..2893dd700 100644 --- a/src/ui/configuration/extensionHostConfigurationResolver.ts +++ b/src/ui/configuration/extensionHostConfigurationResolver.ts @@ -67,6 +67,7 @@ export class ExtensionHostConfigurationResolver config.env = { ...config.env, ...testCfg.env }; config.args = [ ...(config.args || []), + ...(testCfg.config.launchArgs || []), `--extensionDevelopmentPath=${testCfg.extensionDevelopmentPath}`, `--extensionTestsPath=${testCfg.extensionTestsPath}`, ]; @@ -141,7 +142,7 @@ const resolveTestConfiguration = async (config: ResolvingExtensionHostConfigurat ); const configs: { - config: { label?: string }; + config: { label?: string; launchArgs?: string[] }; extensionTestsPath: string; extensionDevelopmentPath: string; env: Record;