Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter imports on find-all-references #13186

Merged
merged 12 commits into from
Sep 12, 2022
Merged

Filter imports on find-all-references #13186

Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
29729ab
Retain imports on find-all-references
enomado Sep 4, 2022
ba40aa7
Update crates/ide/src/references.rs
enomado Sep 4, 2022
6001e7d
fix
enomado Sep 4, 2022
bd0eeb3
Update crates/ide/src/references.rs
enomado Sep 7, 2022
92d54f9
typo and draft
enomado Sep 7, 2022
eba54c2
pretty solition works
enomado Sep 7, 2022
9f6553e
add config for import filtering
enomado Sep 7, 2022
1764c42
fix comment
enomado Sep 8, 2022
0240294
fix comment round 2
enomado Sep 8, 2022
ab0b64b
fix comment round 3
enomado Sep 8, 2022
773f9b3
fix. round 4
enomado Sep 8, 2022
f7f4792
fixes
enomado Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions crates/ide/src/references.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ pub(crate) fn find_all_refs(
retain_adt_literal_usages(&mut usages, def, sema);
}

retain_import_usages(&mut usages, sema);

let references = usages
.into_iter()
.map(|(file_id, refs)| {
Expand Down Expand Up @@ -112,6 +114,26 @@ pub(crate) fn find_all_refs(
}
}

fn retain_import_usages(usages: &mut UsageSearchResult, sema: &Semantics<'_, RootDatabase>) {
enomado marked this conversation as resolved.
Show resolved Hide resolved
for (file_id, refs) in &mut usages.references {
refs.retain(|x| {
let file_sema = sema.parse(file_id.clone()).syntax().clone();

let maybe_node = file_sema.child_or_token_at_range(x.range.clone());

if let Some(node) = maybe_node {
let res = match node {
syntax::NodeOrToken::Node(x) => !matches!(x.kind(), USE),
enomado marked this conversation as resolved.
Show resolved Hide resolved
syntax::NodeOrToken::Token(_) => true,
};
res
} else {
true
}
});
enomado marked this conversation as resolved.
Show resolved Hide resolved
}
}

pub(crate) fn find_defs<'a>(
sema: &'a Semantics<'_, RootDatabase>,
syntax: &SyntaxNode,
Expand Down