diff options
Diffstat (limited to 'helix-view/src/editor.rs')
| -rw-r--r-- | helix-view/src/editor.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index 65e64b16..b6947e44 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -890,7 +890,7 @@ impl Editor { view.doc = doc_id; view.offset = Position::default(); - let doc = self.documents.get_mut(&doc_id).unwrap(); + let doc = doc_mut!(self, &doc_id); doc.ensure_view_init(view.id); // TODO: reuse align_view @@ -961,7 +961,7 @@ impl Editor { } Action::Load => { let view_id = view!(self).id; - let doc = self.documents.get_mut(&id).unwrap(); + let doc = doc_mut!(self, &id); doc.ensure_view_init(view_id); return; } @@ -982,7 +982,7 @@ impl Editor { }, ); // initialize selection for view - let doc = self.documents.get_mut(&id).unwrap(); + let doc = doc_mut!(self, &id); doc.ensure_view_init(view_id); } } @@ -1036,9 +1036,9 @@ impl Editor { } pub fn close(&mut self, id: ViewId) { - let view = self.tree.get(self.tree.focus); + let (_view, doc) = current!(self); // remove selection - self.documents.get_mut(&view.doc).unwrap().remove_view(id); + doc.remove_view(id); self.tree.remove(id); self._refresh(); } @@ -1112,7 +1112,7 @@ impl Editor { .unwrap_or_else(|| self.new_document(Document::default())); let view = View::new(doc_id, self.config().gutters.clone()); let view_id = self.tree.insert(view); - let doc = self.documents.get_mut(&doc_id).unwrap(); + let doc = doc_mut!(self, &doc_id); doc.ensure_view_init(view_id); } |