Skip to content

Fix issue 5102 #5189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 27, 2022
Merged

Fix issue 5102 #5189

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4904cfd
Enable variable substitution for debug configuration
karolz-ms Apr 27, 2022
2e55d0b
No need for extra substitution for envFile in OmniSharp code
karolz-ms Apr 27, 2022
3b42ccd
Code review feedback
karolz-ms Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/configurationProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export class CSharpConfigurationProvider implements vscode.DebugConfigurationPro
/**
* Try to add all missing attributes to the debug configuration being launched.
*/
resolveDebugConfiguration(folder: vscode.WorkspaceFolder | undefined, config: vscode.DebugConfiguration, token?: vscode.CancellationToken): vscode.ProviderResult<vscode.DebugConfiguration> {
resolveDebugConfigurationWithSubstitutedVariables(folder: vscode.WorkspaceFolder | undefined, config: vscode.DebugConfiguration, token?: vscode.CancellationToken): vscode.ProviderResult<vscode.DebugConfiguration> {

if (!config.type) {
// If the config doesn't look functional force VSCode to open a configuration file https://github.com/Microsoft/vscode/issues/54213
Expand All @@ -155,15 +155,15 @@ export class CSharpConfigurationProvider implements vscode.DebugConfigurationPro

if (config.request === "launch") {
if (!config.cwd && !config.pipeTransport) {
config.cwd = "${workspaceFolder}";
config.cwd = folder?.uri?.fsPath; // Workspace folder
}
if (!config.internalConsoleOptions) {
config.internalConsoleOptions = "openOnSessionStart";
}

// read from envFile and set config.env
if (config.envFile) {
config = this.parseEnvFile(config.envFile.replace(/\${workspaceFolder}/g, folder.uri.fsPath), config);
config = this.parseEnvFile(config.envFile, config);
}
}

Expand Down