Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix test following change to fixture parsing (d016cb4867)

Browse source
This commit is contained in:
David Lattimore 2020-06-27 11:31:15 +10:00
parent f4dc549582
commit fc46c12e36
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_ssr/src/tests.rs
View file

@ -209,6 +209,11 @@ fn assert_ssr_transform(rule: &str, input: &str, result: &str) {
assert_ssr_transforms(&[rule], input, result); assert_ssr_transforms(&[rule], input, result);
} }
fn normalize_code(code: &str) -> String {
let (db, file_id) = single_file(code);
db.file_text(file_id).to_string()
}
fn assert_ssr_transforms(rules: &[&str], input: &str, result: &str) { fn assert_ssr_transforms(rules: &[&str], input: &str, result: &str) {
let (db, file_id) = single_file(input); let (db, file_id) = single_file(input);
let mut match_finder = MatchFinder::new(&db); let mut match_finder = MatchFinder::new(&db);
@ -217,8 +222,13 @@ fn assert_ssr_transforms(rules: &[&str], input: &str, result: &str) {
match_finder.add_rule(rule); match_finder.add_rule(rule);
} }
if let Some(edits) = match_finder.edits_for_file(file_id) { if let Some(edits) = match_finder.edits_for_file(file_id) {
let mut after = input.to_string(); // Note, db.file_text is not necessarily the same as `input`, since fixture parsing alters
// stuff.
let mut after = db.file_text(file_id).to_string();
edits.apply(&mut after); edits.apply(&mut after);
// Likewise, we need to make sure that whatever transformations fixture parsing applies,
// also get appplied to our expected result.
let result = normalize_code(result);
assert_eq!(after, result); assert_eq!(after, result);
} else { } else {
panic!("No edits were made"); panic!("No edits were made");