andrey/helix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expand doc/view macros to allow fetching specific id

Browse Source 
This simplifies the code and hides away unwraps
This commit is contained in:
Blaž Hrastnik 2022-09-03 12:36:06 +09:00
parent 1caba2d3e8
commit 6ec4017a8d
No known key found for this signature in database
GPG Key ID: 1238B9C4AD889640
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helix-term/src/ui/editor.rs
View File

@ -1061,7 +1061,7 @@ fn handle_mouse_event(
let editor = &mut cxt.editor;
if let Some((pos, view_id)) = pos_and_view(editor, row, column) {
let doc = editor.document_mut(editor.tree.get(view_id).doc).unwrap();
let doc = doc_mut!(editor, &view!(editor, view_id).doc);
if modifiers == KeyModifiers::ALT {
let selection = doc.selection(view_id).clone();
@ -1190,7 +1190,7 @@ fn handle_mouse_event(
}
if let Some((pos, view_id)) = pos_and_view(editor, row, column) {
let doc = editor.document_mut(editor.tree.get(view_id).doc).unwrap();
let doc = doc_mut!(editor, &view!(editor, view_id).doc);
doc.set_selection(view_id, Selection::point(pos));
cxt.editor.focus(view_id);
commands::MappableCommand::paste_primary_clipboard_before.execute(cxt);
@ -1320,8 +1320,8 @@ fn handle_event(
if cx.editor.tree.contains(focus) {
let config = cx.editor.config();
let mode = cx.editor.mode();
let view = cx.editor.tree.get_mut(focus);
let doc = cx.editor.documents.get_mut(&view.doc).unwrap();
let view = view_mut!(cx.editor, focus);
let doc = doc_mut!(cx.editor, &view.doc);
view.ensure_cursor_in_view(doc, config.scrolloff);

12
helix-view/src/editor.rs
View File

@ -890,7 +890,7 @@ fn replace_document_in_view(&mut self, current_view: ViewId, doc_id: DocumentId)
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 @@ pub fn switch(&mut self, id: DocumentId, action: Action) {
}
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 @@ pub fn switch(&mut self, id: DocumentId, action: Action) {
},
);
// 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 @@ pub fn open(&mut self, path: &Path, action: Action) -> Result<DocumentId, Error>
}
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 @@ enum Action {
.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);
}

14
helix-view/src/macros.rs
View File

@ -14,7 +14,7 @@ macro_rules! current {
($editor:expr) => {{
let view = $crate::view_mut!($editor);
let id = view.doc;
let doc = $editor.documents.get_mut(&id).unwrap();
let doc = $crate::doc_mut!($editor, &id);
(view, doc)
}};
}
@ -32,6 +32,9 @@ macro_rules! current_ref {
/// Returns `&mut Document`
#[macro_export]
macro_rules! doc_mut {
($editor:expr, $id:expr) => {{
$editor.documents.get_mut($id).unwrap()
}};
($editor:expr) => {{
$crate::current!($editor).1
}};
@ -41,6 +44,9 @@ macro_rules! doc_mut {
/// Returns `&mut View`
#[macro_export]
macro_rules! view_mut {
($editor:expr, $id:expr) => {{
$editor.tree.get_mut($id)
}};
($editor:expr) => {{
$editor.tree.get_mut($editor.tree.focus)
}};
@ -50,6 +56,9 @@ macro_rules! view_mut {
/// Returns `&View`
#[macro_export]
macro_rules! view {
($editor:expr, $id:expr) => {{
$editor.tree.get($id)
}};
($editor:expr) => {{
$editor.tree.get($editor.tree.focus)
}};
@ -57,6 +66,9 @@ macro_rules! view {
#[macro_export]
macro_rules! doc {
($editor:expr, $id:expr) => {{
$editor.documents[$id]
}};
($editor:expr) => {{
$crate::current_ref!($editor).1
}};