Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-01 07:48:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add fallback for return type

Browse source
This commit is contained in:
iDawer 2022-04-23 16:45:47 +05:00
parent fae9049ccd
commit baa4fa09ef
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/ide/src/signature_help.rs
View file

@ -149,9 +149,9 @@ fn signature_help_for_call(
} }
// APITs (argument position `impl Trait`s) are inferred as {unknown} as the user is // APITs (argument position `impl Trait`s) are inferred as {unknown} as the user is
// in the middle of entering call arguments. // in the middle of entering call arguments.
// In that case, fall back to render definition of the argument. // In that case, fall back to render definitions of the respective parameters.
// This is overly conservative: we do not substitute known type vars // This is overly conservative: we do not substitute known type vars
// (see FIXME in tests::impl_trait). // (see FIXME in tests::impl_trait) and falling back on any unknowns.
match (ty.contains_unknown(), fn_params.as_deref()) { match (ty.contains_unknown(), fn_params.as_deref()) {
(true, Some(fn_params)) => format_to!(buf, "{}", fn_params[idx].ty().display(db)), (true, Some(fn_params)) => format_to!(buf, "{}", fn_params[idx].ty().display(db)),
_ => format_to!(buf, "{}", ty.display(db)), _ => format_to!(buf, "{}", ty.display(db)),
@ -161,12 +161,17 @@ fn signature_help_for_call(
} }
res.signature.push(')'); res.signature.push(')');
match callable.kind() { let mut render = |ret_type: hir::Type| {
hir::CallableKind::Function(_) | hir::CallableKind::Closure => {
let ret_type = callable.return_type();
if !ret_type.is_unit() { if !ret_type.is_unit() {
format_to!(res.signature, " -> {}", ret_type.display(db)); format_to!(res.signature, " -> {}", ret_type.display(db));
} }
};
match callable.kind() {
hir::CallableKind::Function(func) if callable.return_type().contains_unknown() => {
render(func.ret_type(db))
}
hir::CallableKind::Function(_) | hir::CallableKind::Closure => {
render(callable.return_type())
} }
hir::CallableKind::TupleStruct(_) | hir::CallableKind::TupleEnumVariant(_) => {} hir::CallableKind::TupleStruct(_) | hir::CallableKind::TupleEnumVariant(_) => {}
} }
@ -444,7 +449,7 @@ fn foo<T>() -> T where T: Copy + Display {}
fn bar() { foo($0); } fn bar() { foo($0); }
"#, "#,
expect![[r#" expect![[r#"
fn foo() -> {unknown} fn foo() -> T
"#]], "#]],
); );
} }