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

Create Callables for generic types implementing FnOnce

Browse source
This commit is contained in:
Jonas Schievink 2022-11-01 16:33:59 +01:00
parent 07f6efc4e7
commit ecad1a9a6e
4 changed files with 105 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -149,7 +149,7 @@ fn signature_help_for_call(
variant.name(db)
);
}
hir::CallableKind::Closure | hir::CallableKind::FnPtr => (),
hir::CallableKind::Closure | hir::CallableKind::FnPtr | hir::CallableKind::Other => (),
}
res.signature.push('(');
@ -189,9 +189,10 @@ fn signature_help_for_call(
hir::CallableKind::Function(func) if callable.return_type().contains_unknown() => {
render(func.ret_type(db))
}
hir::CallableKind::Function(_) | hir::CallableKind::Closure | hir::CallableKind::FnPtr => {
render(callable.return_type())
}
hir::CallableKind::Function(_)
| hir::CallableKind::Closure
| hir::CallableKind::FnPtr
| hir::CallableKind::Other => render(callable.return_type()),
hir::CallableKind::TupleStruct(_) | hir::CallableKind::TupleEnumVariant(_) => {}
}
Some(res)
@ -387,10 +388,9 @@ mod tests {
}
fn check(ra_fixture: &str, expect: Expect) {
// Implicitly add `Sized` to avoid noisy `T: ?Sized` in the results.
let fixture = format!(
r#"
#[lang = "sized"] trait Sized {{}}
//- minicore: sized, fn
{ra_fixture}
"#
);
@ -1331,4 +1331,19 @@ fn f() {
"#]],
);
}
#[test]
fn help_for_generic_call() {
check(
r#"
fn f<F: FnOnce(u8, u16) -> i32>(f: F) {
f($0)
}
"#,
expect![[r#"
(u8, u16) -> i32
^^ ---
"#]],
);
}
}