Skip to content

Enable 'envFile' for cppdbg #3723

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
WardenGnaw merged 7 commits into from
Jun 11, 2019
Merged

Enable 'envFile' for cppdbg #3723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
09edf3d
Enable 'envFile' for cppdbg
WardenGnaw Jun 3, 2019
05cd36d
Fix help text
WardenGnaw Jun 3, 2019
cc026d9
Spelling
WardenGnaw Jun 3, 2019
3175a41
Merge branch 'master' into dev/waan/envFileCppdbg
sean-mcmanus Jun 3, 2019
9cafaa0
Merge branch 'master' into dev/waan/envFileCppdbg
WardenGnaw Jun 5, 2019
a7c4cb1
Merge branch 'master' into dev/waan/envFileCppdbg
WardenGnaw Jun 6, 2019
cfad6cb
Merge branch 'master' into dev/waan/envFileCppdbg
WardenGnaw Jun 11, 2019
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
9 changes: 7 additions & 2 deletions Extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,11 @@
},
"default": []
},
"envFile": {
"type": "string",
"description": "Absolute path to a file containing environment variable definitions. This file has key value pairs separated by an equals sign per line. E.g. KEY=VALUE",
"default": "${workspaceFolder}/.env"
},
"additionalSOLibSearchPath": {
"type": "string",
"description": "Semicolon separated list of directories to use to search for .so files. Example: \"c:\\dir1;c:\\dir2\".",
Expand Down Expand Up @@ -1219,7 +1224,7 @@
},
"envFile": {
"type": "string",
"description": "Absolute path to a file containing environment variable definitions. These file has key value pairs sepearted by an equals sign per line. E.g. KEY=VALUE",
"description": "Absolute path to a file containing environment variable definitions. This file has key value pairs separated by an equals sign per line. E.g. KEY=VALUE",
"default": "${workspaceFolder}/.env"
},
"symbolSearchPath": {
Expand Down Expand Up @@ -1665,4 +1670,4 @@
"binaries": []
}
]
}
}
28 changes: 14 additions & 14 deletions Extension/src/Debugger/configurationProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,23 +197,23 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
config.environment = [disableDebugHeapEnvSetting];
}
}
}

// Add environment variables from .env file
if (config.envFile) {
try {
const parsedFile: ParsedEnvironmentFile = ParsedEnvironmentFile.CreateFromFile(config.envFile.replace(/\${workspaceFolder}/g, folder.uri.path), config["environment"]);
// show error message if single lines cannot get parsed
if (parsedFile.Warning) {
CppConfigurationProvider.showFileWarningAsync(parsedFile.Warning, config.envFile);
}
// Add environment variables from .env file
if (config.envFile) {
try {
const parsedFile: ParsedEnvironmentFile = ParsedEnvironmentFile.CreateFromFile(config.envFile.replace(/\${workspaceFolder}/g, folder.uri.path), config["environment"]);

// show error message if single lines cannot get parsed
if (parsedFile.Warning) {
CppConfigurationProvider.showFileWarningAsync(parsedFile.Warning, config.envFile);
}

config.environment = parsedFile.Env;
config.environment = parsedFile.Env;

delete config.envFile;
} catch (e) {
throw new Error("Can't parse envFile " + config.envFile);
}
delete config.envFile;
} catch (e) {
throw new Error("Can't parse envFile " + config.envFile);
}
}

Expand Down
7 changes: 6 additions & 1 deletion Extension/tools/OptionsSchema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@
},
"default": []
},
"envFile": {
"type": "string",
"description": "Absolute path to a file containing environment variable definitions. This file has key value pairs separated by an equals sign per line. E.g. KEY=VALUE",
"default": "${workspaceFolder}/.env"
},
"additionalSOLibSearchPath": {
"type": "string",
"description": "Semicolon separated list of directories to use to search for .so files. Example: \"c:\\dir1;c:\\dir2\".",
Expand Down Expand Up @@ -431,7 +436,7 @@
},
"envFile": {
"type": "string",
"description": "Absolute path to a file containing environment variable definitions. These file has key value pairs sepearted by an equals sign per line. E.g. KEY=VALUE",
"description": "Absolute path to a file containing environment variable definitions. This file has key value pairs separated by an equals sign per line. E.g. KEY=VALUE",
"default": "${workspaceFolder}/.env"
},
"symbolSearchPath": {
Expand Down