bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/fixture.rs')
-rw-r--r--crates/ide/src/fixture.rs22
1 files changed, 13 insertions, 9 deletions
diff --git a/crates/ide/src/fixture.rs b/crates/ide/src/fixture.rs
index 3b19b85c4b..b16511072b 100644
--- a/crates/ide/src/fixture.rs
+++ b/crates/ide/src/fixture.rs
@@ -10,7 +10,7 @@ pub(crate) fn file(ra_fixture: &str) -> (Analysis, FileId) {
let change_fixture = ChangeFixture::parse(ra_fixture);
host.db.enable_proc_attr_macros();
host.db.apply_change(change_fixture.change);
- (host.analysis(), change_fixture.files[0])
+ (host.analysis(), change_fixture.files[0].into())
}
/// Creates analysis from a multi-file fixture, returns positions marked with $0.
@@ -21,7 +21,7 @@ pub(crate) fn position(ra_fixture: &str) -> (Analysis, FilePosition) {
host.db.apply_change(change_fixture.change);
let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
let offset = range_or_offset.expect_offset();
- (host.analysis(), FilePosition { file_id, offset })
+ (host.analysis(), FilePosition { file_id: file_id.into(), offset })
}
/// Creates analysis for a single file, returns range marked with a pair of $0.
@@ -32,7 +32,7 @@ pub(crate) fn range(ra_fixture: &str) -> (Analysis, FileRange) {
host.db.apply_change(change_fixture.change);
let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
let range = range_or_offset.expect_range();
- (host.analysis(), FileRange { file_id, range })
+ (host.analysis(), FileRange { file_id: file_id.into(), range })
}
/// Creates analysis for a single file, returns range marked with a pair of $0 or a position marked with $0.
@@ -42,7 +42,7 @@ pub(crate) fn range_or_position(ra_fixture: &str) -> (Analysis, FileId, RangeOrO
host.db.enable_proc_attr_macros();
host.db.apply_change(change_fixture.change);
let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
- (host.analysis(), file_id, range_or_offset)
+ (host.analysis(), file_id.into(), range_or_offset)
}
/// Creates analysis from a multi-file fixture, returns positions marked with $0.
@@ -58,12 +58,14 @@ pub(crate) fn annotations(ra_fixture: &str) -> (Analysis, FilePosition, Vec<(Fil
.files
.iter()
.flat_map(|&file_id| {
- let file_text = host.analysis().file_text(file_id).unwrap();
+ let file_text = host.analysis().file_text(file_id.into()).unwrap();
let annotations = extract_annotations(&file_text);
- annotations.into_iter().map(move |(range, data)| (FileRange { file_id, range }, data))
+ annotations
+ .into_iter()
+ .map(move |(range, data)| (FileRange { file_id: file_id.into(), range }, data))
})
.collect();
- (host.analysis(), FilePosition { file_id, offset }, annotations)
+ (host.analysis(), FilePosition { file_id: file_id.into(), offset }, annotations)
}
/// Creates analysis from a multi-file fixture with annotations without $0
@@ -77,9 +79,11 @@ pub(crate) fn annotations_without_marker(ra_fixture: &str) -> (Analysis, Vec<(Fi
.files
.iter()
.flat_map(|&file_id| {
- let file_text = host.analysis().file_text(file_id).unwrap();
+ let file_text = host.analysis().file_text(file_id.into()).unwrap();
let annotations = extract_annotations(&file_text);
- annotations.into_iter().map(move |(range, data)| (FileRange { file_id, range }, data))
+ annotations
+ .into_iter()
+ .map(move |(range, data)| (FileRange { file_id: file_id.into(), range }, data))
})
.collect();
(host.analysis(), annotations)