Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-29 06:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: Use render_eval for all builtins

Browse source
This commit is contained in:
Viktor Lott 2023-06-04 21:34:25 +02:00
parent 8103a10a78
commit 2d4cb780b6
1 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
crates/ide-assists/src/handlers/inline_const_as_literal.rs
View file

@ -66,8 +66,6 @@ fn eval_and_inline_recursively(
(true, ast::Expr::BlockExpr(block)) if block.is_standalone() => { (true, ast::Expr::BlockExpr(block)) if block.is_standalone() => {
eval_and_inline_recursively(ctx, konst, &block.tail_expr()?, fuel - 1) eval_and_inline_recursively(ctx, konst, &block.tail_expr()?, fuel - 1)
} }
(_, ast::Expr::Literal(lit)) => Some(lit.to_string()),
// NOTE: For some expressions, `render_eval` will crash. // NOTE: For some expressions, `render_eval` will crash.
// e.g. `{ &[&[&[&[&[&[10, 20, 30]]]]]] }` will fail for `render_eval`. // e.g. `{ &[&[&[&[&[&[10, 20, 30]]]]]] }` will fail for `render_eval`.
// //
@ -85,6 +83,7 @@ fn eval_and_inline_recursively(
// > const A: &[u32] = { &[10] }; OK because we inline ref expression. // > const A: &[u32] = { &[10] }; OK because we inline ref expression.
// > const B: &[u32] = { { &[10] } }; ERROR because we evaluate block. // > const B: &[u32] = { { &[10] } }; ERROR because we evaluate block.
(_, ast::Expr::BlockExpr(_)) (_, ast::Expr::BlockExpr(_))
| (_, ast::Expr::Literal(_))
| (_, ast::Expr::RefExpr(_)) | (_, ast::Expr::RefExpr(_))
| (_, ast::Expr::ArrayExpr(_)) | (_, ast::Expr::ArrayExpr(_))
| (_, ast::Expr::TupleExpr(_)) | (_, ast::Expr::TupleExpr(_))
@ -130,7 +129,7 @@ fn validate_type_recursively(
validate_type_recursively(ctx, ty.as_slice().as_ref(), false, fuel - 1) validate_type_recursively(ctx, ty.as_slice().as_ref(), false, fuel - 1)
} }
(_, Some(ty)) => match ty.as_builtin() { (_, Some(ty)) => match ty.as_builtin() {
// `const A: str` is not correct, `const A: &builtin` is always correct. // `const A: str` is not correct, but `const A: &builtin` is.
Some(builtin) if refed || (!refed && !builtin.is_str()) => Some(()), Some(builtin) if refed || (!refed && !builtin.is_str()) => Some(()),
_ => None, _ => None,
}, },
@ -438,20 +437,35 @@ mod tests {
} }
// FIXME: These won't work with `konst.render_eval(ctx.sema.db)` // FIXME: These won't work with `konst.render_eval(ctx.sema.db)`
// #[test] #[test]
// fn inline_const_as_literal_block_slice() { fn inline_const_as_literal_block_slice() {
// check_assist( check_assist(
// inline_const_as_literal, inline_const_as_literal,
// r#" r#"
// const ABC: &[&[&[&[&[&[i32]]]]]] = { &[&[&[&[&[&[10, 20, 30]]]]]] }; const ABC: &[&[&[&[&[&[i32]]]]]] = { &[&[&[&[&[&[10, 20, 30]]]]]] };
// fn a() { A$0BC } fn a() { A$0BC }
// "#, "#,
// r#" r#"
// const ABC: &[&[&[&[&[&[i32]]]]]] = { &[&[&[&[&[&[10, 20, 30]]]]]] }; const ABC: &[&[&[&[&[&[i32]]]]]] = { &[&[&[&[&[&[10, 20, 30]]]]]] };
// fn a() { &[&[&[&[&[&[10, 20, 30]]]]]] } fn a() { &[&[&[&[&[&[10, 20, 30]]]]]] }
// "#, "#,
// ); );
// } }
#[test]
fn inline_const_as_literal_block_slice_single() {
check_assist(
inline_const_as_literal,
r#"
const ABC: [i32; 1] = { [10] };
fn a() { A$0BC }
"#,
r#"
const ABC: [i32; 1] = { [10] };
fn a() { [10] }
"#,
);
}
// #[test] // #[test]
// fn inline_const_as_literal_block_array() { // fn inline_const_as_literal_block_array() {