Merge #1078

1078: rewrite syntax trees r=matklad a=matklad



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

1 files changed, 9 insertions, 6 deletions

diff --git a/crates/ra_syntax/src/syntax_text.rs b/crates/ra_syntax/src/syntax_text.rs
index 84e5b231a..6bb2ff461 100644
--- a/crates/ra_syntax/src/syntax_text.rs
+++ b/crates/ra_syntax/src/syntax_text.rs
@@ -1,6 +1,6 @@
 use std::{fmt, ops};
 
-use crate::{SyntaxNode, TextRange, TextUnit};
+use crate::{SyntaxNode, TextRange, TextUnit, SyntaxElement};
 
 #[derive(Clone)]
 pub struct SyntaxText<'a> {
@@ -15,11 +15,14 @@ impl<'a> SyntaxText<'a> {
 
     pub fn chunks(&self) -> impl Iterator<Item = &'a str> {
         let range = self.range;
-        self.node.descendants().filter_map(move |node| {
-            let text = node.leaf_text()?;
-            let range = range.intersection(&node.range())?;
-            let range = range - node.range().start();
-            Some(&text[range])
+        self.node.descendants_with_tokens().filter_map(move |el| match el {
+            SyntaxElement::Token(t) => {
+                let text = t.text();
+                let range = range.intersection(&t.range())?;
+                let range = range - t.range().start();
+                Some(&text[range])
+            }
+            SyntaxElement::Node(_) => None,
         })
     }