3 files changed, 30 insertions, 20 deletions

diff --git a/crates/ra_analysis/tests/tests.rs b/crates/ra_analysis/tests/test/main.rs
index bcf29d29c..beeae1e19 100644
--- a/crates/ra_analysis/tests/tests.rs
+++ b/crates/ra_analysis/tests/test/main.rs
@@ -1,9 +1,12 @@
+mod runnables;
+mod type_of;
+
 use ra_syntax::TextRange;
 use test_utils::{assert_eq_dbg, assert_eq_text};
 
 use ra_analysis::{
     mock_analysis::{analysis_and_position, single_file, single_file_with_position, MockAnalysis},
-    AnalysisChange, CrateGraph, FileId, FnSignatureInfo,
+    AnalysisChange, CrateGraph, FileId, FnSignatureInfo, Query
 };
 
 fn get_signature(text: &str) -> (FnSignatureInfo, Option<usize>) {
@@ -135,14 +138,14 @@ fn test_resolve_parent_module_for_inline() {
 fn test_resolve_crate_root() {
     let mock = MockAnalysis::with_files(
         "
-        //- /lib.rs
+        //- /bar.rs
         mod foo;
-        //- /foo.rs
+        //- /bar/foo.rs
         // emtpy <|>
     ",
     );
-    let root_file = mock.id_of("/lib.rs");
-    let mod_file = mock.id_of("/foo.rs");
+    let root_file = mock.id_of("/bar.rs");
+    let mod_file = mock.id_of("/bar/foo.rs");
     let mut host = mock.analysis_host();
     assert!(host.analysis().crate_for(mod_file).unwrap().is_empty());
 
@@ -246,7 +249,8 @@ fn bar() {
 fn test_fn_signature_with_docs_simple() {
     let (desc, param) = get_signature(
         r#"
-// test
+/// test
+// non-doc-comment
 fn foo(j: u32) -> u32 {
     j
 }
@@ -528,10 +532,11 @@ fn test_rename_for_mut_param() {
     }"#,
     );
 }
+
 fn test_rename(text: &str, new_name: &str, expected: &str) {
     let (analysis, position) = single_file_with_position(text);
     let edits = analysis.rename(position, new_name).unwrap();
-    let mut text_edit_bulder = ra_text_edit::TextEditBuilder::new();
+    let mut text_edit_bulder = ra_text_edit::TextEditBuilder::default();
     let mut file_id: Option<FileId> = None;
     for edit in edits {
         file_id = Some(edit.file_id);
@@ -544,3 +549,19 @@ fn test_rename(text: &str, new_name: &str, expected: &str) {
         .apply(&*analysis.file_text(file_id.unwrap()));
     assert_eq_text!(expected, &*result);
 }
+
+#[test]
+fn world_symbols_include_stuff_from_macros() {
+    let (analysis, _) = single_file(
+        "
+salsa::query_group! {
+pub trait HirDatabase: SyntaxDatabase {}
+}
+    ",
+    );
+
+    let mut symbols = analysis.symbol_search(Query::new("Hir".into())).unwrap();
+    let s = symbols.pop().unwrap();
+    assert_eq!(s.name(), "HirDatabase");
+    assert_eq!(s.range(), TextRange::from_to(33.into(), 44.into()));
+}
diff --git a/crates/ra_analysis/tests/runnables.rs b/crates/ra_analysis/tests/test/runnables.rs
index 9e5342c46..e6e0afbc3 100644
--- a/crates/ra_analysis/tests/runnables.rs
+++ b/crates/ra_analysis/tests/test/runnables.rs
@@ -1,15 +1,6 @@
-extern crate ra_analysis;
-extern crate ra_editor;
-extern crate ra_syntax;
-extern crate relative_path;
-extern crate rustc_hash;
-extern crate test_utils;
-
 use test_utils::assert_eq_dbg;
 
-use ra_analysis::{
-    mock_analysis::{analysis_and_position},
-};
+use ra_analysis::mock_analysis::analysis_and_position;
 
 #[test]
 fn test_runnables() {
diff --git a/crates/ra_analysis/tests/type_of.rs b/crates/ra_analysis/tests/test/type_of.rs
index 375f808bb..9d15b52a8 100644
--- a/crates/ra_analysis/tests/type_of.rs
+++ b/crates/ra_analysis/tests/test/type_of.rs
@@ -1,6 +1,4 @@
-use ra_analysis::{
-    mock_analysis::{single_file_with_range},
-};
+use ra_analysis::mock_analysis::single_file_with_range;
 
 #[test]
 fn test_type_of_for_function() {