hanyixuanten/vscode-cpptools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update envFile variable substitution (#3848)

Browse Source 
* Update envFile variable substitution

In launch.json, the `envFile` configuration can substitute
${workspaceFolder}, ${workspaceRoot} and ${env::???}.

* Fix lint issues
This commit is contained in:
Andrew Wang
2019-06-27 17:52:58 -07:00
committed by GitHub
parent 5de420ee70
commit 0502351002
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Extension/src/Debugger/configurationProvider.ts
+11 -3
View File
@@ -201,9 +201,17 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
// Add environment variables from .env file
if (config.envFile) {
// replace ${env:???} variables
let envFilePath: string = util.resolveVariables(config.envFile, null);
try {
const parsedFile: ParsedEnvironmentFile = ParsedEnvironmentFile.CreateFromFile(config.envFile.replace(/\${workspaceFolder}/g, folder.uri.path), config["environment"]);
if (folder && folder.uri && folder.uri.fsPath) {
// Try to replace ${workspaceFolder} or ${workspaceRoot}
envFilePath = envFilePath.replace(/(\${workspaceFolder}|\${workspaceRoot})/g, folder.uri.fsPath);
}
const parsedFile: ParsedEnvironmentFile = ParsedEnvironmentFile.CreateFromFile(envFilePath, config["environment"]);
// show error message if single lines cannot get parsed
if (parsedFile.Warning) {
CppConfigurationProvider.showFileWarningAsync(parsedFile.Warning, config.envFile);
@@ -213,7 +221,7 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
delete config.envFile;
} catch (e) {
throw new Error("Can't parse envFile " + config.envFile);
throw new Error(`Can't parse envFile (${envFilePath}): ${e.message}`);
}
}