mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #14125 - Veykril:inlay-fix, r=Veykril

Browse Source 
fix: Fix bind pat inlay hints rendering for constant patterns

Fixes https://github.com/rust-lang/rust-analyzer/issues/14124
This commit is contained in:
bors 2023-02-11 15:30:46 +00:00
commit d78a0be9b0
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
crates/ide/src/inlay_hints/bind_pat.rs
View File

@ -67,28 +67,23 @@ fn should_not_display_type_hint(
return true;
}
if let Some(hir::Adt::Struct(s)) = pat_ty.as_adt() {
if s.fields(db).is_empty() && s.name(db).to_smol_str() == bind_pat.to_string() {
return true;
}
}
if config.hide_closure_initialization_hints {
if let Some(parent) = bind_pat.syntax().parent() {
if let Some(it) = ast::LetStmt::cast(parent) {
if let Some(ast::Expr::ClosureExpr(closure)) = it.initializer() {
if closure_has_block_body(&closure) {
return true;
}
}
}
}
if sema.resolve_bind_pat_to_const(bind_pat).is_some() {
return true;
}
for node in bind_pat.syntax().ancestors() {
match_ast! {
match node {
ast::LetStmt(it) => return it.ty().is_some(),
ast::LetStmt(it) => {
if config.hide_closure_initialization_hints {
if let Some(ast::Expr::ClosureExpr(closure)) = it.initializer() {
if closure_has_block_body(&closure) {
return true;
}
}
}
return it.ty().is_some()
},
// FIXME: We might wanna show type hints in parameters for non-top level patterns as well
ast::Param(it) => return it.ty().is_some(),
ast::MatchArm(_) => return pat_is_enum_variant(db, bind_pat, pat_ty),
@ -567,6 +562,21 @@ fn main() {
);
}
#[test]
fn const_pats_have_no_type_hints() {
check_types(
r#"
const FOO: usize = 0;
fn main() {
match 0 {
FOO => (),
_ => ()
}
}"#,
);
}
#[test]
fn let_statement() {
check_types(