From 9cba67b2ad0ef43b5c405f21f516c9ebee63a932 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 12 May 2019 23:03:37 +0300 Subject: simplify --- crates/ra_hir/src/expr.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crates/ra_hir/src/expr.rs') diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 480eaf171..a2b5db1a1 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs @@ -10,7 +10,7 @@ use ra_syntax::{ }; use crate::{ - Path, Name, HirDatabase, Resolver,DefWithBody, Either, HirFileId, + Path, Name, HirDatabase, Resolver,DefWithBody, Either, HirFileId, MacroCallLoc, name::AsName, type_ref::{Mutability, TypeRef}, }; @@ -828,7 +828,8 @@ where .ast_id(e) .with_file_id(self.current_file_id); - if let Some(call_id) = self.resolver.resolve_macro_call(self.db, path, ast_id) { + if let Some(def) = self.resolver.resolve_macro_call(path) { + let call_id = MacroCallLoc { def, ast_id }.id(self.db); if let Some(tt) = self.db.macro_expand(call_id).ok() { if let Some(expr) = mbe::token_tree_to_expr(&tt).ok() { log::debug!("macro expansion {}", expr.syntax().debug_dump()); -- cgit v1.2.3