@@ -11,10 +11,19 @@
1111/// Returns `(&mut View, &mut Document)`
1212#[macro_export]
1313macro_rules! current {
14− ( $( $editor:ident ).+ ) => {{
15− let view = $crate::view_mut!( $( $editor ).+ );
14+ ($editor:expr) => {{
15+ let view = $crate::view_mut!($editor);
1616 let id = view.doc;
17− let doc = $( $editor ).+ .documents.get_mut(&id).unwrap();
17+ let doc = $editor.documents.get_mut(&id).unwrap();
18+ (view, doc)
19+ }};
20+}
21+
22+#[macro_export]
23+macro_rules! current_ref {
24+ ($editor:expr) => {{
25+ let view = $editor.tree.get($editor.tree.focus);
26+ let doc = &$editor.documents[&view.doc];
1827 (view, doc)
1928 }};
2029}
@@ -23,8 +32,8 @@ macro_rules! current {
2332/// Returns `&mut Document`
2433#[macro_export]
2534macro_rules! doc_mut {
26− ( $( $editor:ident ).+ ) => {{
27− $crate::current!( $( $editor ).+ ).1
35+ ($editor:expr) => {{
36+ $crate::current!($editor).1
2837 }};
2938}
3039
@@ -32,8 +41,8 @@ macro_rules! doc_mut {
3241/// Returns `&mut View`
3342#[macro_export]
3443macro_rules! view_mut {
35− ( $( $editor:ident ).+ ) => {{
36− $( $editor ).+ .tree.get_mut($( $editor ).+ .tree.focus)
44+ ($editor:expr) => {{
45+ $editor.tree.get_mut($editor.tree.focus)
3746 }};
3847}
3948
@@ -41,23 +50,14 @@ macro_rules! view_mut {
4150/// Returns `&View`
4251#[macro_export]
4352macro_rules! view {
44− ( $( $editor:ident ).+ ) => {{
45− $( $editor ).+ .tree.get($( $editor ).+ .tree.focus)
53+ ($editor:expr) => {{
54+ $editor.tree.get($editor.tree.focus)
4655 }};
4756}
4857
4958#[macro_export]
5059macro_rules! doc {
51− ( $( $editor:ident ).+ ) => {{
52− $crate::current_ref!( $( $editor ).+ ).1
53− }};
54−}
55−
56−#[macro_export]
57−macro_rules! current_ref {
58− ( $( $editor:ident ).+ ) => {{
59− let view = $( $editor ).+ .tree.get($( $editor ).+ .tree.focus);
60− let doc = &$( $editor ).+ .documents[&view.doc];
61− (view, doc)
60+ ($editor:expr) => {{
61+ $crate::current_ref!($editor).1
6262 }};
6363}