From afaeb18910414166801e3ca51272cfa3661175a4 Mon Sep 17 00:00:00 2001 From: Lenard Pratt Date: Mon, 15 Apr 2019 10:09:58 +0100 Subject: Addeded resolver and db --- crates/ra_hir/src/expr.rs | 139 ++++++++++++++++------------- crates/ra_parser/src/grammar/Untitled-1.rs | 13 +++ 2 files changed, 92 insertions(+), 60 deletions(-) create mode 100644 crates/ra_parser/src/grammar/Untitled-1.rs (limited to 'crates') diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 817e660f9..7759a6d4f 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs @@ -12,6 +12,7 @@ use ra_syntax::{ use crate::{ Path, Name, HirDatabase, Resolver,DefWithBody, Either, name::AsName, + ids::MacroDefId, type_ref::{Mutability, TypeRef}, }; use crate::{path::GenericArgs, ty::primitive::{IntTy, UncertainIntTy, FloatTy, UncertainFloatTy}}; @@ -485,17 +486,20 @@ pub(crate) struct ExprCollector { source_map: BodySourceMap, params: Vec, body_expr: Option, + resolver: Resolver, } -impl ExprCollector { - fn new(owner: DefWithBody) -> Self { +impl ExprCollector{ + fn new(owner: DefWithBody,resolver:Resolver) -> Self { ExprCollector { owner, + resolver, exprs: Arena::default(), pats: Arena::default(), source_map: BodySourceMap::default(), params: Vec::new(), body_expr: None, + } } @@ -518,7 +522,7 @@ impl ExprCollector { self.exprs.alloc(block) } - fn collect_expr(&mut self, expr: &ast::Expr) -> ExprId { + fn collect_expr(&mut self, expr: &ast::Expr,db:&impl HirDatabase) -> ExprId { let syntax_ptr = SyntaxNodePtr::new(expr.syntax()); match expr.kind() { ast::ExprKind::IfExpr(e) => { @@ -526,15 +530,15 @@ impl ExprCollector { // if let -- desugar to match let pat = self.collect_pat(pat); let match_expr = - self.collect_expr_opt(e.condition().expect("checked above").expr()); - let then_branch = self.collect_block_opt(e.then_branch()); + self.collect_expr_opt(e.condition().expect("checked above").expr(),db); + let then_branch = self.collect_block_opt(e.then_branch(),db); let else_branch = e .else_branch() .map(|b| match b { - ast::ElseBranch::Block(it) => self.collect_block(it), + ast::ElseBranch::Block(it) => self.collect_block(it,db), ast::ElseBranch::IfExpr(elif) => { let expr: &ast::Expr = ast::Expr::cast(elif.syntax()).unwrap(); - self.collect_expr(expr) + self.collect_expr(expr,db) } }) .unwrap_or_else(|| self.empty_block()); @@ -545,27 +549,27 @@ impl ExprCollector { ]; self.alloc_expr(Expr::Match { expr: match_expr, arms }, syntax_ptr) } else { - let condition = self.collect_expr_opt(e.condition().and_then(|c| c.expr())); - let then_branch = self.collect_block_opt(e.then_branch()); + let condition = self.collect_expr_opt(e.condition().and_then(|c| c.expr()),db); + let then_branch = self.collect_block_opt(e.then_branch(),db); let else_branch = e.else_branch().map(|b| match b { - ast::ElseBranch::Block(it) => self.collect_block(it), + ast::ElseBranch::Block(it) => self.collect_block(it,db), ast::ElseBranch::IfExpr(elif) => { let expr: &ast::Expr = ast::Expr::cast(elif.syntax()).unwrap(); - self.collect_expr(expr) + self.collect_expr(expr,db) } }); self.alloc_expr(Expr::If { condition, then_branch, else_branch }, syntax_ptr) } } - ast::ExprKind::BlockExpr(e) => self.collect_block_opt(e.block()), + ast::ExprKind::BlockExpr(e) => self.collect_block_opt(e.block(),db), ast::ExprKind::LoopExpr(e) => { - let body = self.collect_block_opt(e.loop_body()); + let body = self.collect_block_opt(e.loop_body(),db); self.alloc_expr(Expr::Loop { body }, syntax_ptr) } ast::ExprKind::WhileExpr(e) => { let condition = if let Some(condition) = e.condition() { if condition.pat().is_none() { - self.collect_expr_opt(condition.expr()) + self.collect_expr_opt(condition.expr(),db) } else { // FIXME handle while let return self.alloc_expr(Expr::Missing, syntax_ptr); @@ -573,28 +577,28 @@ impl ExprCollector { } else { self.exprs.alloc(Expr::Missing) }; - let body = self.collect_block_opt(e.loop_body()); + let body = self.collect_block_opt(e.loop_body(),db); self.alloc_expr(Expr::While { condition, body }, syntax_ptr) } ast::ExprKind::ForExpr(e) => { - let iterable = self.collect_expr_opt(e.iterable()); + let iterable = self.collect_expr_opt(e.iterable(),db); let pat = self.collect_pat_opt(e.pat()); - let body = self.collect_block_opt(e.loop_body()); + let body = self.collect_block_opt(e.loop_body(),db); self.alloc_expr(Expr::For { iterable, pat, body }, syntax_ptr) } ast::ExprKind::CallExpr(e) => { - let callee = self.collect_expr_opt(e.expr()); + let callee = self.collect_expr_opt(e.expr(),db); let args = if let Some(arg_list) = e.arg_list() { - arg_list.args().map(|e| self.collect_expr(e)).collect() + arg_list.args().map(|e| self.collect_expr(e,db)).collect() } else { Vec::new() }; self.alloc_expr(Expr::Call { callee, args }, syntax_ptr) } ast::ExprKind::MethodCallExpr(e) => { - let receiver = self.collect_expr_opt(e.expr()); + let receiver = self.collect_expr_opt(e.expr(),db); let args = if let Some(arg_list) = e.arg_list() { - arg_list.args().map(|e| self.collect_expr(e)).collect() + arg_list.args().map(|e| self.collect_expr(e,db)).collect() } else { Vec::new() }; @@ -606,17 +610,17 @@ impl ExprCollector { ) } ast::ExprKind::MatchExpr(e) => { - let expr = self.collect_expr_opt(e.expr()); + let expr = self.collect_expr_opt(e.expr(),db); let arms = if let Some(match_arm_list) = e.match_arm_list() { match_arm_list .arms() .map(|arm| MatchArm { pats: arm.pats().map(|p| self.collect_pat(p)).collect(), - expr: self.collect_expr_opt(arm.expr()), + expr: self.collect_expr_opt(arm.expr(),db), guard: arm .guard() .and_then(|guard| guard.expr()) - .map(|e| self.collect_expr(e)), + .map(|e| self.collect_expr(e,db)), }) .collect() } else { @@ -634,17 +638,17 @@ impl ExprCollector { self.alloc_expr(Expr::Continue, syntax_ptr) } ast::ExprKind::BreakExpr(e) => { - let expr = e.expr().map(|e| self.collect_expr(e)); + let expr = e.expr().map(|e| self.collect_expr(e,db)); self.alloc_expr(Expr::Break { expr }, syntax_ptr) } ast::ExprKind::ParenExpr(e) => { - let inner = self.collect_expr_opt(e.expr()); + let inner = self.collect_expr_opt(e.expr(),db); // make the paren expr point to the inner expression as well self.source_map.expr_map.insert(syntax_ptr, inner); inner } ast::ExprKind::ReturnExpr(e) => { - let expr = e.expr().map(|e| self.collect_expr(e)); + let expr = e.expr().map(|e| self.collect_expr(e,db)); self.alloc_expr(Expr::Return { expr }, syntax_ptr) } ast::ExprKind::StructLit(e) => { @@ -659,7 +663,7 @@ impl ExprCollector { .map(|nr| nr.as_name()) .unwrap_or_else(Name::missing), expr: if let Some(e) = field.expr() { - self.collect_expr(e) + self.collect_expr(e,db) } else if let Some(nr) = field.name_ref() { // field shorthand let id = self.exprs.alloc(Expr::Path(Path::from_name_ref(nr))); @@ -678,7 +682,7 @@ impl ExprCollector { } else { Vec::new() }; - let spread = e.spread().map(|s| self.collect_expr(s)); + let spread = e.spread().map(|s| self.collect_expr(s,db)); let res = self.alloc_expr(Expr::StructLit { path, fields, spread }, syntax_ptr); for (i, ptr) in field_ptrs.into_iter().enumerate() { self.source_map.field_map.insert((res, i), ptr); @@ -686,7 +690,7 @@ impl ExprCollector { res } ast::ExprKind::FieldExpr(e) => { - let expr = self.collect_expr_opt(e.expr()); + let expr = self.collect_expr_opt(e.expr(),db); let name = match e.field_access() { Some(kind) => kind.as_name(), _ => Name::missing(), @@ -694,21 +698,21 @@ impl ExprCollector { self.alloc_expr(Expr::Field { expr, name }, syntax_ptr) } ast::ExprKind::TryExpr(e) => { - let expr = self.collect_expr_opt(e.expr()); + let expr = self.collect_expr_opt(e.expr(),db); self.alloc_expr(Expr::Try { expr }, syntax_ptr) } ast::ExprKind::CastExpr(e) => { - let expr = self.collect_expr_opt(e.expr()); + let expr = self.collect_expr_opt(e.expr(),db); let type_ref = TypeRef::from_ast_opt(e.type_ref()); self.alloc_expr(Expr::Cast { expr, type_ref }, syntax_ptr) } ast::ExprKind::RefExpr(e) => { - let expr = self.collect_expr_opt(e.expr()); + let expr = self.collect_expr_opt(e.expr(),db); let mutability = Mutability::from_mutable(e.is_mut()); self.alloc_expr(Expr::Ref { expr, mutability }, syntax_ptr) } ast::ExprKind::PrefixExpr(e) => { - let expr = self.collect_expr_opt(e.expr()); + let expr = self.collect_expr_opt(e.expr(),db); if let Some(op) = e.op_kind() { self.alloc_expr(Expr::UnaryOp { expr, op }, syntax_ptr) } else { @@ -726,17 +730,17 @@ impl ExprCollector { arg_types.push(type_ref); } } - let body = self.collect_expr_opt(e.body()); + let body = self.collect_expr_opt(e.body(),db); self.alloc_expr(Expr::Lambda { args, arg_types, body }, syntax_ptr) } ast::ExprKind::BinExpr(e) => { - let lhs = self.collect_expr_opt(e.lhs()); - let rhs = self.collect_expr_opt(e.rhs()); + let lhs = self.collect_expr_opt(e.lhs(),db); + let rhs = self.collect_expr_opt(e.rhs(),db); let op = e.op_kind(); self.alloc_expr(Expr::BinaryOp { lhs, rhs, op }, syntax_ptr) } ast::ExprKind::TupleExpr(e) => { - let exprs = e.exprs().map(|expr| self.collect_expr(expr)).collect(); + let exprs = e.exprs().map(|expr| self.collect_expr(expr,db)).collect(); self.alloc_expr(Expr::Tuple { exprs }, syntax_ptr) } @@ -745,12 +749,12 @@ impl ExprCollector { match kind { ArrayExprKind::ElementList(e) => { - let exprs = e.map(|expr| self.collect_expr(expr)).collect(); + let exprs = e.map(|expr| self.collect_expr(expr,db)).collect(); self.alloc_expr(Expr::Array(Array::ElementList(exprs)), syntax_ptr) } ArrayExprKind::Repeat { initializer, repeat } => { - let initializer = self.collect_expr_opt(initializer); - let repeat = self.collect_expr_opt(repeat); + let initializer = self.collect_expr_opt(initializer,db); + let repeat = self.collect_expr_opt(repeat,db); self.alloc_expr( Expr::Array(Array::Repeat { initializer, repeat }), syntax_ptr, @@ -794,40 +798,53 @@ impl ExprCollector { ast::ExprKind::Label(_e) => self.alloc_expr(Expr::Missing, syntax_ptr), ast::ExprKind::IndexExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr), ast::ExprKind::RangeExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr), - ast::ExprKind::MacroCall(_e) => self.alloc_expr(Expr::Missing, syntax_ptr), + ast::ExprKind::MacroCall(e) => { + + let name = e.name().map(|nr| nr.as_name()).unwrap_or_else(Name::missing); + + let res = self.resolver.resolve_name(db,&name); + + // match res { + + // } + + // let resolver = Resolver + + self.alloc_expr(Expr::Missing, syntax_ptr) + }, } } - fn collect_expr_opt(&mut self, expr: Option<&ast::Expr>) -> ExprId { + fn collect_expr_opt(&mut self, expr: Option<&ast::Expr>,db:&impl HirDatabase) -> ExprId { if let Some(expr) = expr { - self.collect_expr(expr) + self.collect_expr(expr,db) } else { self.exprs.alloc(Expr::Missing) } } - fn collect_block(&mut self, block: &ast::Block) -> ExprId { + fn collect_block(&mut self, block: &ast::Block,db:&impl HirDatabase) -> ExprId { let statements = block .statements() .map(|s| match s.kind() { ast::StmtKind::LetStmt(stmt) => { let pat = self.collect_pat_opt(stmt.pat()); let type_ref = stmt.ascribed_type().map(TypeRef::from_ast); - let initializer = stmt.initializer().map(|e| self.collect_expr(e)); + let initializer = stmt.initializer().map(|e| self.collect_expr(e,db)); Statement::Let { pat, type_ref, initializer } } ast::StmtKind::ExprStmt(stmt) => { - Statement::Expr(self.collect_expr_opt(stmt.expr())) + Statement::Expr(self.collect_expr_opt(stmt.expr(),db)) } }) .collect(); - let tail = block.expr().map(|e| self.collect_expr(e)); + let tail = block.expr().map(|e| self.collect_expr(e,db)); self.alloc_expr(Expr::Block { statements, tail }, SyntaxNodePtr::new(block.syntax())) } - fn collect_block_opt(&mut self, block: Option<&ast::Block>) -> ExprId { + fn collect_block_opt(&mut self, block: Option<&ast::Block>,db:&impl HirDatabase) -> ExprId { if let Some(block) = block { - self.collect_block(block) + self.collect_block(block,db) } else { self.exprs.alloc(Expr::Missing) } @@ -900,17 +917,17 @@ impl ExprCollector { } } - fn collect_const_body(&mut self, node: &ast::ConstDef) { - let body = self.collect_expr_opt(node.body()); + fn collect_const_body(&mut self, node: &ast::ConstDef,db:&impl HirDatabase) { + let body = self.collect_expr_opt(node.body(),db); self.body_expr = Some(body); } - fn collect_static_body(&mut self, node: &ast::StaticDef) { - let body = self.collect_expr_opt(node.body()); + fn collect_static_body(&mut self, node: &ast::StaticDef,db:&impl HirDatabase) { + let body = self.collect_expr_opt(node.body(),db); self.body_expr = Some(body); } - fn collect_fn_body(&mut self, node: &ast::FnDef) { + fn collect_fn_body(&mut self, node: &ast::FnDef,db:&impl HirDatabase) { if let Some(param_list) = node.param_list() { if let Some(self_param) = param_list.self_param() { let ptr = AstPtr::new(self_param); @@ -936,7 +953,7 @@ impl ExprCollector { } }; - let body = self.collect_block_opt(node.body()); + let body = self.collect_block_opt(node.body(),db); self.body_expr = Some(body); } @@ -956,12 +973,14 @@ pub(crate) fn body_with_source_map_query( db: &impl HirDatabase, def: DefWithBody, ) -> (Arc, Arc) { - let mut collector = ExprCollector::new(def); + + let mut resolver = def.resolver(db); + let mut collector = ExprCollector::new(def,resolver); match def { - DefWithBody::Const(ref c) => collector.collect_const_body(&c.source(db).1), - DefWithBody::Function(ref f) => collector.collect_fn_body(&f.source(db).1), - DefWithBody::Static(ref s) => collector.collect_static_body(&s.source(db).1), + DefWithBody::Const(ref c) => collector.collect_const_body(&c.source(db).1,db), + DefWithBody::Function(ref f) => collector.collect_fn_body(&f.source(db).1,db), + DefWithBody::Static(ref s) => collector.collect_static_body(&s.source(db).1,db), } let (body, source_map) = collector.finish(); diff --git a/crates/ra_parser/src/grammar/Untitled-1.rs b/crates/ra_parser/src/grammar/Untitled-1.rs new file mode 100644 index 000000000..2106872c8 --- /dev/null +++ b/crates/ra_parser/src/grammar/Untitled-1.rs @@ -0,0 +1,13 @@ +macro_rules! vec { + ($($item:expr),*) => + { + { + let mut v = Vec::new(); + $( + v.push($item); + )* + v + } + }; +} + -- cgit v1.2.3 From ce211434a6501e88cb83462f2443db085f1557d3 Mon Sep 17 00:00:00 2001 From: Lenard Pratt Date: Mon, 15 Apr 2019 11:01:29 +0100 Subject: Added macro resolution and expansion --- crates/ra_hir/src/expr.rs | 201 ++++++++++++++++------------- crates/ra_hir/src/ids.rs | 2 +- crates/ra_hir/src/nameres.rs | 6 + crates/ra_hir/src/nameres/collector.rs | 8 +- crates/ra_hir/src/path.rs | 4 + crates/ra_hir/src/resolve.rs | 7 +- crates/ra_parser/src/grammar/Untitled-1.rs | 13 -- 7 files changed, 135 insertions(+), 106 deletions(-) delete mode 100644 crates/ra_parser/src/grammar/Untitled-1.rs (limited to 'crates') diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 7759a6d4f..7d5257461 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs @@ -12,7 +12,7 @@ use ra_syntax::{ use crate::{ Path, Name, HirDatabase, Resolver,DefWithBody, Either, name::AsName, - ids::MacroDefId, + ids::{MacroCallLoc,HirFileId}, type_ref::{Mutability, TypeRef}, }; use crate::{path::GenericArgs, ty::primitive::{IntTy, UncertainIntTy, FloatTy, UncertainFloatTy}}; @@ -479,7 +479,8 @@ impl Pat { // Queries -pub(crate) struct ExprCollector { +pub(crate) struct ExprCollector { + db: DB, owner: DefWithBody, exprs: Arena, pats: Arena, @@ -489,20 +490,10 @@ pub(crate) struct ExprCollector { resolver: Resolver, } -impl ExprCollector{ - fn new(owner: DefWithBody,resolver:Resolver) -> Self { - ExprCollector { - owner, - resolver, - exprs: Arena::default(), - pats: Arena::default(), - source_map: BodySourceMap::default(), - params: Vec::new(), - body_expr: None, - - } - } - +impl<'a, DB> ExprCollector<&'a DB> +where + DB: HirDatabase, +{ fn alloc_expr(&mut self, expr: Expr, syntax_ptr: SyntaxNodePtr) -> ExprId { let id = self.exprs.alloc(expr); self.source_map.expr_map.insert(syntax_ptr, id); @@ -522,7 +513,7 @@ impl ExprCollector{ self.exprs.alloc(block) } - fn collect_expr(&mut self, expr: &ast::Expr,db:&impl HirDatabase) -> ExprId { + fn collect_expr(&mut self, expr: &ast::Expr) -> ExprId { let syntax_ptr = SyntaxNodePtr::new(expr.syntax()); match expr.kind() { ast::ExprKind::IfExpr(e) => { @@ -530,15 +521,15 @@ impl ExprCollector{ // if let -- desugar to match let pat = self.collect_pat(pat); let match_expr = - self.collect_expr_opt(e.condition().expect("checked above").expr(),db); - let then_branch = self.collect_block_opt(e.then_branch(),db); + self.collect_expr_opt(e.condition().expect("checked above").expr()); + let then_branch = self.collect_block_opt(e.then_branch()); let else_branch = e .else_branch() .map(|b| match b { - ast::ElseBranch::Block(it) => self.collect_block(it,db), + ast::ElseBranch::Block(it) => self.collect_block(it), ast::ElseBranch::IfExpr(elif) => { let expr: &ast::Expr = ast::Expr::cast(elif.syntax()).unwrap(); - self.collect_expr(expr,db) + self.collect_expr(expr) } }) .unwrap_or_else(|| self.empty_block()); @@ -549,27 +540,27 @@ impl ExprCollector{ ]; self.alloc_expr(Expr::Match { expr: match_expr, arms }, syntax_ptr) } else { - let condition = self.collect_expr_opt(e.condition().and_then(|c| c.expr()),db); - let then_branch = self.collect_block_opt(e.then_branch(),db); + let condition = self.collect_expr_opt(e.condition().and_then(|c| c.expr())); + let then_branch = self.collect_block_opt(e.then_branch()); let else_branch = e.else_branch().map(|b| match b { - ast::ElseBranch::Block(it) => self.collect_block(it,db), + ast::ElseBranch::Block(it) => self.collect_block(it), ast::ElseBranch::IfExpr(elif) => { let expr: &ast::Expr = ast::Expr::cast(elif.syntax()).unwrap(); - self.collect_expr(expr,db) + self.collect_expr(expr) } }); self.alloc_expr(Expr::If { condition, then_branch, else_branch }, syntax_ptr) } } - ast::ExprKind::BlockExpr(e) => self.collect_block_opt(e.block(),db), + ast::ExprKind::BlockExpr(e) => self.collect_block_opt(e.block()), ast::ExprKind::LoopExpr(e) => { - let body = self.collect_block_opt(e.loop_body(),db); + let body = self.collect_block_opt(e.loop_body()); self.alloc_expr(Expr::Loop { body }, syntax_ptr) } ast::ExprKind::WhileExpr(e) => { let condition = if let Some(condition) = e.condition() { if condition.pat().is_none() { - self.collect_expr_opt(condition.expr(),db) + self.collect_expr_opt(condition.expr()) } else { // FIXME handle while let return self.alloc_expr(Expr::Missing, syntax_ptr); @@ -577,28 +568,28 @@ impl ExprCollector{ } else { self.exprs.alloc(Expr::Missing) }; - let body = self.collect_block_opt(e.loop_body(),db); + let body = self.collect_block_opt(e.loop_body()); self.alloc_expr(Expr::While { condition, body }, syntax_ptr) } ast::ExprKind::ForExpr(e) => { - let iterable = self.collect_expr_opt(e.iterable(),db); + let iterable = self.collect_expr_opt(e.iterable()); let pat = self.collect_pat_opt(e.pat()); - let body = self.collect_block_opt(e.loop_body(),db); + let body = self.collect_block_opt(e.loop_body()); self.alloc_expr(Expr::For { iterable, pat, body }, syntax_ptr) } ast::ExprKind::CallExpr(e) => { - let callee = self.collect_expr_opt(e.expr(),db); + let callee = self.collect_expr_opt(e.expr()); let args = if let Some(arg_list) = e.arg_list() { - arg_list.args().map(|e| self.collect_expr(e,db)).collect() + arg_list.args().map(|e| self.collect_expr(e)).collect() } else { Vec::new() }; self.alloc_expr(Expr::Call { callee, args }, syntax_ptr) } ast::ExprKind::MethodCallExpr(e) => { - let receiver = self.collect_expr_opt(e.expr(),db); + let receiver = self.collect_expr_opt(e.expr()); let args = if let Some(arg_list) = e.arg_list() { - arg_list.args().map(|e| self.collect_expr(e,db)).collect() + arg_list.args().map(|e| self.collect_expr(e)).collect() } else { Vec::new() }; @@ -610,17 +601,17 @@ impl ExprCollector{ ) } ast::ExprKind::MatchExpr(e) => { - let expr = self.collect_expr_opt(e.expr(),db); + let expr = self.collect_expr_opt(e.expr()); let arms = if let Some(match_arm_list) = e.match_arm_list() { match_arm_list .arms() .map(|arm| MatchArm { pats: arm.pats().map(|p| self.collect_pat(p)).collect(), - expr: self.collect_expr_opt(arm.expr(),db), + expr: self.collect_expr_opt(arm.expr()), guard: arm .guard() .and_then(|guard| guard.expr()) - .map(|e| self.collect_expr(e,db)), + .map(|e| self.collect_expr(e)), }) .collect() } else { @@ -638,17 +629,17 @@ impl ExprCollector{ self.alloc_expr(Expr::Continue, syntax_ptr) } ast::ExprKind::BreakExpr(e) => { - let expr = e.expr().map(|e| self.collect_expr(e,db)); + let expr = e.expr().map(|e| self.collect_expr(e)); self.alloc_expr(Expr::Break { expr }, syntax_ptr) } ast::ExprKind::ParenExpr(e) => { - let inner = self.collect_expr_opt(e.expr(),db); + let inner = self.collect_expr_opt(e.expr()); // make the paren expr point to the inner expression as well self.source_map.expr_map.insert(syntax_ptr, inner); inner } ast::ExprKind::ReturnExpr(e) => { - let expr = e.expr().map(|e| self.collect_expr(e,db)); + let expr = e.expr().map(|e| self.collect_expr(e)); self.alloc_expr(Expr::Return { expr }, syntax_ptr) } ast::ExprKind::StructLit(e) => { @@ -663,7 +654,7 @@ impl ExprCollector{ .map(|nr| nr.as_name()) .unwrap_or_else(Name::missing), expr: if let Some(e) = field.expr() { - self.collect_expr(e,db) + self.collect_expr(e) } else if let Some(nr) = field.name_ref() { // field shorthand let id = self.exprs.alloc(Expr::Path(Path::from_name_ref(nr))); @@ -682,7 +673,7 @@ impl ExprCollector{ } else { Vec::new() }; - let spread = e.spread().map(|s| self.collect_expr(s,db)); + let spread = e.spread().map(|s| self.collect_expr(s)); let res = self.alloc_expr(Expr::StructLit { path, fields, spread }, syntax_ptr); for (i, ptr) in field_ptrs.into_iter().enumerate() { self.source_map.field_map.insert((res, i), ptr); @@ -690,7 +681,7 @@ impl ExprCollector{ res } ast::ExprKind::FieldExpr(e) => { - let expr = self.collect_expr_opt(e.expr(),db); + let expr = self.collect_expr_opt(e.expr()); let name = match e.field_access() { Some(kind) => kind.as_name(), _ => Name::missing(), @@ -698,21 +689,21 @@ impl ExprCollector{ self.alloc_expr(Expr::Field { expr, name }, syntax_ptr) } ast::ExprKind::TryExpr(e) => { - let expr = self.collect_expr_opt(e.expr(),db); + let expr = self.collect_expr_opt(e.expr()); self.alloc_expr(Expr::Try { expr }, syntax_ptr) } ast::ExprKind::CastExpr(e) => { - let expr = self.collect_expr_opt(e.expr(),db); + let expr = self.collect_expr_opt(e.expr()); let type_ref = TypeRef::from_ast_opt(e.type_ref()); self.alloc_expr(Expr::Cast { expr, type_ref }, syntax_ptr) } ast::ExprKind::RefExpr(e) => { - let expr = self.collect_expr_opt(e.expr(),db); + let expr = self.collect_expr_opt(e.expr()); let mutability = Mutability::from_mutable(e.is_mut()); self.alloc_expr(Expr::Ref { expr, mutability }, syntax_ptr) } ast::ExprKind::PrefixExpr(e) => { - let expr = self.collect_expr_opt(e.expr(),db); + let expr = self.collect_expr_opt(e.expr()); if let Some(op) = e.op_kind() { self.alloc_expr(Expr::UnaryOp { expr, op }, syntax_ptr) } else { @@ -730,17 +721,17 @@ impl ExprCollector{ arg_types.push(type_ref); } } - let body = self.collect_expr_opt(e.body(),db); + let body = self.collect_expr_opt(e.body()); self.alloc_expr(Expr::Lambda { args, arg_types, body }, syntax_ptr) } ast::ExprKind::BinExpr(e) => { - let lhs = self.collect_expr_opt(e.lhs(),db); - let rhs = self.collect_expr_opt(e.rhs(),db); + let lhs = self.collect_expr_opt(e.lhs()); + let rhs = self.collect_expr_opt(e.rhs()); let op = e.op_kind(); self.alloc_expr(Expr::BinaryOp { lhs, rhs, op }, syntax_ptr) } ast::ExprKind::TupleExpr(e) => { - let exprs = e.exprs().map(|expr| self.collect_expr(expr,db)).collect(); + let exprs = e.exprs().map(|expr| self.collect_expr(expr)).collect(); self.alloc_expr(Expr::Tuple { exprs }, syntax_ptr) } @@ -749,12 +740,12 @@ impl ExprCollector{ match kind { ArrayExprKind::ElementList(e) => { - let exprs = e.map(|expr| self.collect_expr(expr,db)).collect(); + let exprs = e.map(|expr| self.collect_expr(expr)).collect(); self.alloc_expr(Expr::Array(Array::ElementList(exprs)), syntax_ptr) } ArrayExprKind::Repeat { initializer, repeat } => { - let initializer = self.collect_expr_opt(initializer,db); - let repeat = self.collect_expr_opt(repeat,db); + let initializer = self.collect_expr_opt(initializer); + let repeat = self.collect_expr_opt(repeat); self.alloc_expr( Expr::Array(Array::Repeat { initializer, repeat }), syntax_ptr, @@ -799,52 +790,79 @@ impl ExprCollector{ ast::ExprKind::IndexExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr), ast::ExprKind::RangeExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr), ast::ExprKind::MacroCall(e) => { - - let name = e.name().map(|nr| nr.as_name()).unwrap_or_else(Name::missing); - - let res = self.resolver.resolve_name(db,&name); - - // match res { - - // } - - // let resolver = Resolver - - self.alloc_expr(Expr::Missing, syntax_ptr) - }, + // very hacky.TODO change to use the macro resolution + let name = e + .path() + .and_then(Path::from_ast) + .and_then(|path| path.expand_macro_expr()) + .unwrap_or_else(Name::missing); + + if let Some(macro_id) = self.resolver.resolve_macro_call(&name) { + if let Some((module, _)) = self.resolver.module() { + // we do this to get the ast_id for the macro call + // if we used the ast_id from the macro_id variable + // it gives us the ast_id of the defenition site + let module = module.mk_module(module.root()); + let hir_file_id = module.definition_source(self.db).0; + let ast_id = + self.db.ast_id_map(hir_file_id).ast_id(e).with_file_id(hir_file_id); + + let call_loc = MacroCallLoc { def: *macro_id, ast_id }; + let call_id = call_loc.id(self.db); + let file_id: HirFileId = call_id.into(); + + log::debug!( + "expanded macro ast {}", + self.db.hir_parse(file_id).syntax().debug_dump() + ); + + self.db + .hir_parse(file_id) + .syntax() + .descendants() + .find_map(ast::Expr::cast) + .map(|expr| self.collect_expr(expr)) + .unwrap_or(self.alloc_expr(Expr::Missing, syntax_ptr)) + } else { + self.alloc_expr(Expr::Missing, syntax_ptr) + } + } else { + self.alloc_expr(Expr::Missing, syntax_ptr) + } + } } } - fn collect_expr_opt(&mut self, expr: Option<&ast::Expr>,db:&impl HirDatabase) -> ExprId { + fn collect_expr_opt(&mut self, expr: Option<&ast::Expr>) -> ExprId { if let Some(expr) = expr { - self.collect_expr(expr,db) + self.collect_expr(expr) } else { self.exprs.alloc(Expr::Missing) } } - fn collect_block(&mut self, block: &ast::Block,db:&impl HirDatabase) -> ExprId { + fn collect_block(&mut self, block: &ast::Block) -> ExprId { let statements = block .statements() .map(|s| match s.kind() { ast::StmtKind::LetStmt(stmt) => { let pat = self.collect_pat_opt(stmt.pat()); let type_ref = stmt.ascribed_type().map(TypeRef::from_ast); - let initializer = stmt.initializer().map(|e| self.collect_expr(e,db)); + let initializer = stmt.initializer().map(|e| self.collect_expr(e)); Statement::Let { pat, type_ref, initializer } } ast::StmtKind::ExprStmt(stmt) => { - Statement::Expr(self.collect_expr_opt(stmt.expr(),db)) + Statement::Expr(self.collect_expr_opt(stmt.expr())) } }) .collect(); - let tail = block.expr().map(|e| self.collect_expr(e,db)); + let tail = block.expr().map(|e| self.collect_expr(e)); self.alloc_expr(Expr::Block { statements, tail }, SyntaxNodePtr::new(block.syntax())) } - fn collect_block_opt(&mut self, block: Option<&ast::Block>,db:&impl HirDatabase) -> ExprId { + fn collect_block_opt(&mut self, block: Option<&ast::Block>) -> ExprId { if let Some(block) = block { - self.collect_block(block,db) + self.collect_block(block) } else { self.exprs.alloc(Expr::Missing) } @@ -917,17 +935,17 @@ impl ExprCollector{ } } - fn collect_const_body(&mut self, node: &ast::ConstDef,db:&impl HirDatabase) { - let body = self.collect_expr_opt(node.body(),db); + fn collect_const_body(&mut self, node: &ast::ConstDef) { + let body = self.collect_expr_opt(node.body()); self.body_expr = Some(body); } - fn collect_static_body(&mut self, node: &ast::StaticDef,db:&impl HirDatabase) { - let body = self.collect_expr_opt(node.body(),db); + fn collect_static_body(&mut self, node: &ast::StaticDef) { + let body = self.collect_expr_opt(node.body()); self.body_expr = Some(body); } - fn collect_fn_body(&mut self, node: &ast::FnDef,db:&impl HirDatabase) { + fn collect_fn_body(&mut self, node: &ast::FnDef) { if let Some(param_list) = node.param_list() { if let Some(self_param) = param_list.self_param() { let ptr = AstPtr::new(self_param); @@ -953,7 +971,7 @@ impl ExprCollector{ } }; - let body = self.collect_block_opt(node.body(),db); + let body = self.collect_block_opt(node.body()); self.body_expr = Some(body); } @@ -973,14 +991,21 @@ pub(crate) fn body_with_source_map_query( db: &impl HirDatabase, def: DefWithBody, ) -> (Arc, Arc) { - - let mut resolver = def.resolver(db); - let mut collector = ExprCollector::new(def,resolver); + let mut collector = ExprCollector { + db, + owner: def, + resolver: def.resolver(db), + exprs: Arena::default(), + pats: Arena::default(), + source_map: BodySourceMap::default(), + params: Vec::new(), + body_expr: None, + }; match def { - DefWithBody::Const(ref c) => collector.collect_const_body(&c.source(db).1,db), - DefWithBody::Function(ref f) => collector.collect_fn_body(&f.source(db).1,db), - DefWithBody::Static(ref s) => collector.collect_static_body(&s.source(db).1,db), + DefWithBody::Const(ref c) => collector.collect_const_body(&c.source(db).1), + DefWithBody::Function(ref f) => collector.collect_fn_body(&f.source(db).1), + DefWithBody::Static(ref s) => collector.collect_static_body(&s.source(db).1), } let (body, source_map) = collector.finish(); diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs index c7849c995..a07624a19 100644 --- a/crates/ra_hir/src/ids.rs +++ b/crates/ra_hir/src/ids.rs @@ -101,7 +101,7 @@ fn parse_macro( return Err(format!("Total tokens count exceed limit : count = {}", count)); } - Ok(mbe::token_tree_to_ast_item_list(&tt)) + Some(mbe::token_tree_to_ast_item_list(&tt)) } #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index fbfff4fd7..a450d7b84 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs @@ -104,6 +104,7 @@ pub struct CrateDefMap { /// However, do we want to put it as a global variable? poison_macros: FxHashSet, + local_macros: FxHashMap, diagnostics: Vec, } @@ -209,6 +210,7 @@ impl CrateDefMap { modules, public_macros: FxHashMap::default(), poison_macros: FxHashSet::default(), + local_macros: FxHashMap::default(), diagnostics: Vec::new(), } }; @@ -270,6 +272,10 @@ impl CrateDefMap { (res.resolved_def, res.segment_index) } + pub(crate) fn find_macro(&self, name: &Name) -> Option<&MacroDefId> { + self.public_macros.get(name).or(self.local_macros.get(name)) + } + // Returns Yes if we are sure that additions to `ItemMap` wouldn't change // the result. fn resolve_path_fp( diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index 4590a5184..762a61604 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs @@ -131,6 +131,8 @@ where fn define_macro(&mut self, name: Name, macro_id: MacroDefId, export: bool) { if export { self.def_map.public_macros.insert(name.clone(), macro_id); + } else { + self.def_map.local_macros.insert(name.clone(), macro_id); } self.global_macro_scope.insert(name, macro_id); } @@ -517,10 +519,10 @@ where // Case 2: try to expand macro_rules from this crate, triggering // recursive item collection. - if let Some(¯o_id) = - mac.path.as_ident().and_then(|name| self.def_collector.global_macro_scope.get(name)) + if let Some(macro_id) = + mac.path.as_ident().and_then(|name| self.def_collector.global_macro_scope.get(&name)) { - let macro_call_id = MacroCallLoc { def: macro_id, ast_id }.id(self.def_collector.db); + let macro_call_id = MacroCallLoc { def: *macro_id, ast_id }.id(self.def_collector.db); self.def_collector.collect_macro_expansion(self.module_id, macro_call_id, macro_id); return; diff --git a/crates/ra_hir/src/path.rs b/crates/ra_hir/src/path.rs index 5449cddfd..1b129c752 100644 --- a/crates/ra_hir/src/path.rs +++ b/crates/ra_hir/src/path.rs @@ -126,6 +126,10 @@ impl Path { } self.segments.first().map(|s| &s.name) } + + pub fn expand_macro_expr(&self) -> Option { + self.as_ident().and_then(|name| Some(name.clone())) + } } impl GenericArgs { diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index f2c85eb66..1def032f9 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs @@ -6,6 +6,7 @@ use rustc_hash::FxHashMap; use crate::{ ModuleDef, code_model_api::Crate, + MacroDefId, db::HirDatabase, name::{Name, KnownName}, nameres::{PerNs, CrateDefMap, CrateModuleId}, @@ -130,6 +131,10 @@ impl Resolver { resolution } + pub fn resolve_macro_call(&self, name: &Name) -> Option<&MacroDefId> { + self.module().and_then(|(module, _)| module.find_macro(name)) + } + /// Returns the resolved path segments /// Which may be fully resolved, empty or partially resolved. pub(crate) fn resolve_path_segments(&self, db: &impl HirDatabase, path: &Path) -> PathResult { @@ -192,7 +197,7 @@ impl Resolver { .flatten() } - fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> { + pub(crate) fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> { self.scopes.iter().rev().find_map(|scope| match scope { Scope::ModuleScope(m) => Some((&*m.crate_def_map, m.module_id)), diff --git a/crates/ra_parser/src/grammar/Untitled-1.rs b/crates/ra_parser/src/grammar/Untitled-1.rs deleted file mode 100644 index 2106872c8..000000000 --- a/crates/ra_parser/src/grammar/Untitled-1.rs +++ /dev/null @@ -1,13 +0,0 @@ -macro_rules! vec { - ($($item:expr),*) => - { - { - let mut v = Vec::new(); - $( - v.push($item); - )* - v - } - }; -} - -- cgit v1.2.3 From 1ab7066e32ab482c70ea5c9bba7585eba275476a Mon Sep 17 00:00:00 2001 From: Lenard Pratt Date: Thu, 18 Apr 2019 19:35:47 +0100 Subject: Introduced resolve_macro_call on resolver changed to manual expansion fix for nested macros --- crates/ra_hir/src/expr.rs | 104 +++++++++++++++++---------------- crates/ra_hir/src/ids.rs | 2 +- crates/ra_hir/src/nameres/collector.rs | 3 +- crates/ra_hir/src/resolve.rs | 32 ++++++++-- crates/ra_hir/src/ty/tests.rs | 26 +++++++++ 5 files changed, 112 insertions(+), 55 deletions(-) (limited to 'crates') diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 7d5257461..db74d28e8 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs @@ -5,14 +5,14 @@ use rustc_hash::FxHashMap; use ra_arena::{Arena, RawId, impl_arena_id, map::ArenaMap}; use ra_syntax::{ - SyntaxNodePtr, AstPtr, AstNode, + SyntaxNodePtr, AstPtr, AstNode,TreeArc, ast::{self, LoopBodyOwner, ArgListOwner, NameOwner, LiteralKind,ArrayExprKind, TypeAscriptionOwner} }; use crate::{ Path, Name, HirDatabase, Resolver,DefWithBody, Either, name::AsName, - ids::{MacroCallLoc,HirFileId}, + ids::{MacroCallId}, type_ref::{Mutability, TypeRef}, }; use crate::{path::GenericArgs, ty::primitive::{IntTy, UncertainIntTy, FloatTy, UncertainFloatTy}}; @@ -488,23 +488,45 @@ pub(crate) struct ExprCollector { params: Vec, body_expr: Option, resolver: Resolver, + // FIXEME: Its a quick hack,see issue #1196 + is_in_macro: bool, } impl<'a, DB> ExprCollector<&'a DB> where DB: HirDatabase, { + fn new(owner: DefWithBody, resolver: Resolver, db: &'a DB) -> Self { + ExprCollector { + owner, + resolver, + db, + exprs: Arena::default(), + pats: Arena::default(), + source_map: BodySourceMap::default(), + params: Vec::new(), + body_expr: None, + is_in_macro: false, + } + } fn alloc_expr(&mut self, expr: Expr, syntax_ptr: SyntaxNodePtr) -> ExprId { let id = self.exprs.alloc(expr); - self.source_map.expr_map.insert(syntax_ptr, id); - self.source_map.expr_map_back.insert(id, syntax_ptr); + if !self.is_in_macro { + self.source_map.expr_map.insert(syntax_ptr, id); + self.source_map.expr_map_back.insert(id, syntax_ptr); + } + id } fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId { let id = self.pats.alloc(pat); - self.source_map.pat_map.insert(ptr, id); - self.source_map.pat_map_back.insert(id, ptr); + + if !self.is_in_macro { + self.source_map.pat_map.insert(ptr, id); + self.source_map.pat_map_back.insert(id, ptr); + } + id } @@ -790,40 +812,19 @@ where ast::ExprKind::IndexExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr), ast::ExprKind::RangeExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr), ast::ExprKind::MacroCall(e) => { - // very hacky.TODO change to use the macro resolution - let name = e - .path() - .and_then(Path::from_ast) - .and_then(|path| path.expand_macro_expr()) - .unwrap_or_else(Name::missing); - - if let Some(macro_id) = self.resolver.resolve_macro_call(&name) { - if let Some((module, _)) = self.resolver.module() { - // we do this to get the ast_id for the macro call - // if we used the ast_id from the macro_id variable - // it gives us the ast_id of the defenition site - let module = module.mk_module(module.root()); - let hir_file_id = module.definition_source(self.db).0; - let ast_id = - self.db.ast_id_map(hir_file_id).ast_id(e).with_file_id(hir_file_id); - - let call_loc = MacroCallLoc { def: *macro_id, ast_id }; - let call_id = call_loc.id(self.db); - let file_id: HirFileId = call_id.into(); - - log::debug!( - "expanded macro ast {}", - self.db.hir_parse(file_id).syntax().debug_dump() - ); - - self.db - .hir_parse(file_id) - .syntax() - .descendants() - .find_map(ast::Expr::cast) - .map(|expr| self.collect_expr(expr)) - .unwrap_or(self.alloc_expr(Expr::Missing, syntax_ptr)) + // very hacky.FIXME change to use the macro resolution + let path = e.path().and_then(Path::from_ast); + + if let Some(call_id) = self.resolver.resolve_macro_call(self.db, path, e) { + if let Some(expr) = expand_macro_to_expr(self.db, call_id, e.token_tree()) { + log::debug!("macro expansion {}", expr.syntax().debug_dump()); + let old = std::mem::replace(&mut self.is_in_macro, true); + let id = self.collect_expr(&expr); + self.is_in_macro = old; + id } else { + // FIXME: Instead of just dropping the error from expansion + // report it self.alloc_expr(Expr::Missing, syntax_ptr) } } else { @@ -987,20 +988,25 @@ where } } +fn expand_macro_to_expr( + db: &impl HirDatabase, + macro_call: MacroCallId, + args: Option<&ast::TokenTree>, +) -> Option> { + let rules = db.macro_def(macro_call.loc(db).def)?; + + let args = mbe::ast_to_token_tree(args?)?.0; + + let expanded = rules.expand(&args).ok()?; + + mbe::token_tree_to_expr(&expanded).ok() +} + pub(crate) fn body_with_source_map_query( db: &impl HirDatabase, def: DefWithBody, ) -> (Arc, Arc) { - let mut collector = ExprCollector { - db, - owner: def, - resolver: def.resolver(db), - exprs: Arena::default(), - pats: Arena::default(), - source_map: BodySourceMap::default(), - params: Vec::new(), - body_expr: None, - }; + let mut collector = ExprCollector::new(def, def.resolver(db), db); match def { DefWithBody::Const(ref c) => collector.collect_const_body(&c.source(db).1), diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs index a07624a19..c7849c995 100644 --- a/crates/ra_hir/src/ids.rs +++ b/crates/ra_hir/src/ids.rs @@ -101,7 +101,7 @@ fn parse_macro( return Err(format!("Total tokens count exceed limit : count = {}", count)); } - Some(mbe::token_tree_to_ast_item_list(&tt)) + Ok(mbe::token_tree_to_ast_item_list(&tt)) } #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index 762a61604..b34c9b8e6 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs @@ -524,7 +524,7 @@ where { let macro_call_id = MacroCallLoc { def: *macro_id, ast_id }.id(self.def_collector.db); - self.def_collector.collect_macro_expansion(self.module_id, macro_call_id, macro_id); + self.def_collector.collect_macro_expansion(self.module_id, macro_call_id, *macro_id); return; } @@ -616,6 +616,7 @@ mod tests { modules, public_macros: FxHashMap::default(), poison_macros: FxHashSet::default(), + local_macros: FxHashMap::default(), diagnostics: Vec::new(), } }; diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index 1def032f9..d1f97c104 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs @@ -1,12 +1,15 @@ //! Name resolution. use std::sync::Arc; +use ra_syntax::ast; + use rustc_hash::FxHashMap; use crate::{ ModuleDef, code_model_api::Crate, - MacroDefId, + MacroCallId, + MacroCallLoc, db::HirDatabase, name::{Name, KnownName}, nameres::{PerNs, CrateDefMap, CrateModuleId}, @@ -131,8 +134,29 @@ impl Resolver { resolution } - pub fn resolve_macro_call(&self, name: &Name) -> Option<&MacroDefId> { - self.module().and_then(|(module, _)| module.find_macro(name)) + pub fn resolve_macro_call( + &self, + db: &impl HirDatabase, + path: Option, + call: &ast::MacroCall, + ) -> Option { + let name = path.and_then(|path| path.expand_macro_expr()).unwrap_or_else(Name::missing); + let macro_def_id = self.module().and_then(|(module, _)| module.find_macro(&name)); + if let Some(def_id) = macro_def_id { + self.module().and_then(|(module, _)| { + // we do this to get the ast_id for the macro call + // if we used the ast_id from the def_id variable + // it gives us the ast_id of the defenition site + let module = module.mk_module(module.root()); + let hir_file_id = module.definition_source(db).0; + let ast_id = db.ast_id_map(hir_file_id).ast_id(call).with_file_id(hir_file_id); + let call_loc = MacroCallLoc { def: *def_id, ast_id }.id(db); + + Some(call_loc) + }) + } else { + None + } } /// Returns the resolved path segments @@ -197,7 +221,7 @@ impl Resolver { .flatten() } - pub(crate) fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> { + fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> { self.scopes.iter().rev().find_map(|scope| match scope { Scope::ModuleScope(m) => Some((&*m.crate_def_map, m.module_id)), diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs index a4c99528d..c76a5012f 100644 --- a/crates/ra_hir/src/ty/tests.rs +++ b/crates/ra_hir/src/ty/tests.rs @@ -2417,6 +2417,30 @@ fn test() -> u64 { ); } +#[test] +fn infer_macros_expanded() { + assert_snapshot_matches!( + infer(r#" +struct Foo(Vec); + +macro_rules! foo { + ($($item:expr),*) => { + { + Foo(vec![$($item,)*]) + } + }; +} + +fn main() { + let x = foo!(1,2); +} +"#), + @r###" +[156; 182) '{ ...,2); }': () +[166; 167) 'x': Foo"### + ); +} + #[ignore] #[test] fn method_resolution_trait_before_autoref() { @@ -2510,6 +2534,7 @@ fn type_at(content: &str) -> String { fn infer(content: &str) -> String { let (db, _, file_id) = MockDatabase::with_single_file(content); let source_file = db.parse(file_id); + let mut acc = String::new(); acc.push_str("\n"); @@ -2532,6 +2557,7 @@ fn infer(content: &str) -> String { }; types.push((syntax_ptr, ty)); } + // sort ranges for consistency types.sort_by_key(|(ptr, _)| (ptr.range().start(), ptr.range().end())); for (syntax_ptr, ty) in &types { -- cgit v1.2.3