Improve autocompletion by looking on the type and name

Signed-off-by: Benjamin Coenen <[email protected]>

1 files changed, 11 insertions, 21 deletions

diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs
index 40c8fca3b..93aa3d45f 100644
--- a/crates/ra_syntax/src/ast/expr_extensions.rs
+++ b/crates/ra_syntax/src/ast/expr_extensions.rs
@@ -1,7 +1,7 @@
 //! Various extension methods to ast Expr Nodes, which are hard to code-generate.
 
 use crate::{
-    ast::{self, child_opt, children, AstChildren, AstNode},
+    ast::{self, support, AstChildren, AstNode},
     SmolStr,
     SyntaxKind::*,
     SyntaxToken, T,
@@ -36,7 +36,7 @@ impl ast::IfExpr {
         let res = match self.blocks().nth(1) {
             Some(block) => ElseBranch::Block(block),
             None => {
-                let elif: ast::IfExpr = child_opt(self)?;
+                let elif: ast::IfExpr = support::child(self.syntax())?;
                 ElseBranch::IfExpr(elif)
             }
         };
@@ -44,17 +44,7 @@ impl ast::IfExpr {
     }
 
     fn blocks(&self) -> AstChildren<ast::BlockExpr> {
-        children(self)
-    }
-}
-
-impl ast::RefExpr {
-    pub fn is_mut(&self) -> bool {
-        self.syntax().children_with_tokens().any(|n| n.kind() == T![mut])
-    }
-
-    pub fn raw_token(&self) -> Option<SyntaxToken> {
-        None // FIXME: implement &raw
+        support::children(self.syntax())
     }
 }
 
@@ -212,15 +202,15 @@ impl ast::BinExpr {
     }
 
     pub fn lhs(&self) -> Option<ast::Expr> {
-        children(self).next()
+        support::children(self.syntax()).next()
     }
 
     pub fn rhs(&self) -> Option<ast::Expr> {
-        children(self).nth(1)
+        support::children(self.syntax()).nth(1)
     }
 
     pub fn sub_exprs(&self) -> (Option<ast::Expr>, Option<ast::Expr>) {
-        let mut children = children(self);
+        let mut children = support::children(self.syntax());
         let first = children.next();
         let second = children.next();
         (first, second)
@@ -275,10 +265,10 @@ impl ast::RangeExpr {
 
 impl ast::IndexExpr {
     pub fn base(&self) -> Option<ast::Expr> {
-        children(self).next()
+        support::children(self.syntax()).next()
     }
     pub fn index(&self) -> Option<ast::Expr> {
-        children(self).nth(1)
+        support::children(self.syntax()).nth(1)
     }
 }
 
@@ -291,11 +281,11 @@ impl ast::ArrayExpr {
     pub fn kind(&self) -> ArrayExprKind {
         if self.is_repeat() {
             ArrayExprKind::Repeat {
-                initializer: children(self).next(),
-                repeat: children(self).nth(1),
+                initializer: support::children(self.syntax()).next(),
+                repeat: support::children(self.syntax()).nth(1),
             }
         } else {
-            ArrayExprKind::ElementList(children(self))
+            ArrayExprKind::ElementList(support::children(self.syntax()))
         }
     }