language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-28 18:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #19363 from euclio/varargs-detail

Browse source 
display varargs in completion detail
This commit is contained in:
Lukas Wirth 2025-03-16 13:43:11 +00:00 • committed by GitHub
commit 8b5816b4f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 58 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/hir/src/lib.rs
View file

@ -2363,6 +2363,10 @@ impl Function {
db.function_data(self.id).is_async()
}
pub fn is_varargs(self, db: &dyn HirDatabase) -> bool {
db.function_data(self.id).is_varargs()
}
pub fn extern_block(self, db: &dyn HirDatabase) -> Option<ExternBlock> {
match self.id.lookup(db.upcast()).container {
ItemContainerId::ExternBlockId(id) => Some(ExternBlock { id }),

47
crates/ide-completion/src/render.rs
View file

@ -1276,6 +1276,53 @@ fn main() { fo$0 }
);
}
#[test]
fn fn_detail_includes_variadics() {
check(
r#"
unsafe extern "C" fn foo(a: u32, b: u32, ...) {}
fn main() { fo$0 }
"#,
SymbolKind::Function,
expect![[r#"
[
CompletionItem {
label: "foo(…)",
detail_left: None,
detail_right: Some(
"unsafe fn(u32, u32, ...)",
),
source_range: 62..64,
delete: 62..64,
insert: "foo(${1:a}, ${2:b});$0",
kind: SymbolKind(
Function,
),
lookup: "foo",
detail: "unsafe fn(u32, u32, ...)",
trigger_call_info: true,
},
CompletionItem {
label: "main()",
detail_left: None,
detail_right: Some(
"fn()",
),
source_range: 62..64,
delete: 62..64,
insert: "main();$0",
kind: SymbolKind(
Function,
),
lookup: "main",
detail: "fn()",
},
]
"#]],
);
}
#[test]
fn enum_detail_just_name_for_unit() {
check(

8
crates/ide-completion/src/render/function.rs
View file

@ -343,7 +343,7 @@ fn detail_full(ctx: &CompletionContext<'_>, func: hir::Function) -> String {
}
fn params_display(ctx: &CompletionContext<'_>, func: hir::Function) -> String {
if let Some(self_param) = func.self_param(ctx.db) {
let mut params = if let Some(self_param) = func.self_param(ctx.db) {
let assoc_fn_params = func.assoc_fn_params(ctx.db);
let params = assoc_fn_params
.iter()
@ -360,7 +360,13 @@ fn params_display(ctx: &CompletionContext<'_>, func: hir::Function) -> String {
} else {
let assoc_fn_params = func.assoc_fn_params(ctx.db);
assoc_fn_params.iter().map(|p| p.ty().display(ctx.db, ctx.display_target)).join(", ")
};
if func.is_varargs(ctx.db) {
params.push_str(", ...");
}
params
}
fn params(