itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #14551 - lowr:patch/no-unstable-item-compl-on-stable, r=Veykril

Browse Source 
Fix faulty variable extraction

Followup to #14549

Fixes https://github.com/rust-lang/rust-analyzer/pull/14549#discussion_r1163128814 and https://github.com/rust-lang/rust-analyzer/pull/14549#discussion_r1163132104
This commit is contained in:
bors 2023-04-11 17:43:15 +00:00
commit 7501d3b721
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ide-completion/src/completions/flyimport.rs
View File

@ -267,10 +267,10 @@ fn import_on_the_fly(
.into_iter() .into_iter()
.filter(ns_filter) .filter(ns_filter)
.filter(|import| { .filter(|import| {
let item = &import.item_to_import; let original_item = &import.original_item;
!ctx.is_item_hidden(item) !ctx.is_item_hidden(&import.item_to_import)
&& !ctx.is_item_hidden(item) && !ctx.is_item_hidden(original_item)
&& ctx.check_stability(item.attrs(ctx.db).as_deref()) && ctx.check_stability(original_item.attrs(ctx.db).as_deref())
}) })
.sorted_by_key(|located_import| { .sorted_by_key(|located_import| {
compute_fuzzy_completion_order_key( compute_fuzzy_completion_order_key(
@ -317,10 +317,10 @@ fn import_on_the_fly_pat_(
.into_iter() .into_iter()
.filter(ns_filter) .filter(ns_filter)
.filter(|import| { .filter(|import| {
let item = &import.item_to_import; let original_item = &import.original_item;
!ctx.is_item_hidden(item) !ctx.is_item_hidden(&import.item_to_import)
&& !ctx.is_item_hidden(item) && !ctx.is_item_hidden(original_item)
&& ctx.check_stability(item.attrs(ctx.db).as_deref()) && ctx.check_stability(original_item.attrs(ctx.db).as_deref())
}) })
.sorted_by_key(|located_import| { .sorted_by_key(|located_import| {
compute_fuzzy_completion_order_key( compute_fuzzy_completion_order_key(