Merge #2785

2785: Expand PAREN_EXPR as expression r=matklad a=edwin0cheng



Co-authored-by: Edwin Cheng <[email protected]>

2 files changed, 18 insertions, 0 deletions

diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs
index 2e12e126f..d41b34161 100644
--- a/crates/ra_hir_expand/src/db.rs
+++ b/crates/ra_hir_expand/src/db.rs
@@ -187,6 +187,7 @@ fn to_fragment_kind(db: &dyn AstDatabase, macro_call_id: MacroCallId) -> Fragmen
         ARG_LIST => FragmentKind::Expr,
         TRY_EXPR => FragmentKind::Expr,
         TUPLE_EXPR => FragmentKind::Expr,
+        PAREN_EXPR => FragmentKind::Expr,
         ITEM_LIST => FragmentKind::Items,
         _ => {
             // Unknown , Just guess it is `Items`
diff --git a/crates/ra_hir_ty/src/tests/regression.rs b/crates/ra_hir_ty/src/tests/regression.rs
index 13c5f62e4..6c5d39549 100644
--- a/crates/ra_hir_ty/src/tests/regression.rs
+++ b/crates/ra_hir_ty/src/tests/regression.rs
@@ -310,6 +310,23 @@ fn test<R>(query_response: Canonical<QueryResponse<R>>) {
 }
 
 #[test]
+fn infer_paren_macro_call() {
+    assert_snapshot!(
+        infer(r#"
+macro_rules! bar { () => {0u32} }
+fn test() {
+    let a = (bar!());
+}
+"#),
+        @r###"
+    ![0; 4) '0u32': u32
+    [45; 70) '{     ...()); }': ()
+    [55; 56) 'a': u32
+        "###
+    );
+}
+
+#[test]
 fn bug_1030() {
     assert_snapshot!(infer(r#"
 struct HashSet<T, H>;