mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-26 03:59:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Gracefully degrade diagnostics_in_range, diagnostic_group and file

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-12-17 16:37:12 +01:00
parent 6685d5aa7d
commit f0fe346e15
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/editor/src/multi_buffer.rs
View file

@ -685,7 +685,7 @@ impl MultiBuffer {
} }
pub fn file<'a>(&self, cx: &'a AppContext) -> Option<&'a dyn File> { pub fn file<'a>(&self, cx: &'a AppContext) -> Option<&'a dyn File> {
self.as_singleton().unwrap().read(cx).file() self.as_singleton()?.read(cx).file()
} }
#[cfg(test)] #[cfg(test)]
@ -1514,7 +1514,9 @@ impl MultiBufferSnapshot {
where where
O: text::FromAnchor + 'a, O: text::FromAnchor + 'a,
{ {
self.as_singleton().unwrap().diagnostic_group(group_id) self.as_singleton()
.into_iter()
.flat_map(move |buffer| buffer.diagnostic_group(group_id))
} }
pub fn diagnostics_in_range<'a, T, O>( pub fn diagnostics_in_range<'a, T, O>(
@ -1525,8 +1527,9 @@ impl MultiBufferSnapshot {
T: 'a + ToOffset, T: 'a + ToOffset,
O: 'a + text::FromAnchor, O: 'a + text::FromAnchor,
{ {
let range = range.start.to_offset(self)..range.end.to_offset(self); self.as_singleton().into_iter().flat_map(move |buffer| {
self.as_singleton().unwrap().diagnostics_in_range(range) buffer.diagnostics_in_range(range.start.to_offset(self)..range.end.to_offset(self))
})
} }
pub fn range_for_syntax_ancestor<T: ToOffset>(&self, range: Range<T>) -> Option<Range<usize>> { pub fn range_for_syntax_ancestor<T: ToOffset>(&self, range: Range<T>) -> Option<Range<usize>> {