mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[vfs] Don't confuse paths with source roots that have the same prefix

Browse source
This commit is contained in:
Wilfred Hughes 2024-04-05 15:40:43 -07:00
parent 7a8374c162
commit b03844d786
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/vfs/src/file_set.rs
View file

@ -132,6 +132,10 @@ impl FileSetConfig {
///
/// `scratch_space` is used as a buffer and will be entirely replaced.
fn classify(&self, path: &VfsPath, scratch_space: &mut Vec<u8>) -> usize {
// `path` is a file, but r-a only cares about the containing directory. We don't
// want `/foo/bar_baz.rs` to be attributed to source root directory `/foo/bar`.
let path = path.parent().unwrap_or_else(|| path.clone());
scratch_space.clear();
path.encode(scratch_space);
let automaton = PrefixOf::new(scratch_space.as_slice());

23
crates/vfs/src/file_set/tests.rs
View file

@ -40,3 +40,26 @@ fn name_prefix() {
let partition = file_set.partition(&vfs).into_iter().map(|it| it.len()).collect::<Vec<_>>();
assert_eq!(partition, vec![1, 1, 0]);
}
/// Ensure that we don't consider `/foo/bar_baz.rs` to be in the
/// `/foo/bar/` root.
#[test]
fn name_prefix_partially_matches() {
let mut file_set = FileSetConfig::builder();
file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo".into())]);
file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo/bar".into())]);
let file_set = file_set.build();
let mut vfs = Vfs::default();
// These two are both in /foo.
vfs.set_file_contents(VfsPath::new_virtual_path("/foo/lib.rs".into()), Some(Vec::new()));
vfs.set_file_contents(VfsPath::new_virtual_path("/foo/bar_baz.rs".into()), Some(Vec::new()));
// Only this file is in /foo/bar.
vfs.set_file_contents(VfsPath::new_virtual_path("/foo/bar/biz.rs".into()), Some(Vec::new()));
let partition = file_set.partition(&vfs).into_iter().map(|it| it.len()).collect::<Vec<_>>();
assert_eq!(partition, vec![2, 1, 0]);
}