Skip to content

fix: fix test binary path extraction, filter quoting, and DWARF symbols #49

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

Open
elliot-gustafsson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: fix test binary path extraction, filter quoting, and DWARF symbols #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 11 additions & 13 deletions src/zig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ impl zed::Extension for ZigExtension {
let mut args: Vec<String> = build_task
.args
.into_iter()
// TODO verify if this is required on non-Windows platforms
.map(|s| s.replace("\"", "'"))
.map(|s| s.trim_matches(['\"', '\'']).to_string())
.collect();
args.push("-fllvm".into());
args.push("--test-no-exec".into());
args.push(format!("-femit-bin={test_exe_path}"));

Expand All @@ -224,7 +224,11 @@ impl zed::Extension for ZigExtension {
_ => return None,
};

let config = serde_json::Value::Null;
let config = serde_json::json!({
"initCommands": [
"settings set target.inline-breakpoint-strategy always"
],
});
let Ok(config) = serde_json::to_string(&config) else {
return None;
};
Expand Down Expand Up @@ -269,17 +273,11 @@ impl zed::Extension for ZigExtension {
let program = build_task
.args
.iter()
.find_map(|arg| {
arg.strip_prefix("-femit-bin=").map(|arg| {
arg.split("=")
.nth(1)
.ok_or("Expected binary path in -femit-bin=")
.map(|path| path.trim_end_matches(".exe"))
})
})
.ok_or("Failed to extract binary path from command args")
.flatten()?
.find_map(|arg| arg.strip_prefix("-femit-bin="))
.ok_or("Failed to extract binary path from command args")?
.trim_end_matches(".exe")
.to_string();

let request = zed::LaunchRequest {
program,
cwd: build_task.cwd,
Expand Down