Centralize fixture parsing for assists

[rust.git] / crates / ra_assists / src / tests.rs

diff --git a/crates/ra_assists/src/tests.rs b/crates/ra_assists/src/tests.rs
index 62dd3547fa23f6f5556367e22e807384d8de6870..49837d60ba235b548b0bb844a901d05306749f49 100644 (file)
--- a/crates/ra_assists/src/tests.rs
+++ b/crates/ra_assists/src/tests.rs
@@ -1,27 +1,21 @@
 mod generated;
 
-use std::sync::Arc;
-
 use hir::Semantics;
 use ra_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt};
-use ra_ide_db::{symbol_index::SymbolsDatabase, RootDatabase};
+use ra_ide_db::RootDatabase;
 use ra_syntax::TextRange;
-use test_utils::{
-    assert_eq_text, extract_offset, extract_range, extract_range_or_offset, RangeOrOffset,
-};
+use test_utils::{assert_eq_text, extract_offset, extract_range, extract_range_or_offset};
 
 use crate::{handlers::Handler, Assist, AssistConfig, AssistContext, Assists};
+use stdx::trim_indent;
 
 pub(crate) fn with_single_file(text: &str) -> (RootDatabase, FileId) {
-    let (mut db, file_id) = RootDatabase::with_single_file(text);
-    // FIXME: ideally, this should be done by the above `RootDatabase::with_single_file`,
-    // but it looks like this might need specialization? :(
-    db.set_local_roots(Arc::new(vec![db.file_source_root(file_id)]));
-    (db, file_id)
+    RootDatabase::with_single_file(text)
 }
 
 pub(crate) fn check_assist(assist: Handler, ra_fixture_before: &str, ra_fixture_after: &str) {
-    check(assist, ra_fixture_before, ExpectedResult::After(ra_fixture_after));
+    let ra_fixture_after = trim_indent(ra_fixture_after);
+    check(assist, ra_fixture_before, ExpectedResult::After(&ra_fixture_after));
 }
 
 // FIXME: instead of having a separate function here, maybe use
@@ -71,20 +65,8 @@ enum ExpectedResult<'a> {
 }
 
 fn check(handler: Handler, before: &str, expected: ExpectedResult) {
-    let (text_without_caret, file_with_caret_id, range_or_offset, db) = if before.contains("//-") {
-        let (mut db, position) = RootDatabase::with_position(before);
-        db.set_local_roots(Arc::new(vec![db.file_source_root(position.file_id)]));
-        (
-            db.file_text(position.file_id).as_ref().to_owned(),
-            position.file_id,
-            RangeOrOffset::Offset(position.offset),
-            db,
-        )
-    } else {
-        let (range_or_offset, text_without_caret) = extract_range_or_offset(before);
-        let (db, file_id) = with_single_file(&text_without_caret);
-        (text_without_caret, file_id, range_or_offset, db)
-    };
+    let (db, file_with_caret_id, range_or_offset) = RootDatabase::with_range_or_offset(before);
+    let text_without_caret = db.file_text(file_with_caret_id).as_ref().to_owned();
 
     let frange = FileRange { file_id: file_with_caret_id, range: range_or_offset.into() };