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

Set the document version after changes are applied but before vfs

Browse source
This commit is contained in:
kjeremy 2020-07-23 17:40:43 -04:00
parent bd44f3a620
commit c9531dc797
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -420,14 +420,17 @@ impl GlobalState {
})?
.on::<lsp_types::notification::DidChangeTextDocument>(|this, params| {
if let Ok(path) = from_proto::vfs_path(&params.text_document.uri) {
*this.mem_docs.get_mut(&path).unwrap() = params.text_document.version;
let doc = this.mem_docs.get_mut(&path).unwrap();
let vfs = &mut this.vfs.write().0;
let file_id = vfs.file_id(&path).unwrap();
let mut text = String::from_utf8(vfs.file_contents(file_id).to_vec()).unwrap();
apply_document_changes(&mut text, params.content_changes);
vfs.set_file_contents(path.clone(), Some(text.into_bytes()));
this.mem_docs.insert(path, params.text_document.version);
// The version passed in DidChangeTextDocument is the version after all edits are applied
// so we should apply it before the vfs is notified.
*doc = params.text_document.version;
vfs.set_file_contents(path.clone(), Some(text.into_bytes()));
}
Ok(())
})?