Skip to content

Commit

Permalink
fix: include launch args from test config (#1946)
Browse files Browse the repository at this point in the history
  • Loading branch information
connor4312 authored Feb 21, 2024
1 parent 1c26f2f commit 19cd302
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/build/generate-contributions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ const extensionHostConfig: IDebugger<IExtensionHostLaunchConfiguration> = {
testConfiguration: {
markdownDescription: refString('extensionHost.launch.testConfiguration'),
type: 'string',
default: '${workspaceaceFolder}/.vscode-test.js',
default: '${workspaceFolder}/.vscode-test.js',
},
testConfigurationLabel: {
markdownDescription: refString('extensionHost.launch.testConfigurationLabel'),
Expand Down
3 changes: 2 additions & 1 deletion src/ui/configuration/extensionHostConfigurationResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`,
];
Expand Down Expand Up @@ -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<string, string>;
Expand Down

0 comments on commit 19cd302

Please sign in to comment.