Merge #793

793: remove hard-coded query-group macro r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

3 files changed, 1 insertions, 43 deletions

diff --git a/crates/ra_ide_api/src/snapshots/tests__highlight_query_group_macro.snap b/crates/ra_ide_api/src/snapshots/tests__highlight_query_group_macro.snap
deleted file mode 100644
index 0b802ac3d..000000000
--- a/crates/ra_ide_api/src/snapshots/tests__highlight_query_group_macro.snap
+++ /dev/null
@@ -1,28 +0,0 @@
----
-created: "2019-02-01T07:52:15.689836752+00:00"
-creator: [email protected]
-expression: "&highlights"
-source: crates/ra_ide_api/src/syntax_highlighting.rs
----
-[
-    HighlightedRange {
-        range: [20; 32),
-        tag: "macro"
-    },
-    HighlightedRange {
-        range: [13; 18),
-        tag: "text"
-    },
-    HighlightedRange {
-        range: [51; 54),
-        tag: "keyword"
-    },
-    HighlightedRange {
-        range: [55; 60),
-        tag: "keyword"
-    },
-    HighlightedRange {
-        range: [61; 72),
-        tag: "function"
-    }
-]
diff --git a/crates/ra_ide_api/src/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs
index a435fe56e..345b6653d 100644
--- a/crates/ra_ide_api/src/syntax_highlighting.rs
+++ b/crates/ra_ide_api/src/syntax_highlighting.rs
@@ -41,19 +41,4 @@ mod tests {
         let highlights = analysis.highlight(file_id).unwrap();
         assert_debug_snapshot_matches!("highlights_code_inside_macros", &highlights);
     }
-
-    // FIXME: this test is not really necessary: artifact of the inital hacky
-    // macros implementation.
-    #[test]
-    fn highlight_query_group_macro() {
-        let (analysis, file_id) = single_file(
-            "
-            salsa::query_group! {
-                pub trait HirDatabase: SyntaxDatabase {}
-            }
-            ",
-        );
-        let highlights = analysis.highlight(file_id).unwrap();
-        assert_debug_snapshot_matches!("highlight_query_group_macro", &highlights);
-    }
 }
diff --git a/crates/ra_ide_api/tests/test/main.rs b/crates/ra_ide_api/tests/test/main.rs
index c2cb38f7e..7d1695cfd 100644
--- a/crates/ra_ide_api/tests/test/main.rs
+++ b/crates/ra_ide_api/tests/test/main.rs
@@ -91,6 +91,7 @@ fn test_find_all_refs_for_fn_param() {
 }
 
 #[test]
+#[ignore]
 fn world_symbols_include_stuff_from_macros() {
     let (analysis, _) = single_file(
         "