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

Hack in show next diagnostic command

Browse source 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
Nathan Sobo 2021-11-16 16:14:46 -07:00 • committed by Max Brunsfeld
parent 52a4c15c14
commit 18354c5e04
1 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,6 +83,7 @@ action!(AddSelectionBelow);
action!(SelectLargerSyntaxNode); action!(SelectLargerSyntaxNode);
action!(SelectSmallerSyntaxNode); action!(SelectSmallerSyntaxNode);
action!(MoveToEnclosingBracket); action!(MoveToEnclosingBracket);
action!(ShowNextDiagnostic);
action!(PageUp); action!(PageUp);
action!(PageDown); action!(PageDown);
action!(Fold); action!(Fold);
@ -184,6 +185,7 @@ pub fn init(cx: &mut MutableAppContext) {
Binding::new("ctrl-w", SelectLargerSyntaxNode, Some("Editor")), Binding::new("ctrl-w", SelectLargerSyntaxNode, Some("Editor")),
Binding::new("alt-down", SelectSmallerSyntaxNode, Some("Editor")), Binding::new("alt-down", SelectSmallerSyntaxNode, Some("Editor")),
Binding::new("ctrl-shift-W", SelectSmallerSyntaxNode, Some("Editor")), Binding::new("ctrl-shift-W", SelectSmallerSyntaxNode, Some("Editor")),
Binding::new("ctrl-.", ShowNextDiagnostic, Some("Editor")),
Binding::new("ctrl-m", MoveToEnclosingBracket, Some("Editor")), Binding::new("ctrl-m", MoveToEnclosingBracket, Some("Editor")),
Binding::new("pageup", PageUp, Some("Editor")), Binding::new("pageup", PageUp, Some("Editor")),
Binding::new("pagedown", PageDown, Some("Editor")), Binding::new("pagedown", PageDown, Some("Editor")),
@ -242,6 +244,7 @@ pub fn init(cx: &mut MutableAppContext) {
cx.add_action(Editor::select_larger_syntax_node); cx.add_action(Editor::select_larger_syntax_node);
cx.add_action(Editor::select_smaller_syntax_node); cx.add_action(Editor::select_smaller_syntax_node);
cx.add_action(Editor::move_to_enclosing_bracket); cx.add_action(Editor::move_to_enclosing_bracket);
cx.add_action(Editor::show_next_diagnostic);
cx.add_action(Editor::page_up); cx.add_action(Editor::page_up);
cx.add_action(Editor::page_down); cx.add_action(Editor::page_down);
cx.add_action(Editor::fold); cx.add_action(Editor::fold);
@ -2199,6 +2202,39 @@ impl Editor {
self.update_selections(selections, true, cx); self.update_selections(selections, true, cx);
} }
pub fn show_next_diagnostic(&mut self, _: &ShowNextDiagnostic, cx: &mut ViewContext<Self>) {
let selection = self.selections::<usize>(cx).last().unwrap();
let buffer = self.buffer.read(cx.as_ref());
let diagnostic_group_id = dbg!(buffer
.diagnostics_in_range::<_, usize>(selection.head()..buffer.len())
.next())
.map(|(_, diagnostic)| diagnostic.group_id);
if let Some(group_id) = diagnostic_group_id {
self.display_map.update(cx, |display_map, cx| {
let buffer = self.buffer.read(cx);
let diagnostic_group = buffer
.diagnostic_group::<Point>(group_id)
.map(|(range, diagnostic)| (range, format!("{}\n", diagnostic.message)))
.collect::<Vec<_>>();
dbg!(group_id, &diagnostic_group);
display_map.insert_blocks(
diagnostic_group
.iter()
.map(|(range, message)| BlockProperties {
position: range.start,
text: message.as_str(),
runs: vec![],
disposition: BlockDisposition::Above,
}),
cx,
);
});
}
}
fn build_columnar_selection( fn build_columnar_selection(
&mut self, &mut self,
display_map: &DisplayMapSnapshot, display_map: &DisplayMapSnapshot,