mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-07 02:57:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Invalidate active diagnostic when its primary range collapses

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-11-19 16:38:23 +01:00
parent b0afc80678
commit c844fcdc09
1 changed files with 41 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
crates/editor/src/lib.rs
View file

@ -344,7 +344,6 @@ struct ActiveDiagnosticGroup {
primary_message: String, primary_message: String,
blocks: HashMap<BlockId, Diagnostic>, blocks: HashMap<BlockId, Diagnostic>,
is_valid: bool, is_valid: bool,
update_count: usize,
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
@ -2277,52 +2276,49 @@ impl Editor {
fn refresh_active_diagnostics(&mut self, cx: &mut ViewContext<Editor>) { fn refresh_active_diagnostics(&mut self, cx: &mut ViewContext<Editor>) {
if let Some(active_diagnostics) = self.active_diagnostics.as_mut() { if let Some(active_diagnostics) = self.active_diagnostics.as_mut() {
let buffer = self.buffer.read(cx); let buffer = self.buffer.read(cx);
let update_count = buffer.diagnostics_update_count(); let primary_range_start = active_diagnostics.primary_range.start.to_offset(buffer);
if update_count > active_diagnostics.update_count { let is_valid = buffer
active_diagnostics.update_count = update_count; .diagnostics_in_range::<_, usize>(active_diagnostics.primary_range.clone())
let primary_range_start = active_diagnostics.primary_range.start.to_offset(buffer); .any(|(range, diagnostic)| {
let is_valid = buffer diagnostic.is_primary
.diagnostics_in_range::<_, usize>(active_diagnostics.primary_range.clone()) && !range.is_empty()
.any(|(range, diagnostic)| { && range.start == primary_range_start
diagnostic.is_primary && diagnostic.message == active_diagnostics.primary_message
&& range.start == primary_range_start });
&& diagnostic.message == active_diagnostics.primary_message
});
if is_valid != active_diagnostics.is_valid { if is_valid != active_diagnostics.is_valid {
active_diagnostics.is_valid = is_valid; active_diagnostics.is_valid = is_valid;
let mut new_styles = HashMap::new(); let mut new_styles = HashMap::new();
for (block_id, diagnostic) in &active_diagnostics.blocks { for (block_id, diagnostic) in &active_diagnostics.blocks {
let severity = diagnostic.severity; let severity = diagnostic.severity;
let message_len = diagnostic.message.len(); let message_len = diagnostic.message.len();
new_styles.insert( new_styles.insert(
*block_id, *block_id,
( (
Some({ Some({
let build_settings = self.build_settings.clone(); let build_settings = self.build_settings.clone();
move |cx: &AppContext| { move |cx: &AppContext| {
let settings = build_settings.borrow()(cx); let settings = build_settings.borrow()(cx);
vec![( vec![(
message_len, message_len,
diagnostic_style(severity, is_valid, &settings.style) diagnostic_style(severity, is_valid, &settings.style)
.text .text
.into(), .into(),
)] )]
} }
}), }),
Some({ Some({
let build_settings = self.build_settings.clone(); let build_settings = self.build_settings.clone();
move |cx: &AppContext| { move |cx: &AppContext| {
let settings = build_settings.borrow()(cx); let settings = build_settings.borrow()(cx);
diagnostic_style(severity, is_valid, &settings.style).block diagnostic_style(severity, is_valid, &settings.style).block
} }
}), }),
), ),
); );
}
self.display_map
.update(cx, |display_map, _| display_map.restyle_blocks(new_styles));
} }
self.display_map
.update(cx, |display_map, _| display_map.restyle_blocks(new_styles));
} }
} }
} }
@ -2332,7 +2328,6 @@ impl Editor {
self.active_diagnostics = self.display_map.update(cx, |display_map, cx| { self.active_diagnostics = self.display_map.update(cx, |display_map, cx| {
let buffer = self.buffer.read(cx); let buffer = self.buffer.read(cx);
let update_count = buffer.diagnostics_update_count();
let mut primary_range = None; let mut primary_range = None;
let mut primary_message = None; let mut primary_message = None;
let mut group_end = Point::zero(); let mut group_end = Point::zero();
@ -2400,7 +2395,6 @@ impl Editor {
primary_message, primary_message,
blocks, blocks,
is_valid: true, is_valid: true,
update_count,
}) })
}); });
} }