Skip to content

Commit 072ec1a

Browse files
committed
Fix tests
1 parent 994000b commit 072ec1a

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

crates/ra_ide/src/references.rs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ mod tests {
287287

288288
#[test]
289289
fn search_filters_by_range() {
290-
covers!(search_filters_by_range);
290+
covers!(ra_ide_db::search_filters_by_range);
291291
let code = r#"
292292
fn foo() {
293293
let spam<|> = 92;
@@ -603,7 +603,10 @@ mod tests {
603603
fn check_result(res: ReferenceSearchResult, expected_decl: &str, expected_refs: &[&str]) {
604604
res.declaration().assert_match(expected_decl);
605605
assert_eq!(res.references.len(), expected_refs.len());
606-
res.references().iter().enumerate().for_each(|(i, r)| r.assert_match(expected_refs[i]));
606+
res.references()
607+
.iter()
608+
.enumerate()
609+
.for_each(|(i, r)| ref_assert_match(r, expected_refs[i]));
607610
}
608611

609612
impl Declaration {
@@ -621,21 +624,16 @@ mod tests {
621624
}
622625
}
623626

624-
impl Reference {
625-
fn debug_render(&self) -> String {
626-
let mut s = format!(
627-
"{:?} {:?} {:?}",
628-
self.file_range.file_id, self.file_range.range, self.kind
629-
);
630-
if let Some(access) = self.access {
631-
s.push_str(&format!(" {:?}", access));
632-
}
633-
s
627+
fn ref_debug_render(r: &Reference) -> String {
628+
let mut s = format!("{:?} {:?} {:?}", r.file_range.file_id, r.file_range.range, r.kind);
629+
if let Some(access) = r.access {
630+
s.push_str(&format!(" {:?}", access));
634631
}
632+
s
633+
}
635634

636-
fn assert_match(&self, expected: &str) {
637-
let actual = self.debug_render();
638-
test_utils::assert_eq_text!(expected.trim(), actual.trim(),);
639-
}
635+
fn ref_assert_match(r: &Reference, expected: &str) {
636+
let actual = ref_debug_render(r);
637+
test_utils::assert_eq_text!(expected.trim(), actual.trim(),);
640638
}
641639
}

crates/ra_ide_db/src/marks.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ test_utils::marks![
66
goto_def_for_fields
77
goto_def_for_record_fields
88
goto_def_for_field_init_shorthand
9+
search_filters_by_range
910
];

crates/ra_ide_db/src/search.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use ra_syntax::{
1212
algo::find_node_at_offset, ast, match_ast, AstNode, TextRange, TextUnit, TokenAtOffset,
1313
};
1414
use rustc_hash::FxHashMap;
15+
use test_utils::tested_by;
1516

1617
use crate::{
1718
defs::{classify_name_ref, Definition},
@@ -206,7 +207,7 @@ impl Definition {
206207
for (idx, _) in text.match_indices(pat) {
207208
let offset = TextUnit::from_usize(idx);
208209
if !search_range.contains_inclusive(offset) {
209-
// tested_by!(search_filters_by_range);
210+
tested_by!(search_filters_by_range; force);
210211
continue;
211212
}
212213

0 commit comments

Comments
 (0)