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

Implement navigation via outline modal

Browse source 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Max Brunsfeld 2022-01-13 11:48:44 -08:00
parent 373fe6fadf
commit f2cef0b795
2 changed files with 114 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/go_to_line/src/go_to_line.rs
View file

@ -26,7 +26,7 @@ pub struct GoToLine {
line_editor: ViewHandle<Editor>,
active_editor: ViewHandle<Editor>,
restore_state: Option<RestoreState>,
line_selection: Option<Selection<usize>>,
line_selection_id: Option<usize>,
cursor_point: Point,
max_point: Point,
}
@ -84,7 +84,7 @@ impl GoToLine {
line_editor,
active_editor,
restore_state,
line_selection: None,
line_selection_id: None,
cursor_point,
max_point,
}
@ -139,14 +139,18 @@ impl GoToLine {
column.map(|column| column.saturating_sub(1)).unwrap_or(0),
)
}) {
self.line_selection = self.active_editor.update(cx, |active_editor, cx| {
self.line_selection_id = self.active_editor.update(cx, |active_editor, cx| {
let snapshot = active_editor.snapshot(cx).display_snapshot;
let point = snapshot.buffer_snapshot.clip_point(point, Bias::Left);
let display_point = point.to_display_point(&snapshot);
let row = display_point.row();
active_editor.select_ranges([point..point], Some(Autoscroll::Center), cx);
active_editor.set_highlighted_rows(Some(row..row + 1));
Some(active_editor.newest_selection(&snapshot.buffer_snapshot))
Some(
active_editor
.newest_selection::<usize>(&snapshot.buffer_snapshot)
.id,
)
});
cx.notify();
}
@ -160,14 +164,14 @@ impl Entity for GoToLine {
type Event = Event;
fn release(&mut self, cx: &mut MutableAppContext) {
let line_selection = self.line_selection.take();
let line_selection_id = self.line_selection_id.take();
let restore_state = self.restore_state.take();
self.active_editor.update(cx, |editor, cx| {
editor.set_highlighted_rows(None);
if let Some((line_selection, restore_state)) = line_selection.zip(restore_state) {
if let Some((line_selection_id, restore_state)) = line_selection_id.zip(restore_state) {
let newest_selection =
editor.newest_selection::<usize>(&editor.buffer().read(cx).read(cx));
if line_selection.id == newest_selection.id {
if line_selection_id == newest_selection.id {
editor.set_scroll_position(restore_state.scroll_position, cx);
editor.update_selections(restore_state.selections, None, cx);
}