language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Missing runnable env on debug target

Browse source 
Fix bug in Rust Analyzer where runnable debugging did not pass
environment variable from configuration to child process of Cargo
on binary build stage
This commit is contained in:
Rungsikorn Rungsikavarnich 2023-03-30 15:22:20 +09:00
parent 17e31b7d3b
commit fb9a1dd87e
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
editors/code/src/debug.ts
View file

@ -118,8 +118,8 @@ async function getDebugConfiguration(
return path.normalize(p).replace(wsFolder, "${workspaceFolder" + workspaceQualifier + "}");
}
const executable = await getDebugExecutable(runnable);
const env = prepareEnv(runnable, ctx.config.runnableEnv);
const executable = await getDebugExecutable(runnable, env);
let sourceFileMap = debugOptions.sourceFileMap;
if (sourceFileMap === "auto") {
// let's try to use the default toolchain
@ -156,8 +156,11 @@ async function getDebugConfiguration(
return debugConfig;
}
async function getDebugExecutable(runnable: ra.Runnable): Promise<string> {
const cargo = new Cargo(runnable.args.workspaceRoot || ".", debugOutput);
async function getDebugExecutable(
runnable: ra.Runnable,
env: Record<string, string>
): Promise<string> {
const cargo = new Cargo(runnable.args.workspaceRoot || ".", debugOutput, env);
const executable = await cargo.executableFromArgs(runnable.args.cargoArgs);
// if we are here, there were no compilation errors.