rust-analyzer

diff --git a/crates/ide-db/src/search.rs b/crates/ide-db/src/search.rs
index a596134178..a521ab61a2 100644
--- a/crates/ide-db/src/search.rs
+++ b/crates/ide-db/src/search.rs

@@ -134,6 +134,7 @@ pub enum ReferenceCategory {

// FIXME: Some day should be able to search in doc comments. Would probably

// need to switch from enum to bitflags then?

// DocComment

+ Test,

}

/// Generally, `search_scope` returns files that might contain references for the element.

@@ -743,7 +744,7 @@ impl<'a> FindUsages<'a> {

let reference = FileReference {

range,

- category: ReferenceCategory::new(&def, name_ref),

+ category: ReferenceCategory::new(self.sema, &def, name_ref),

};

sink(file_id, reference)

}

@@ -759,7 +760,7 @@ impl<'a> FindUsages<'a> {

let reference = FileReference {

range,

- category: ReferenceCategory::new(&def, name_ref),

+ category: ReferenceCategory::new(self.sema, &def, name_ref),

};

sink(file_id, reference)

}

@@ -769,7 +770,7 @@ impl<'a> FindUsages<'a> {

let reference = FileReference {

range,

- category: ReferenceCategory::new(&def, name_ref),

+ category: ReferenceCategory::new(self.sema, &def, name_ref),

};

sink(file_id, reference)

} else {

@@ -783,10 +784,10 @@ impl<'a> FindUsages<'a> {

let local = Definition::Local(local);

let access = match self.def {

Definition::Field(_) if field == self.def => {

- ReferenceCategory::new(&field, name_ref)

+ ReferenceCategory::new(self.sema, &field, name_ref)

}

Definition::Local(_) if local == self.def => {

- ReferenceCategory::new(&local, name_ref)

+ ReferenceCategory::new(self.sema, &local, name_ref)

}

_ => return false,

};

@@ -871,7 +872,15 @@ fn def_to_ty(sema: &Semantics<'_, RootDatabase>, def: &Definition) -> Option<hir

}

impl ReferenceCategory {

- fn new(def: &Definition, r: &ast::NameRef) -> Option<ReferenceCategory> {

+ fn new(

+ sema: &Semantics<'_, RootDatabase>,

+ def: &Definition,

+ r: &ast::NameRef,

+ ) -> Option<ReferenceCategory> {

+ if is_name_ref_in_test(sema, r) {

+ return Some(ReferenceCategory::Test);

+ }

// Only Locals and Fields have accesses for now.

if !matches!(def, Definition::Local(_) | Definition::Field(_)) {

return is_name_ref_in_import(r).then_some(ReferenceCategory::Import);

@@ -910,3 +919,10 @@ fn is_name_ref_in_import(name_ref: &ast::NameRef) -> bool {

.and_then(|it| it.parent_path().top_path().syntax().parent())

.map_or(false, |it| it.kind() == SyntaxKind::USE_TREE)

}

+fn is_name_ref_in_test(sema: &Semantics<'_, RootDatabase>, name_ref: &ast::NameRef) -> bool {

+ name_ref.syntax().ancestors().any(|node| match ast::Fn::cast(node) {

+ Some(it) => sema.to_def(&it).map_or(false, |func| func.is_test(sema.db)),

+ None => false,

+ })

diff --git a/crates/ide/src/highlight_related.rs b/crates/ide/src/highlight_related.rs
index c1c62e3cda..979ca4575d 100644
--- a/crates/ide/src/highlight_related.rs
+++ b/crates/ide/src/highlight_related.rs

@@ -519,6 +519,7 @@ mod tests {

ReferenceCategory::Read => "read",

ReferenceCategory::Write => "write",

ReferenceCategory::Import => "import",

+ ReferenceCategory::Test => "test",

}

.to_string()

}),

diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index df7a4a3332..bdda25a111 100644
--- a/crates/ide/src/references.rs
+++ b/crates/ide/src/references.rs

@@ -308,6 +308,51 @@ mod tests {

use crate::{fixture, SearchScope};

#[test]

+ fn exclude_tests() {

+ check(

+ r#"

+fn test_func() {}

+fn func() {

+ test_func$0();

+#[test]

+fn test() {

+ test_func();

+"#,

+ expect![[r#"

+ test_func Function FileId(0) 0..17 3..12

+ FileId(0) 35..44

+ FileId(0) 75..84 Test

+ "#]],

+ );

+ check(

+ r#"

+fn test_func() {}

+fn func() {

+ test_func$0();

+#[::core::prelude::v1::test]

+fn test() {

+ test_func();

+"#,

+ expect![[r#"

+ test_func Function FileId(0) 0..17 3..12

+ FileId(0) 35..44

+ FileId(0) 96..105 Test

+ "#]],

+ );

+ }

+ #[test]

fn test_struct_literal_after_space() {

check(

r#"

@@ -454,6 +499,7 @@ fn main() {

"#]],

);

}

#[test]

fn test_variant_tuple_before_paren() {

check(

@@ -1435,7 +1481,7 @@ fn test$0() {

expect![[r#"

test Function FileId(0) 0..33 11..15

- FileId(0) 24..28

+ FileId(0) 24..28 Test

"#]],

);

}

diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 3c1b464c3c..eeb28b8fe4 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs

@@ -494,6 +494,9 @@ config_data! {

/// Exclude imports from find-all-references.

references_excludeImports: bool = "false",

+ /// Exclude tests from find-all-references.

+ references_excludeTests: bool = "false",

/// Allow renaming of items not belonging to the loaded workspaces.

rename_allowExternalItems: bool = "false",

@@ -1545,6 +1548,10 @@ impl Config {

self.data.references_excludeImports

}

+ pub fn find_all_refs_exclude_tests(&self) -> bool {

+ self.data.references_excludeTests

+ }

pub fn snippet_cap(&self) -> bool {

self.experimental("snippetTextEdit")

}

diff --git a/crates/rust-analyzer/src/handlers/request.rs b/crates/rust-analyzer/src/handlers/request.rs
index 90c3a88cb8..2be2ba5c44 100644
--- a/crates/rust-analyzer/src/handlers/request.rs
+++ b/crates/rust-analyzer/src/handlers/request.rs

@@ -1055,6 +1055,7 @@ pub(crate) fn handle_references(

let position = from_proto::file_position(&snap, params.text_document_position)?;

let exclude_imports = snap.config.find_all_refs_exclude_imports();

+ let exclude_tests = snap.config.find_all_refs_exclude_tests();

let refs = match snap.analysis.find_all_refs(position, None)? {

None => return Ok(None),

@@ -1078,7 +1079,8 @@ pub(crate) fn handle_references(

.flat_map(|(file_id, refs)| {

refs.into_iter()

.filter(|&(_, category)| {

- !exclude_imports || category != Some(ReferenceCategory::Import)

+ (!exclude_imports || category != Some(ReferenceCategory::Import))

+ && (!exclude_tests || category != Some(ReferenceCategory::Test))

})

.map(move |(range, _)| FileRange { file_id, range })

})

diff --git a/crates/rust-analyzer/src/lsp/to_proto.rs b/crates/rust-analyzer/src/lsp/to_proto.rs
index fe381fbeb3..f221863aff 100644
--- a/crates/rust-analyzer/src/lsp/to_proto.rs
+++ b/crates/rust-analyzer/src/lsp/to_proto.rs

@@ -92,6 +92,7 @@ pub(crate) fn document_highlight_kind(

ReferenceCategory::Read => Some(lsp_types::DocumentHighlightKind::READ),

ReferenceCategory::Write => Some(lsp_types::DocumentHighlightKind::WRITE),

ReferenceCategory::Import => None,

+ ReferenceCategory::Test => None,

}

diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc
index f887bb9df3..cfa7503d73 100644
--- a/docs/user/generated_config.adoc
+++ b/docs/user/generated_config.adoc

@@ -777,6 +777,11 @@ Internal config, path to proc-macro server executable.

Exclude imports from find-all-references.

+[[rust-analyzer.references.excludeTests]]rust-analyzer.references.excludeTests (default: `false`)::

+--

+Exclude tests from find-all-references.

+--

[[rust-analyzer.rename.allowExternalItems]]rust-analyzer.rename.allowExternalItems (default: `false`)::

diff --git a/editors/code/package.json b/editors/code/package.json
index 5ed5146ea1..841e364ed8 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json

@@ -1505,6 +1505,11 @@

"default": false,

"type": "boolean"

+ "rust-analyzer.references.excludeTests": {

+ "markdownDescription": "Exclude tests from find-all-references.",

+ "default": false,

+ "type": "boolean"

+ },

"rust-analyzer.rename.allowExternalItems": {

"markdownDescription": "Allow renaming of items not belonging to the loaded workspaces.",

"default": false,