Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Assign diagnostics on buffer even if it doesn't have a language

Browse source 
This shouldn't be necessary in practice but makes testing easier.
This commit is contained in:
Nathan Sobo 2022-01-22 09:54:25 -07:00
parent 8bf628c17b
commit 83418204b6
2 changed files with 49 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/language/src/buffer.rs
View file

@ -869,19 +869,19 @@ impl Buffer {
}
let version = version.map(|version| version as usize);
let content = if let Some(version) = version {
let language_server = self.language_server.as_mut().unwrap();
language_server
.pending_snapshots
.retain(|&v, _| v >= version);
let snapshot = language_server
.pending_snapshots
.get(&version)
.ok_or_else(|| anyhow!("missing snapshot"))?;
&snapshot.buffer_snapshot
} else {
self.deref()
};
let content =
if let Some((version, language_server)) = version.zip(self.language_server.as_mut()) {
language_server
.pending_snapshots
.retain(|&v, _| v >= version);
let snapshot = language_server
.pending_snapshots
.get(&version)
.ok_or_else(|| anyhow!("missing snapshot"))?;
&snapshot.buffer_snapshot
} else {
self.deref()
};
diagnostics.sort_unstable_by(|a, b| {
Ordering::Equal