migrate ra_hir to rowan 2.0

2 files changed, 38 insertions, 0 deletions

diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs
index 285dda1e0..0e303ee98 100644
--- a/crates/ra_syntax/src/ast.rs
+++ b/crates/ra_syntax/src/ast.rs
@@ -53,10 +53,37 @@ pub trait FnDefOwner: AstNode {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ItemOrMacro<'a> {
+    Item(&'a ModuleItem),
+    Macro(&'a MacroCall),
+}
+
 pub trait ModuleItemOwner: AstNode {
     fn items(&self) -> AstChildren<ModuleItem> {
         children(self)
     }
+    fn items_with_macros(&self) -> ItemOrMacroIter {
+        ItemOrMacroIter(self.syntax().children())
+    }
+}
+
+#[derive(Debug)]
+pub struct ItemOrMacroIter<'a>(SyntaxNodeChildren<'a>);
+
+impl<'a> Iterator for ItemOrMacroIter<'a> {
+    type Item = ItemOrMacro<'a>;
+    fn next(&mut self) -> Option<ItemOrMacro<'a>> {
+        loop {
+            let n = self.0.next()?;
+            if let Some(item) = ModuleItem::cast(n) {
+                return Some(ItemOrMacro::Item(item));
+            }
+            if let Some(call) = MacroCall::cast(n) {
+                return Some(ItemOrMacro::Macro(call));
+            }
+        }
+    }
 }
 
 pub trait TypeParamsOwner: AstNode {
diff --git a/crates/ra_syntax/src/yellow.rs b/crates/ra_syntax/src/yellow.rs
index f31efa174..1bf1806b9 100644
--- a/crates/ra_syntax/src/yellow.rs
+++ b/crates/ra_syntax/src/yellow.rs
@@ -47,6 +47,17 @@ where
     }
 }
 
+impl<T> PartialEq<T> for TreePtr<T>
+where
+    T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>,
+    T: PartialEq<T>,
+{
+    fn eq(&self, other: &T) -> bool {
+        let t: &T = self;
+        t == other
+    }
+}
+
 impl<T> Clone for TreePtr<T>
 where
     T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>,