Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compress match checking tests

Browse source
This commit is contained in:
Aleksey Kladov 2020-07-14 13:10:09 +02:00
parent af6984f6a6
commit b031899dac
3 changed files with 452 additions and 1201 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/ra_hir_ty/src/diagnostics.rs
View file

@ -261,8 +261,11 @@ fn check_diagnostics(ra_fixture: &str) {
// FXIME: macros... // FXIME: macros...
let file_id = d.source().file_id.original_file(&db); let file_id = d.source().file_id.original_file(&db);
let range = d.syntax_node(&db).text_range(); let range = d.syntax_node(&db).text_range();
actual.entry(file_id).or_default().push((range, d.message().to_owned())); // FIXME: support multi-line messages in annotations
let message = d.message().lines().next().unwrap().to_owned();
actual.entry(file_id).or_default().push((range, message));
}); });
actual.values_mut().for_each(|diags| diags.sort_by_key(|it| it.0.start()));
assert_eq!(annotations, actual); assert_eq!(annotations, actual);
} }

1627
crates/ra_hir_ty/src/diagnostics/match_check.rs
View file

File diff suppressed because it is too large Load diff

21
crates/ra_hir_ty/src/test_db.rs
View file

@ -82,7 +82,7 @@ impl FileLoader for TestDB {
} }
impl TestDB { impl TestDB {
pub fn module_for_file(&self, file_id: FileId) -> ModuleId { pub(crate) fn module_for_file(&self, file_id: FileId) -> ModuleId {
for &krate in self.relevant_crates(file_id).iter() { for &krate in self.relevant_crates(file_id).iter() {
let crate_def_map = self.crate_def_map(krate); let crate_def_map = self.crate_def_map(krate);
for (local_id, data) in crate_def_map.modules.iter() { for (local_id, data) in crate_def_map.modules.iter() {
@ -124,7 +124,7 @@ impl TestDB {
} }
} }
pub fn diagnostics(&self) -> (String, u32) { pub(crate) fn diagnostics(&self) -> (String, u32) {
let mut buf = String::new(); let mut buf = String::new();
let mut count = 0; let mut count = 0;
self.diag(|d| { self.diag(|d| {
@ -134,22 +134,7 @@ impl TestDB {
(buf, count) (buf, count)
} }
/// Like `diagnostics`, but filtered for a single diagnostic. pub(crate) fn extract_annotations(&self) -> FxHashMap<FileId, Vec<(TextRange, String)>> {
pub fn diagnostic<D: Diagnostic>(&self) -> (String, u32) {
let mut buf = String::new();
let mut count = 0;
self.diag(|d| {
// We want to filter diagnostics by the particular one we are testing for, to
// avoid surprising results in tests.
if d.downcast_ref::<D>().is_some() {
format_to!(buf, "{:?}: {}\n", d.syntax_node(self).text(), d.message());
count += 1;
};
});
(buf, count)
}
pub fn extract_annotations(&self) -> FxHashMap<FileId, Vec<(TextRange, String)>> {
let mut files = Vec::new(); let mut files = Vec::new();
let crate_graph = self.crate_graph(); let crate_graph = self.crate_graph();
for krate in crate_graph.iter() { for krate in crate_graph.iter() {