From afdf08e964345ac4a884a5630772611ba81f6969 Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 8 Mar 2020 11:02:14 +0100
Subject: Move hypothetical expansion to hir_expand

---
 crates/ra_ide/src/completion/completion_context.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'crates/ra_ide/src')

diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index e7a8c78d0..40535c09e 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -119,11 +119,15 @@ impl<'a> CompletionContext<'a> {
             {
                 break;
             }
+            let hypothetical_args = match macro_call_with_fake_ident.token_tree() {
+                Some(tt) => tt,
+                None => break,
+            };
             if let (Some(actual_expansion), Some(hypothetical_expansion)) = (
                 ctx.sema.expand(&actual_macro_call),
                 ctx.sema.expand_hypothetical(
                     &actual_macro_call,
-                    &macro_call_with_fake_ident,
+                    &hypothetical_args,
                     fake_ident_token,
                 ),
             ) {
-- 
cgit v1.2.3