squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #6785

Browse source 
6785: Fix "no value set for FileTextQuery(FileId(..))" r=jonas-schievink a=jonas-schievink

Fixes https://github.com/rust-analyzer/rust-analyzer/issues/6622

Let's hope I got it right this time, but I feel like I slowly begin to understand the main loop logic.

bors r+

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
This commit is contained in:
bors[bot] 2020-12-09 16:32:03 +00:00 committed by GitHub
parent 99118eeccd 6857989f6f
commit 243ba330dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/rust-analyzer/src/cli/load_cargo.rs
View file

@ -73,7 +73,7 @@ fn load(
}
vfs::loader::Message::Loaded { files } => {
for (path, contents) in files {
vfs.set_file_contents(path.into(), contents)
vfs.set_file_contents(path.into(), contents);
}
}
}

16
crates/rust-analyzer/src/main_loop.rs
View file

@ -255,7 +255,7 @@ impl GlobalState {
for (path, contents) in files {
let path = VfsPath::from(path);
if !self.mem_docs.contains_key(&path) {
vfs.set_file_contents(path, contents)
vfs.set_file_contents(path, contents);
}
}
}
@ -503,11 +503,21 @@ impl GlobalState {
{
log::error!("duplicate DidOpenTextDocument: {}", path)
}
this.vfs
let changed = this
.vfs
.write()
.0
.set_file_contents(path, Some(params.text_document.text.into_bytes()));
this.maybe_update_diagnostics();
// If the VFS contents are unchanged, update diagnostics, since `handle_event`
// won't see any changes. This avoids missing diagnostics when opening a file.
//
// If the file *was* changed, `handle_event` will already recompute and send
// diagnostics. We can't do it here, since the *current* file contents might be
// unset in salsa, since the VFS change hasn't been applied to the database yet.
if !changed {
this.maybe_update_diagnostics();
}
}
Ok(())
})?

9
crates/vfs/src/lib.rs
View file

@ -103,18 +103,19 @@ impl Vfs {
(file_id, path)
})
}
pub fn set_file_contents(&mut self, path: VfsPath, contents: Option<Vec<u8>>) {
pub fn set_file_contents(&mut self, path: VfsPath, contents: Option<Vec<u8>>) -> bool {
let file_id = self.alloc_file_id(path);
let change_kind = match (&self.get(file_id), &contents) {
(None, None) => return,
(None, None) => return false,
(None, Some(_)) => ChangeKind::Create,
(Some(_), None) => ChangeKind::Delete,
(Some(old), Some(new)) if old == new => return,
(Some(old), Some(new)) if old == new => return false,
(Some(_), Some(_)) => ChangeKind::Modify,
};
*self.get_mut(file_id) = contents;
self.changes.push(ChangedFile { file_id, change_kind })
self.changes.push(ChangedFile { file_id, change_kind });
true
}
pub fn has_changes(&self) -> bool {
!self.changes.is_empty()