Rewrite goto definition tests

1 files changed, 27 insertions, 1 deletions

diff --git a/crates/ra_ide/src/mock_analysis.rs b/crates/ra_ide/src/mock_analysis.rs
index 889b84c59..120d29aa0 100644
--- a/crates/ra_ide/src/mock_analysis.rs
+++ b/crates/ra_ide/src/mock_analysis.rs
@@ -3,11 +3,15 @@ use std::sync::Arc;
 
 use ra_cfg::CfgOptions;
 use ra_db::{CrateName, Env, FileSet, SourceRoot, VfsPath};
-use test_utils::{extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER};
+use test_utils::{
+    extract_annotations, extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER,
+};
 
 use crate::{
     Analysis, AnalysisChange, AnalysisHost, CrateGraph, Edition, FileId, FilePosition, FileRange,
 };
+use ra_syntax::TextRange;
+use rustc_hash::FxHashMap;
 
 /// Mock analysis is used in test to bootstrap an AnalysisHost/Analysis
 /// from a set of in-memory files.
@@ -77,6 +81,28 @@ impl MockAnalysis {
             .expect("no file in this mock");
         FileId(idx as u32 + 1)
     }
+    pub fn annotations(&self) -> FxHashMap<FileId, Vec<(TextRange, String)>> {
+        self.files
+            .iter()
+            .enumerate()
+            .filter_map(|(idx, fixture)| {
+                let file_id = FileId(idx as u32 + 1);
+                let annotations = extract_annotations(&fixture.text);
+                if annotations.is_empty() {
+                    return None;
+                }
+                Some((file_id, annotations))
+            })
+            .collect()
+    }
+    pub fn annotation(&self) -> (FileRange, String) {
+        let all = self.annotations();
+        assert_eq!(all.len(), 1);
+        let (file_id, mut for_file) = all.into_iter().next().unwrap();
+        assert_eq!(for_file.len(), 1);
+        let (range, data) = for_file.pop().unwrap();
+        (FileRange { file_id, range}, data)
+    }
     pub fn analysis_host(self) -> AnalysisHost {
         let mut host = AnalysisHost::default();
         let mut change = AnalysisChange::new();