completions: Add rudimentary support for closure completions#21683
Open
osiewicz wants to merge 6 commits intorust-lang:masterfrom
Open
completions: Add rudimentary support for closure completions#21683osiewicz wants to merge 6 commits intorust-lang:masterfrom
osiewicz wants to merge 6 commits intorust-lang:masterfrom
Conversation
osiewicz
force-pushed
the
closure-completions
branch
2 times, most recently
from
482555b to
815a349
Compare
rustbot
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: dino <dinojoaocosta@gmail.com>
Co-authored-by: dino <dinojoaocosta@gmail.com>
osiewicz
force-pushed
the
closure-completions
branch
from
4d5c11c to
1a36b43
Compare
parameter Co-authored-by: dino <dinojoaocosta@gmail.com>
Co-authored-by: dino <dinojoaocosta@gmail.com>
A4-Tacks
reviewed
Feb 20, 2026
| r#" | ||
| fn foo<T>(f: impl Fn(T) -> T) {} | ||
| fn main() { | ||
| foo(|${1:_}: ${2:T}| $0); |
Member
There was a problem hiding this comment.
Don't you consider using NameGenerator to generate parameters?
Just like a |x0, x1, items|
Contributor
Author
There was a problem hiding this comment.
I guess we could do that, yes.
Collaborator
|
☔ The latest upstream changes (possibly #21768) made this pull request unmergeable. Please resolve the merge conflicts. |
ChayimFriedman2
requested changes
Apr 6, 2026
Contributor
There was a problem hiding this comment.
Please also use NameGenerator like @A4-Tacks has said.
| } | ||
|
|
||
| /// Returns the generic substitution for this callable, if it is a function. | ||
| pub fn substitution(&self) -> Option<GenericSubstitution<'db>> { |
Contributor
There was a problem hiding this comment.
This should return the substitution for struct/enum constructors as well, even if not needed by this PR, for good measure.
| Some(items) => items, | ||
| }; | ||
|
|
||
| tracing::error!("{:?}", &items); |
| } | ||
|
|
||
| if trigger_character == Some('|') { | ||
| // 2026-02-13T11:30:41.704583Z ERROR CompletionAnalysis: Name(NameContext { |
| } | ||
| return Some(completions.into()); | ||
| } | ||
| tracing::error!("CompletionAnalysis: {:?}", &analysis); |
Comment on lines
+248
to
+251
| // Use the absolute index (which includes self) to index into assoc_fn_params, | ||
| // so that method calls with self don't cause an off-by-one. | ||
| let abs_index = callable.params().into_iter().nth(index)?.index(); | ||
| let generic_param_ty = fun.assoc_fn_params(ctx.db).into_iter().nth(abs_index)?.ty().clone(); |
Contributor
There was a problem hiding this comment.
Suggested change
| // Use the absolute index (which includes self) to index into assoc_fn_params, | |
| // so that method calls with self don't cause an off-by-one. | |
| let abs_index = callable.params().into_iter().nth(index)?.index(); | |
| let generic_param_ty = fun.assoc_fn_params(ctx.db).into_iter().nth(abs_index)?.ty().clone(); | |
| let generic_param_ty = fun.assoc_fn_params(ctx.db)[index + if is_method_call_syntax { 1 } else { 0 }].clone(); |
Simpler and more obvious, IMO.
Comment on lines
+253
to
+255
| if !generic_param_ty.impls_fnonce(ctx.db) { | ||
| return None; | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| if !generic_param_ty.impls_fnonce(ctx.db) { | |
| return None; | |
| } |
Can remove this, as_callable() will take care of that.
| let mut label = String::from("|"); | ||
| let mut snippet = String::new(); | ||
| let mut plain = String::new(); | ||
| let mut tab_stop = 1; |
Contributor
There was a problem hiding this comment.
When I write a closure, I first write the param names then the body. This also makes more sense since the body depends on the param names. So I think this should start from 0.
|
|
||
| if needs_annotation { | ||
| if let Ok(ty_str) = ty.display_source_code(ctx.db, module, true) { | ||
| write!(label, "{sep}_: {ty_str}").unwrap(); |
Contributor
There was a problem hiding this comment.
We have stdx::format_to!().
Contributor
|
@osiewicz, What's the status of this? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related to #8676
Related to #9444
CleanShot.2026-02-20.at.11.35.29.mp4
Closure parameter names are a bit wacky, but they've been that way even before this PR; we should probably filter out suggestions for patterns that cannot actually be destructured.