added eq_token() method to LetStmt

2 files changed, 8 insertions, 2 deletions

diff --git a/crates/ra_assists/src/assists/add_explicit_type.rs b/crates/ra_assists/src/assists/add_explicit_type.rs
index 713abf910..38a351a54 100644
--- a/crates/ra_assists/src/assists/add_explicit_type.rs
+++ b/crates/ra_assists/src/assists/add_explicit_type.rs
@@ -1,7 +1,6 @@
 use hir::{db::HirDatabase, HirDisplay};
 use ra_syntax::{
     ast::{self, AstNode, LetStmt, NameOwner},
-    SyntaxKind::EQ,
     TextRange, T,
 };
 
@@ -37,7 +36,7 @@ pub(crate) fn add_explicit_type(ctx: AssistCtx<impl HirDatabase>) -> Option<Assi
     let name_range = name.syntax().text_range();
     // Assist should only be applicable if cursor is between 'let' and '='
     let stmt_range = stmt.syntax().text_range();
-    let eq_range = stmt.syntax().descendants_with_tokens().find(|t| t.kind() == EQ)?.text_range();
+    let eq_range = stmt.eq_token()?.text_range();
     let let_range = TextRange::from_to(stmt_range.start(), eq_range.start());
     let cursor_in_range = ctx.frange.range.is_subrange(&let_range);
     if !cursor_in_range {
diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs
index d9666cdca..b8043b726 100644
--- a/crates/ra_syntax/src/ast/extensions.rs
+++ b/crates/ra_syntax/src/ast/extensions.rs
@@ -234,6 +234,13 @@ impl ast::LetStmt {
             Some(node) => node.kind() == T![;],
         }
     }
+
+    pub fn eq_token(&self) -> Option<SyntaxToken> {
+        self.syntax()
+            .descendants_with_tokens()
+            .find(|t| t.kind() == EQ)
+            .and_then(|it| it.into_token())
+    }
 }
 
 impl ast::ExprStmt {