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::{
- add_cursor, 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, resolved_assists, AssistCtx, AssistFile};
+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
let (db, file_id) = crate::tests::with_single_file(&before);
let frange = FileRange { file_id, range: selection.into() };
- let assist = resolved_assists(&db, frange)
+ let mut assist = Assist::resolved(&db, &AssistConfig::default(), frange)
.into_iter()
- .find(|assist| assist.label.id.0 == assist_id)
+ .find(|assist| assist.assist.id.0 == assist_id)
.unwrap_or_else(|| {
panic!(
"\n\nAssist is not applicable: {}\nAvailable assists: {}",
assist_id,
- resolved_assists(&db, frange)
+ Assist::resolved(&db, &AssistConfig::default(), frange)
.into_iter()
- .map(|assist| assist.label.id.0)
+ .map(|assist| assist.assist.id.0)
.collect::<Vec<_>>()
.join(", ")
)
});
let actual = {
+ let change = assist.source_change.source_file_edits.pop().unwrap();
let mut actual = before.clone();
- assist.action.edit.apply(&mut actual);
+ change.edit.apply(&mut actual);
actual
};
assert_eq_text!(after, &actual);
Target(&'a str),
}
-fn check(assist: 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)
- };
+fn check(handler: Handler, before: &str, expected: ExpectedResult) {
+ 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() };
let sema = Semantics::new(&db);
- let assist_ctx = AssistCtx::new(&sema, frange, true);
-
- match (assist(assist_ctx), expected) {
+ let config = AssistConfig::default();
+ let ctx = AssistContext::new(sema, &config, frange);
+ let mut acc = Assists::new_resolved(&ctx);
+ handler(&mut acc, &ctx);
+ let mut res = acc.finish_resolved();
+ let assist = res.pop();
+ match (assist, expected) {
(Some(assist), ExpectedResult::After(after)) => {
- let action = assist.0[0].action.clone().unwrap();
-
- let mut actual = if let AssistFile::TargetFile(file_id) = action.file {
- db.file_text(file_id).as_ref().to_owned()
- } else {
- text_without_caret
- };
- action.edit.apply(&mut actual);
-
- match action.cursor_position {
- None => {
- if let RangeOrOffset::Offset(before_cursor_pos) = range_or_offset {
- let off = action
- .edit
- .apply_to_offset(before_cursor_pos)
- .expect("cursor position is affected by the edit");
- actual = add_cursor(&actual, off)
- }
- }
- Some(off) => actual = add_cursor(&actual, off),
- };
+ let mut source_change = assist.source_change;
+ let change = source_change.source_file_edits.pop().unwrap();
+ let mut actual = db.file_text(change.file_id).as_ref().to_owned();
+ change.edit.apply(&mut actual);
assert_eq_text!(after, &actual);
}
(Some(assist), ExpectedResult::Target(target)) => {
- let range = assist.0[0].label.target;
+ let range = assist.assist.target;
assert_eq_text!(&text_without_caret[range], target);
}
(Some(_), ExpectedResult::NotApplicable) => panic!("assist should not be applicable!"),
let (before_cursor_pos, before) = extract_offset(before);
let (db, file_id) = with_single_file(&before);
let frange = FileRange { file_id, range: TextRange::empty(before_cursor_pos) };
- let assists = resolved_assists(&db, frange);
+ let assists = Assist::resolved(&db, &AssistConfig::default(), frange);
let mut assists = assists.iter();
assert_eq!(
- assists.next().expect("expected assist").label.label,
+ assists.next().expect("expected assist").assist.label,
"Change visibility to pub(crate)"
);
- assert_eq!(assists.next().expect("expected assist").label.label, "Add `#[derive]`");
+ assert_eq!(assists.next().expect("expected assist").assist.label, "Add `#[derive]`");
}
#[test]
let (range, before) = extract_range(before);
let (db, file_id) = with_single_file(&before);
let frange = FileRange { file_id, range };
- let assists = resolved_assists(&db, frange);
+ let assists = Assist::resolved(&db, &AssistConfig::default(), frange);
let mut assists = assists.iter();
- assert_eq!(assists.next().expect("expected assist").label.label, "Extract into variable");
- assert_eq!(assists.next().expect("expected assist").label.label, "Replace with match");
+ assert_eq!(assists.next().expect("expected assist").assist.label, "Extract into variable");
+ assert_eq!(assists.next().expect("expected assist").assist.label, "Replace with match");
}
projects / rust.git / blobdiff