fix(rowan): better completion detection

Author: tamasfe

crates/rowan/src/query/mod.rs

@@ -200,6 +200,10 @@ impl Query {
     pub fn can_complete_op(&self) -> bool {
         // Deal with empty expressions first.
         if let Some(before) = &self.before {
+            if before.syntax.parent().map(|e| e.kind()) == Some(EXPR_BLOCK) {
+                return false;
+            }
+
             if let Some(exp_w) = before.expr_wrapper() {
                 if let Some(binary_exp) = exp_w.parent() {
                     if binary_exp.kind() == EXPR_BINARY {
@@ -219,6 +223,18 @@ impl Query {
         }
 
         if let Some(after) = &self.after {
+            if after.syntax.parent().map(|e| e.kind()) == Some(EXPR_BLOCK) {
+                return false;
+            }
+
+            if after.syntax.kind() == PUNCT_BRACE_END
+                && after.syntax.next_sibling_or_token().map(|t| t.kind()) == Some(LIT_STR)
+                && after.syntax.prev_sibling_or_token().map(|t| t.kind())
+                    == Some(LIT_STR_TEMPLATE_INTERPOLATION)
+            {
+                return true;
+            }
+
             if let Some(exp_w) = after.expr_wrapper() {
                 if let Some(binary_exp) = exp_w.parent() {
                     if binary_exp.kind() == EXPR_BINARY {

crates/rowan/src/query/tests.rs

@@ -177,6 +177,14 @@ fn test_query_path_segment_index() {
 fn test_complete_ref() {
     let (offsets, src) = src_cursor_offsets(
         r#"$$
+            fn asd() {
+                if hello() is b {
+                    $$
+                } else {
+                    $$
+                }
+            }
+
             let a =$$ $$;
             $$
 
@@ -190,6 +198,10 @@ fn test_complete_ref() {
                 3*$$
             }
 
+            fn b() {
+                a$$
+            }
+
             const bar = $$;
 
             {$$
@@ -211,6 +223,8 @@ fn test_complete_ref() {
 fn test_complete_op() {
     let (offsets, src) = src_cursor_offsets(
         r#"
+            a = `${a $$}`;
+
             let a = 3 $$;
 
             let b = a $$;
@@ -221,6 +235,7 @@ fn test_complete_op() {
 
             let c = "foo" $$
 
+            let in_template = `a ${a $$} b`;
             "#,
     );
 
@@ -234,9 +249,7 @@ fn test_complete_op() {
         assert!(q.can_complete_op(), "test failed for index {idx}",);
     }
 
-    let (offsets, src) = src_cursor_offsets(
-        r#"a op 2 $$"#,
-    );
+    let (offsets, src) = src_cursor_offsets(r#"a op 2 $$"#);
 
     let syntax = Parser::new(&src)
         .with_operator("op", Operator::default())
@@ -250,16 +263,24 @@ fn test_complete_op() {
 }
 
 #[test]
-fn test_complete_op_fails() {
+fn test_op_completion_should_fail() {
     let (offsets, src) = src_cursor_offsets(
         r#"
         let a = $$ op foo;
 
         let a = 3* $$;
-
+    
         let a = 3*$$;
-
+    
         let b = $$ + $$;
+
+        fn asd() {
+            if hello() + 2 {
+                $$
+            } else {
+                $$
+            }
+        }
         "#,
     );