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

Merge pull request #973 from zed-industries/selections-refactor

Browse source 
Pull selections out of editor into selections collection
This commit is contained in:
Keith Simmons 2022-05-13 16:07:26 -07:00 • committed by GitHub
commit 2f7eb6dbc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 1998 additions and 1722 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/outline/src/outline.rs
View file

@ -172,9 +172,7 @@ impl PickerDelegate for OutlineView {
let editor = self.active_editor.read(cx);
let buffer = editor.buffer().read(cx).read(cx);
let cursor_offset = editor
.newest_selection_with_snapshot::<usize>(&buffer)
.head();
let cursor_offset = editor.selections.newest::<usize>(cx).head();
selected_index = self
.outline
.items
@ -217,7 +215,9 @@ impl PickerDelegate for OutlineView {
if let Some(rows) = active_editor.highlighted_rows() {
let snapshot = active_editor.snapshot(cx).display_snapshot;
let position = DisplayPoint::new(rows.start, 0).to_point(&snapshot);
active_editor.select_ranges([position..position], Some(Autoscroll::Center), cx);
active_editor.change_selections(Some(Autoscroll::Center), cx, |s| {
s.select_ranges([position..position])
});
}
});
cx.emit(Event::Dismissed);