Merge #449

449: switch to new rowan API r=matklad a=matklad

closes https://github.com/rust-analyzer/rust-analyzer/issues/448

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 10 insertions, 6 deletions

diff --git a/crates/ra_syntax/src/algo.rs b/crates/ra_syntax/src/algo.rs
index 4b3548ea9..13f50d2ef 100644
--- a/crates/ra_syntax/src/algo.rs
+++ b/crates/ra_syntax/src/algo.rs
@@ -1,19 +1,23 @@
 pub mod visit;
 
-use crate::{SyntaxNode, SyntaxNodeRef, TextRange, TextUnit};
+use rowan::TransparentNewType;
+
+use crate::{SyntaxNode, TextRange, TextUnit};
 
 pub use rowan::LeafAtOffset;
 
-pub fn find_leaf_at_offset(node: SyntaxNodeRef, offset: TextUnit) -> LeafAtOffset<SyntaxNodeRef> {
+pub fn find_leaf_at_offset(node: &SyntaxNode, offset: TextUnit) -> LeafAtOffset<&SyntaxNode> {
     match node.0.leaf_at_offset(offset) {
         LeafAtOffset::None => LeafAtOffset::None,
-        LeafAtOffset::Single(n) => LeafAtOffset::Single(SyntaxNode(n)),
-        LeafAtOffset::Between(l, r) => LeafAtOffset::Between(SyntaxNode(l), SyntaxNode(r)),
+        LeafAtOffset::Single(n) => LeafAtOffset::Single(SyntaxNode::from_repr(n)),
+        LeafAtOffset::Between(l, r) => {
+            LeafAtOffset::Between(SyntaxNode::from_repr(l), SyntaxNode::from_repr(r))
+        }
     }
 }
 
-pub fn find_covering_node(root: SyntaxNodeRef, range: TextRange) -> SyntaxNodeRef {
-    SyntaxNode(root.0.covering_node(range))
+pub fn find_covering_node(root: &SyntaxNode, range: TextRange) -> &SyntaxNode {
+    SyntaxNode::from_repr(root.0.covering_node(range))
 }
 
 pub fn generate<T>(seed: Option<T>, step: impl Fn(&T) -> Option<T>) -> impl Iterator<Item = T> {