Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 06:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #672

Browse source 
672: dont overwrite memfies r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-01-26 12:42:14 +00:00
commit 05d0c493c9
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_vfs/src/lib.rs
View file

@ -264,8 +264,10 @@ impl Vfs {
self.pending_changes.push(change); self.pending_changes.push(change);
} }
TaskResult::AddSingleFile { root, path, text } => { TaskResult::AddSingleFile { root, path, text } => {
if self.find_file(root, &path).is_none() {
self.do_add_file(root, path, text, false); self.do_add_file(root, path, text, false);
} }
}
TaskResult::ChangeSingleFile { root, path, text } => { TaskResult::ChangeSingleFile { root, path, text } => {
if let Some(file) = self.find_file(root, &path) { if let Some(file) = self.find_file(root, &path) {
self.do_change_file(file, text, false); self.do_change_file(file, text, false);

12
crates/ra_vfs/tests/vfs.rs
View file

@ -165,6 +165,18 @@ fn test_vfs_works() -> std::io::Result<()> {
assert_eq!(path, "sub1/sub2/new1.rs") assert_eq!(path, "sub1/sub2/new1.rs")
); );
{
vfs.add_file_overlay(&dir.path().join("a/memfile.rs"), "memfile".to_string());
assert_match!(
vfs.commit_changes().as_slice(),
[VfsChange::AddFile { text, .. }],
assert_eq!(text.as_str(), "memfile")
);
fs::write(&dir.path().join("a/memfile.rs"), "ignore me").unwrap();
process_tasks(&mut vfs, 1);
assert_match!(vfs.commit_changes().as_slice(), []);
}
// should be ignored // should be ignored
fs::create_dir_all(dir.path().join("a/target")).unwrap(); fs::create_dir_all(dir.path().join("a/target")).unwrap();
fs::write(&dir.path().join("a/target/new.rs"), "ignore me").unwrap(); fs::write(&dir.path().join("a/target/new.rs"), "ignore me").unwrap();