@@ -79,7 +79,7 @@ pub(crate) fn find_all_refs(
7979 retain_adt_literal_usages ( & mut usages, def, sema) ;
8080 }
8181
82- retain_import_usages ( & mut usages, sema ) ;
82+ retain_import_usages ( & mut usages) ;
8383
8484 let references = usages
8585 . into_iter ( )
@@ -114,33 +114,15 @@ pub(crate) fn find_all_refs(
114114 }
115115}
116116
117- fn retain_import_usages ( usages : & mut UsageSearchResult , sema : & Semantics < ' _ , RootDatabase > ) {
117+ fn retain_import_usages ( usages : & mut UsageSearchResult ) {
118118 // todo use this https://github.com/rust-lang/rust-analyzer/blob/master/crates/rust-analyzer/src/config.rs#L432
119119
120120 for ( _file_id, refs) in & mut usages. references {
121- refs. retain ( |it| {
122- match it. name . as_name_ref ( ) {
123- Some ( name_ref) => name_ref. syntax ( ) . ancestors ( ) . any ( |it_ref| {
124- dbg ! ( & it_ref) ;
125- !matches ! ( it_ref. kind( ) , USE )
126- } ) ,
127- None => true ,
121+ refs. retain ( |it| match it. name . as_name_ref ( ) {
122+ Some ( name_ref) => {
123+ !name_ref. syntax ( ) . ancestors ( ) . any ( |it_ref| matches ! ( it_ref. kind( ) , USE ) )
128124 }
129-
130- // this works:
131- // let file_sema = sema.parse(file_id.clone()).syntax().clone();
132-
133- // let maybe_node = file_sema.child_or_token_at_range(it.range.clone());
134-
135- // if let Some(node) = maybe_node {
136- // let res = match node {
137- // syntax::NodeOrToken::Node(x) => !matches!(x.kind(), USE),
138- // syntax::NodeOrToken::Token(_) => true,
139- // };
140- // res
141- // } else {
142- // true
143- // }
125+ None => true ,
144126 } ) ;
145127 }
146128}
0 commit comments