From e9cb818c2683e06153f013c3b8d03f7f2719eb02 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 24 Jun 2020 11:05:47 +0200 Subject: Use fixtures more --- crates/ra_ide/src/extend_selection.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'crates/ra_ide/src/extend_selection.rs') diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs index a4bc93cdb..cb6b1a40d 100644 --- a/crates/ra_ide/src/extend_selection.rs +++ b/crates/ra_ide/src/extend_selection.rs @@ -315,17 +315,15 @@ fn adj_comments(comment: &ast::Comment, dir: Direction) -> ast::Comment { #[cfg(test)] mod tests { - use test_utils::extract_offset; - - use crate::mock_analysis::single_file; + use crate::mock_analysis::single_file_with_position; use super::*; fn do_check(before: &str, afters: &[&str]) { - let (cursor, before) = extract_offset(before); - let (analysis, file_id) = single_file(&before); - let range = TextRange::empty(cursor); - let mut frange = FileRange { file_id, range }; + let (analysis, position) = single_file_with_position(&before); + let before = analysis.file_text(position.file_id).unwrap(); + let range = TextRange::empty(position.offset); + let mut frange = FileRange { file_id: position.file_id, range }; for &after in afters { frange.range = analysis.extend_selection(frange).unwrap(); -- cgit v1.2.3