From c3b9a19eb72ae9542272ae7a22ac3fb57c75daca Mon Sep 17 00:00:00 2001
From: TomasKralCZ <tomas@kral.hk>
Date: Sun, 19 Jan 2020 17:40:53 +0100
Subject: fix 'add_explicit_type' assist range

---
 crates/ra_assists/src/assists/add_explicit_type.rs | 27 +++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'crates')

diff --git a/crates/ra_assists/src/assists/add_explicit_type.rs b/crates/ra_assists/src/assists/add_explicit_type.rs
index f9f826b88..713abf910 100644
--- a/crates/ra_assists/src/assists/add_explicit_type.rs
+++ b/crates/ra_assists/src/assists/add_explicit_type.rs
@@ -1,7 +1,8 @@
 use hir::{db::HirDatabase, HirDisplay};
 use ra_syntax::{
     ast::{self, AstNode, LetStmt, NameOwner},
-    T,
+    SyntaxKind::EQ,
+    TextRange, T,
 };
 
 use crate::{Assist, AssistCtx, AssistId};
@@ -34,6 +35,14 @@ pub(crate) fn add_explicit_type(ctx: AssistCtx<impl HirDatabase>) -> Option<Assi
     // The binding must have a name
     let name = pat.name()?;
     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 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 {
+        return None;
+    }
     // Assist not applicable if the type has already been specified
     if stmt.syntax().children_with_tokens().any(|child| child.kind() == T![:]) {
         return None;
@@ -109,4 +118,20 @@ mod tests {
     fn add_explicit_type_not_applicable_if_specified_ty_is_tuple() {
         check_assist_not_applicable(add_explicit_type, "fn f() { let a<|>: (i32, i32) = (3, 4); }");
     }
+
+    #[test]
+    fn add_explicit_type_not_applicable_if_cursor_after_equals() {
+        check_assist_not_applicable(
+            add_explicit_type,
+            "fn f() {let a =<|> match 1 {2 => 3, 3 => 5};}",
+        )
+    }
+
+    #[test]
+    fn add_explicit_type_not_applicable_if_cursor_before_let() {
+        check_assist_not_applicable(
+            add_explicit_type,
+            "fn f() <|>{let a = match 1 {2 => 3, 3 => 5};}",
+        )
+    }
 }
-- 
cgit v1.2.3