bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use cwd from runnable.args for debugger

Browse source
This commit is contained in:
roife 2024-05-22 14:29:34 +08:00
parent 7b54c8231e
commit 1a37cfb703
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/tools/rust-analyzer/editors/code/src/debug.ts
View file

@ -192,7 +192,7 @@ function getCCppDebugConfig(
name: runnable.label, name: runnable.label,
program: executable, program: executable,
args: runnable.args.executableArgs, args: runnable.args.executableArgs,
cwd: runnable.args.workspaceRoot, cwd: runnable.args.cwd || runnable.args.workspaceRoot || ".",
sourceFileMap, sourceFileMap,
env, env,
// See https://github.com/rust-lang/rust-analyzer/issues/16901#issuecomment-2024486941 // See https://github.com/rust-lang/rust-analyzer/issues/16901#issuecomment-2024486941
@ -214,7 +214,7 @@ function getCodeLldbDebugConfig(
name: runnable.label, name: runnable.label,
program: executable, program: executable,
args: runnable.args.executableArgs, args: runnable.args.executableArgs,
cwd: runnable.args.workspaceRoot, cwd: runnable.args.cwd || runnable.args.workspaceRoot || ".",
sourceMap: sourceFileMap, sourceMap: sourceFileMap,
sourceLanguages: ["rust"], sourceLanguages: ["rust"],
env, env,
@ -234,7 +234,7 @@ function getNativeDebugConfig(
target: executable, target: executable,
// See https://github.com/WebFreak001/code-debug/issues/359 // See https://github.com/WebFreak001/code-debug/issues/359
arguments: quote(runnable.args.executableArgs), arguments: quote(runnable.args.executableArgs),
cwd: runnable.args.workspaceRoot, cwd: runnable.args.cwd || runnable.args.workspaceRoot || ".",
env, env,
valuesFormatting: "prettyPrinters", valuesFormatting: "prettyPrinters",
}; };

1
src/tools/rust-analyzer/editors/code/src/lsp_ext.ts
View file

@ -226,6 +226,7 @@ export type Runnable = {
kind: "cargo"; kind: "cargo";
args: { args: {
workspaceRoot?: string; workspaceRoot?: string;
cwd?: string;
cargoArgs: string[]; cargoArgs: string[];
cargoExtraArgs: string[]; cargoExtraArgs: string[];
executableArgs: string[]; executableArgs: string[];