From 9791b9c36a7b59f94c257b3ca019ae76e66a6879 Mon Sep 17 00:00:00 2001 From: kjeremy Date: Wed, 8 Jan 2020 16:35:58 -0500 Subject: Actually test references --- crates/ra_ide/src/lib.rs | 2 +- crates/ra_ide/src/references.rs | 112 +++++++++++++++++++++++++++++++++++----- 2 files changed, 99 insertions(+), 15 deletions(-) (limited to 'crates/ra_ide') diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs index 06497617b..7b187eba3 100644 --- a/crates/ra_ide/src/lib.rs +++ b/crates/ra_ide/src/lib.rs @@ -75,7 +75,7 @@ pub use crate::{ inlay_hints::{InlayHint, InlayKind}, line_index::{LineCol, LineIndex}, line_index_utils::translate_offset_with_edit, - references::{ReferenceSearchResult, SearchScope}, + references::{Reference, ReferenceKind, ReferenceSearchResult, SearchScope}, runnables::{Runnable, RunnableKind}, source_change::{FileSystemEdit, SourceChange, SourceFileEdit}, syntax_highlighting::HighlightedRange, diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs index a0226b1bc..d1f52f808 100644 --- a/crates/ra_ide/src/references.rs +++ b/crates/ra_ide/src/references.rs @@ -214,7 +214,7 @@ fn process_definition( mod tests { use crate::{ mock_analysis::{analysis_and_position, single_file_with_position, MockAnalysis}, - ReferenceSearchResult, SearchScope, + Reference, ReferenceKind, ReferenceSearchResult, SearchScope, }; #[test] @@ -232,7 +232,12 @@ mod tests { }"#; let refs = get_all_refs(code); - assert_eq!(refs.len(), 2); + check_result( + refs, + "Foo STRUCT_DEF FileId(1) [5; 39) [12; 15)", + ReferenceKind::Other, + &["FileId(1) [142; 145) StructLiteral"], + ); } #[test] @@ -251,7 +256,17 @@ mod tests { }"#; let refs = get_all_refs(code); - assert_eq!(refs.len(), 5); + check_result( + refs, + "i BIND_PAT FileId(1) [33; 34)", + ReferenceKind::Other, + &[ + "FileId(1) [67; 68) Other", + "FileId(1) [71; 72) Other", + "FileId(1) [101; 102) Other", + "FileId(1) [127; 128) Other", + ], + ); } #[test] @@ -262,7 +277,12 @@ mod tests { }"#; let refs = get_all_refs(code); - assert_eq!(refs.len(), 2); + check_result( + refs, + "i BIND_PAT FileId(1) [12; 13)", + ReferenceKind::Other, + &["FileId(1) [38; 39) Other"], + ); } #[test] @@ -273,7 +293,12 @@ mod tests { }"#; let refs = get_all_refs(code); - assert_eq!(refs.len(), 2); + check_result( + refs, + "i BIND_PAT FileId(1) [12; 13)", + ReferenceKind::Other, + &["FileId(1) [38; 39) Other"], + ); } #[test] @@ -290,7 +315,12 @@ mod tests { "#; let refs = get_all_refs(code); - assert_eq!(refs.len(), 2); + check_result( + refs, + "spam RECORD_FIELD_DEF FileId(1) [66; 79) [70; 74)", + ReferenceKind::Other, + &["FileId(1) [152; 156) Other"], + ); } #[test] @@ -304,7 +334,7 @@ mod tests { "#; let refs = get_all_refs(code); - assert_eq!(refs.len(), 1); + check_result(refs, "f FN_DEF FileId(1) [88; 104) [91; 92)", ReferenceKind::Other, &[]); } #[test] @@ -319,7 +349,7 @@ mod tests { "#; let refs = get_all_refs(code); - assert_eq!(refs.len(), 1); + check_result(refs, "B ENUM_VARIANT FileId(1) [83; 84) [83; 84)", ReferenceKind::Other, &[]); } #[test] @@ -358,7 +388,12 @@ mod tests { let (analysis, pos) = analysis_and_position(code); let refs = analysis.find_all_refs(pos, None).unwrap().unwrap(); - assert_eq!(refs.len(), 3); + check_result( + refs, + "Foo STRUCT_DEF FileId(2) [16; 50) [27; 30)", + ReferenceKind::Other, + &["FileId(1) [52; 55) StructLiteral", "FileId(3) [77; 80) StructLiteral"], + ); } // `mod foo;` is not in the results because `foo` is an `ast::Name`. @@ -384,7 +419,12 @@ mod tests { let (analysis, pos) = analysis_and_position(code); let refs = analysis.find_all_refs(pos, None).unwrap().unwrap(); - assert_eq!(refs.len(), 2); + check_result( + refs, + "foo SOURCE_FILE FileId(2) [0; 35)", + ReferenceKind::Other, + &["FileId(1) [13; 16) Other"], + ); } #[test] @@ -409,7 +449,12 @@ mod tests { let (analysis, pos) = analysis_and_position(code); let refs = analysis.find_all_refs(pos, None).unwrap().unwrap(); - assert_eq!(refs.len(), 3); + check_result( + refs, + "Foo STRUCT_DEF FileId(3) [0; 41) [18; 21)", + ReferenceKind::Other, + &["FileId(2) [20; 23) Other", "FileId(2) [46; 49) StructLiteral"], + ); } #[test] @@ -433,11 +478,21 @@ mod tests { let analysis = mock.analysis(); let refs = analysis.find_all_refs(pos, None).unwrap().unwrap(); - assert_eq!(refs.len(), 3); + check_result( + refs, + "quux FN_DEF FileId(1) [18; 34) [25; 29)", + ReferenceKind::Other, + &["FileId(2) [16; 20) Other", "FileId(3) [16; 20) Other"], + ); let refs = analysis.find_all_refs(pos, Some(SearchScope::single_file(bar))).unwrap().unwrap(); - assert_eq!(refs.len(), 2); + check_result( + refs, + "quux FN_DEF FileId(1) [18; 34) [25; 29)", + ReferenceKind::Other, + &["FileId(3) [16; 20) Other"], + ); } #[test] @@ -452,11 +507,40 @@ mod tests { }"#; let refs = get_all_refs(code); - assert_eq!(refs.len(), 3); + check_result( + refs, + "m1 MACRO_CALL FileId(1) [9; 63) [46; 48)", + ReferenceKind::Other, + &["FileId(1) [96; 98) Other", "FileId(1) [114; 116) Other"], + ); } fn get_all_refs(text: &str) -> ReferenceSearchResult { let (analysis, position) = single_file_with_position(text); analysis.find_all_refs(position, None).unwrap().unwrap() } + + fn check_result( + res: ReferenceSearchResult, + expected_decl: &str, + decl_kind: ReferenceKind, + expected_refs: &[&str], + ) { + res.declaration().assert_match(expected_decl); + assert_eq!(res.declaration_kind, decl_kind); + + assert_eq!(res.references.len(), expected_refs.len()); + res.references().iter().enumerate().for_each(|(i, r)| r.assert_match(expected_refs[i])); + } + + impl Reference { + pub fn debug_render(&self) -> String { + format!("{:?} {:?} {:?}", self.file_range.file_id, self.file_range.range, self.kind) + } + + pub fn assert_match(&self, expected: &str) { + let actual = self.debug_render(); + test_utils::assert_eq_text!(expected.trim(), actual.trim(),); + } + } } -- cgit v1.2.3 From 6fc80efe7738af3b0d51e66591ea5451f45f6706 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Thu, 9 Jan 2020 07:26:04 -0500 Subject: visibility tweak --- crates/ra_ide/src/references.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/ra_ide') diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs index d1f52f808..5a3ec4eb9 100644 --- a/crates/ra_ide/src/references.rs +++ b/crates/ra_ide/src/references.rs @@ -534,11 +534,11 @@ mod tests { } impl Reference { - pub fn debug_render(&self) -> String { + fn debug_render(&self) -> String { format!("{:?} {:?} {:?}", self.file_range.file_id, self.file_range.range, self.kind) } - pub fn assert_match(&self, expected: &str) { + fn assert_match(&self, expected: &str) { let actual = self.debug_render(); test_utils::assert_eq_text!(expected.trim(), actual.trim(),); } -- cgit v1.2.3