1 files changed, 4 insertions, 1 deletions

diff --git a/crates/ra_hir_ty/src/diagnostics.rs b/crates/ra_hir_ty/src/diagnostics.rs
index 49a616c6f..3016ca3bd 100644
--- a/crates/ra_hir_ty/src/diagnostics.rs
+++ b/crates/ra_hir_ty/src/diagnostics.rs
@@ -261,8 +261,11 @@ fn check_diagnostics(ra_fixture: &str) {
         // FXIME: macros...
         let file_id = d.source().file_id.original_file(&db);
         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);
 }