Skip to content

Fixes rust-analyzer include_dirs for crates with generated sources #3840

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
csmulhern wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes rust-analyzer include_dirs for crates with generated sources #3840

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion rust/private/rust_analyzer.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,10 @@ def _create_single_crate(ctx, attrs, info):
src_map = {src.short_path: src for src in srcs if src.is_source}
if info.crate.root.short_path in src_map:
crate["root_module"] = _WORKSPACE_TEMPLATE + src_map[info.crate.root.short_path].path
crate["source"]["include_dirs"].append(path_prefix + info.crate.root.dirname)
crate["source"]["include_dirs"].extend([
_WORKSPACE_TEMPLATE + src_map[info.crate.root.short_path].dirname,
path_prefix + info.crate.root.dirname,
])

if info.build_info != None and info.build_info.out_dir != None:
out_dir_path = info.build_info.out_dir.path
Expand Down
9 changes: 7 additions & 2 deletions test/rust_analyzer/generated_srcs_test/rust_project_json_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ mod tests {
assert!(with_gen.root_module.ends_with("/lib.rs"));

let include_dirs = &with_gen.source.as_ref().unwrap().include_dirs;
assert!(include_dirs.len() == 1);
assert!(include_dirs[0].starts_with(output_base));
assert_eq!(include_dirs.len(), 2);

// The first entry is the workspace directory.
assert!(!include_dirs[0].starts_with(output_base));

// The second entry is the output base, where the generated files are located.
assert!(include_dirs[1].starts_with(output_base));
}
}