language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Handle #[cfg] on call arguments

Browse source
This commit is contained in:
Jonas Schievink 2021-03-17 15:08:46 +01:00
parent 0fbfab3b45
commit cb530e7c97
2 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/hir_def/src/body/lower.rs
View file

@ -177,12 +177,15 @@ impl ExprCollector<'_> {
} }
fn collect_expr(&mut self, expr: ast::Expr) -> ExprId { fn collect_expr(&mut self, expr: ast::Expr) -> ExprId {
let syntax_ptr = AstPtr::new(&expr); self.maybe_collect_expr(expr).unwrap_or_else(|| self.missing_expr())
if self.check_cfg(&expr).is_none() {
return self.missing_expr();
} }
match expr { /// Returns `None` if the expression is `#[cfg]`d out.
fn maybe_collect_expr(&mut self, expr: ast::Expr) -> Option<ExprId> {
let syntax_ptr = AstPtr::new(&expr);
self.check_cfg(&expr)?;
Some(match expr {
ast::Expr::IfExpr(e) => { ast::Expr::IfExpr(e) => {
let then_branch = self.collect_block_opt(e.then_branch()); let then_branch = self.collect_block_opt(e.then_branch());
@ -211,8 +214,9 @@ impl ExprCollector<'_> {
guard: None, guard: None,
}, },
]; ];
return self return Some(
.alloc_expr(Expr::Match { expr: match_expr, arms }, syntax_ptr); self.alloc_expr(Expr::Match { expr: match_expr, arms }, syntax_ptr),
);
} }
}, },
}; };
@ -283,8 +287,9 @@ impl ExprCollector<'_> {
]; ];
let match_expr = let match_expr =
self.alloc_expr_desugared(Expr::Match { expr: match_expr, arms }); self.alloc_expr_desugared(Expr::Match { expr: match_expr, arms });
return self return Some(
.alloc_expr(Expr::Loop { body: match_expr, label }, syntax_ptr); self.alloc_expr(Expr::Loop { body: match_expr, label }, syntax_ptr),
);
} }
}, },
}; };
@ -301,7 +306,7 @@ impl ExprCollector<'_> {
ast::Expr::CallExpr(e) => { ast::Expr::CallExpr(e) => {
let callee = self.collect_expr_opt(e.expr()); let callee = self.collect_expr_opt(e.expr());
let args = if let Some(arg_list) = e.arg_list() { let args = if let Some(arg_list) = e.arg_list() {
arg_list.args().map(|e| self.collect_expr(e)).collect() arg_list.args().filter_map(|e| self.maybe_collect_expr(e)).collect()
} else { } else {
Vec::new() Vec::new()
}; };
@ -310,7 +315,7 @@ impl ExprCollector<'_> {
ast::Expr::MethodCallExpr(e) => { ast::Expr::MethodCallExpr(e) => {
let receiver = self.collect_expr_opt(e.receiver()); let receiver = self.collect_expr_opt(e.receiver());
let args = if let Some(arg_list) = e.arg_list() { let args = if let Some(arg_list) = e.arg_list() {
arg_list.args().map(|e| self.collect_expr(e)).collect() arg_list.args().filter_map(|e| self.maybe_collect_expr(e)).collect()
} else { } else {
Vec::new() Vec::new()
}; };
@ -538,7 +543,7 @@ impl ExprCollector<'_> {
self.alloc_expr(Expr::Missing, syntax_ptr) self.alloc_expr(Expr::Missing, syntax_ptr)
} }
} }
} })
} }
fn collect_macro_call<F: FnMut(&mut Self, Option<T>), T: ast::AstNode>( fn collect_macro_call<F: FnMut(&mut Self, Option<T>), T: ast::AstNode>(

23
crates/hir_ty/src/diagnostics/expr.rs
View file

@ -690,4 +690,27 @@ fn main() {
"#, "#,
) )
} }
#[test]
fn cfgd_out_call_arguments() {
check_diagnostics(
r#"
struct C(#[cfg(FALSE)] ());
impl C {
fn new() -> Self {
Self(
#[cfg(FALSE)]
(),
)
}
fn method(&self) {}
}
fn main() {
C::new().method(#[cfg(FALSE)] 0);
}
"#,
);
}
} }