From 88b4ed56ccefccb3a36437706e85f92050705aad Mon Sep 17 00:00:00 2001 From: vsrs Date: Wed, 2 Sep 2020 18:21:20 +0300 Subject: [PATCH] Add tests --- crates/ide/src/fn_references.rs | 80 +++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/crates/ide/src/fn_references.rs b/crates/ide/src/fn_references.rs index ca91b98cf785..1989a562bec4 100644 --- a/crates/ide/src/fn_references.rs +++ b/crates/ide/src/fn_references.rs @@ -1,3 +1,6 @@ +//! This module implements a methods and free functions search in the specified file. +//! We have to skip tests, so cannot reuse file_structure module. + use hir::Semantics; use ide_db::RootDatabase; use syntax::{ast, ast::NameOwner, AstNode, SyntaxNode}; @@ -10,12 +13,83 @@ pub(crate) fn find_all_methods(db: &RootDatabase, file_id: FileId) -> Vec Option { - ast::Fn::cast(item).and_then(|fn_def|{ +fn method_range(item: SyntaxNode, file_id: FileId) -> Option { + ast::Fn::cast(item).and_then(|fn_def| { if has_test_related_attribute(&fn_def) { None } else { - fn_def.name().map(|name| FileRange{ file_id, range: name.syntax().text_range() }) + fn_def.name().map(|name| FileRange { file_id, range: name.syntax().text_range() }) } }) } + +#[cfg(test)] +mod tests { + use crate::mock_analysis::analysis_and_position; + use crate::{FileRange, TextSize}; + use std::ops::RangeInclusive; + + #[test] + fn test_find_all_methods() { + let (analysis, pos) = analysis_and_position( + r#" + //- /lib.rs + fn private_fn() {<|>} + + pub fn pub_fn() {} + + pub fn generic_fn(arg: T) {} + "#, + ); + + let refs = analysis.find_all_methods(pos.file_id).unwrap(); + check_result(&refs, &[3..=13, 27..=33, 47..=57]); + } + + #[test] + fn test_find_trait_methods() { + let (analysis, pos) = analysis_and_position( + r#" + //- /lib.rs + trait Foo { + fn bar() {<|>} + fn baz() {} + } + "#, + ); + + let refs = analysis.find_all_methods(pos.file_id).unwrap(); + check_result(&refs, &[19..=22, 35..=38]); + } + + #[test] + fn test_skip_tests() { + let (analysis, pos) = analysis_and_position( + r#" + //- /lib.rs + #[test] + fn foo() {<|>} + + pub fn pub_fn() {} + + mod tests { + #[test] + fn bar() {} + } + "#, + ); + + let refs = analysis.find_all_methods(pos.file_id).unwrap(); + check_result(&refs, &[28..=34]); + } + + fn check_result(refs: &[FileRange], expected: &[RangeInclusive]) { + assert_eq!(refs.len(), expected.len()); + + for (i, item) in refs.iter().enumerate() { + let range = &expected[i]; + assert_eq!(TextSize::from(*range.start()), item.range.start()); + assert_eq!(TextSize::from(*range.end()), item.range.end()); + } + } +}