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

Hide synthetic locals from completions

Browse source
This commit is contained in:
Lukas Wirth 2025-01-04 16:48:08 +01:00
parent db55d9ade0
commit bf7597cd5a
3 changed files with 85 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/ide-completion/src/completions/expr.rs
View file

@ -293,9 +293,17 @@ pub(crate) fn complete_expr_path(
[..] => acc.add_path_resolution(ctx, path_ctx, name, def, doc_aliases),
}
}
// synthetic names currently leak out as we lack synthetic hygiene, so filter them
// out here
ScopeDef::Local(_) => {
if !name.as_str().starts_with('<') {
acc.add_path_resolution(ctx, path_ctx, name, def, doc_aliases)
}
}
_ if scope_def_applicable(def) => {
acc.add_path_resolution(ctx, path_ctx, name, def, doc_aliases)
}
_ => (),
});

5
crates/ide-completion/src/context.rs
View file

@ -754,6 +754,11 @@ impl<'a> CompletionContext<'a> {
let mut locals = FxHashMap::default();
scope.process_all_names(&mut |name, scope| {
if let ScopeDef::Local(local) = scope {
// synthetic names currently leak out as we lack synthetic hygiene, so filter them
// out here
if name.as_str().starts_with('<') {
return;
}
locals.insert(name, local);
}
});

72
crates/ide-completion/src/tests/expression.rs
View file

@ -1785,3 +1785,75 @@ fn foo<T: ExcludedTrait>() {
"#]],
);
}
#[test]
fn hide_ragennew_synthetic_identifiers() {
check_empty(
r#"
//- minicore: iterator
fn bar() {
for i in [0; 10] {
r$0
}
}
"#,
expect![[r#"
en Option Option<{unknown}>
en Result Result<{unknown}, {unknown}>
fn bar() fn()
lc i i32
ma const_format_args!(…) macro_rules! const_format_args
ma format_args!(…) macro_rules! format_args
ma format_args_nl!(…) macro_rules! format_args_nl
ma panic!(…) macro_rules! panic
ma print!(…) macro_rules! print
md core
md result (use core::result)
md rust_2015 (use core::prelude::rust_2015)
md rust_2018 (use core::prelude::rust_2018)
md rust_2021 (use core::prelude::rust_2021)
tt Clone
tt Copy
tt IntoIterator
tt Iterator
ta Result (use core::fmt::Result)
ev Err(…) Err(E)
ev None None
ev Ok(…) Ok(T)
ev Some(…) Some(T)
bt u32 u32
kw async
kw break
kw const
kw continue
kw crate::
kw enum
kw extern
kw false
kw fn
kw for
kw if
kw if let
kw impl
kw let
kw loop
kw match
kw mod
kw return
kw self::
kw static
kw struct
kw trait
kw true
kw type
kw union
kw unsafe
kw use
kw while
kw while let
sn macro_rules
sn pd
sn ppd
"#]],
);
}