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

Merge pull request #18458 from Giga-Bowser/master

Browse source 
feat: Add diagnostic fix to remove unnecessary wrapper in type mismatch
This commit is contained in:
Lukas Wirth 2024-12-11 07:09:15 +00:00 • committed by GitHub
commit 41f3319173
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 438 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

41
crates/syntax/src/ast/syntax_factory/constructors.rs
View file

@ -66,28 +66,41 @@ impl SyntaxFactory {
tail_expr: Option<ast::Expr>,
) -> ast::BlockExpr {
let stmts = stmts.into_iter().collect_vec();
let input = stmts.iter().map(|it| it.syntax().clone()).collect_vec();
let mut input = stmts.iter().map(|it| it.syntax().clone()).collect_vec();
let ast = make::block_expr(stmts, tail_expr.clone()).clone_for_update();
if let Some((mut mapping, stmt_list)) = self.mappings().zip(ast.stmt_list()) {
if let Some(mut mapping) = self.mappings() {
let stmt_list = ast.stmt_list().unwrap();
let mut builder = SyntaxMappingBuilder::new(stmt_list.syntax().clone());
if let Some(input) = tail_expr {
builder.map_node(
input.syntax().clone(),
stmt_list.tail_expr().unwrap().syntax().clone(),
);
} else if let Some(ast_tail) = stmt_list.tail_expr() {
// The parser interpreted the last statement (probably a statement with a block) as an Expr
let last_stmt = input.pop().unwrap();
builder.map_node(last_stmt, ast_tail.syntax().clone());
}
builder.map_children(
input.into_iter(),
stmt_list.statements().map(|it| it.syntax().clone()),
);
if let Some((input, output)) = tail_expr.zip(stmt_list.tail_expr()) {
builder.map_node(input.syntax().clone(), output.syntax().clone());
}
builder.finish(&mut mapping);
}
ast
}
pub fn expr_empty_block(&self) -> ast::BlockExpr {
ast::BlockExpr { syntax: make::expr_empty_block().syntax().clone_for_update() }
}
pub fn expr_bin(&self, lhs: ast::Expr, op: ast::BinaryOp, rhs: ast::Expr) -> ast::BinExpr {
let ast::Expr::BinExpr(ast) =
make::expr_bin_op(lhs.clone(), op, rhs.clone()).clone_for_update()
@ -134,6 +147,22 @@ impl SyntaxFactory {
ast.into()
}
pub fn expr_return(&self, expr: Option<ast::Expr>) -> ast::ReturnExpr {
let ast::Expr::ReturnExpr(ast) = make::expr_return(expr.clone()).clone_for_update() else {
unreachable!()
};
if let Some(mut mapping) = self.mappings() {
let mut builder = SyntaxMappingBuilder::new(ast.syntax().clone());
if let Some(input) = expr {
builder.map_node(input.syntax().clone(), ast.expr().unwrap().syntax().clone());
}
builder.finish(&mut mapping);
}
ast
}
pub fn let_stmt(
&self,
pattern: ast::Pat,