13 files changed, 309 insertions, 155 deletions

diff --git a/crates/ra_ide_api/Cargo.toml b/crates/ra_ide_api/Cargo.toml
index d42a664b6..f7013c3c1 100644
--- a/crates/ra_ide_api/Cargo.toml
+++ b/crates/ra_ide_api/Cargo.toml
@@ -21,3 +21,6 @@ ra_text_edit = { path = "../ra_text_edit" }
 ra_db = { path = "../ra_db" }
 hir = { path = "../ra_hir", package = "ra_hir" }
 test_utils = { path = "../test_utils" }
+
+[dev-dependencies]
+insta = "0.1.4"
diff --git a/crates/ra_ide_api/src/extend_selection.rs b/crates/ra_ide_api/src/extend_selection.rs
index c3c809c9f..9f0ab2f1c 100644
--- a/crates/ra_ide_api/src/extend_selection.rs
+++ b/crates/ra_ide_api/src/extend_selection.rs
@@ -38,8 +38,9 @@ fn find_macro_call(node: &SyntaxNode, range: TextRange) -> Option<&ast::MacroCal
 
 #[cfg(test)]
 mod tests {
+    use ra_syntax::TextRange;
+
     use crate::mock_analysis::single_file_with_range;
-    use test_utils::assert_eq_dbg;
 
     #[test]
     fn extend_selection_inside_macros() {
@@ -51,6 +52,6 @@ mod tests {
         ",
         );
         let r = analysis.extend_selection(frange);
-        assert_eq_dbg("[51; 56)", &r);
+        assert_eq!(r, TextRange::from_to(51.into(), 56.into()));
     }
 }
diff --git a/crates/ra_ide_api/src/runnables.rs b/crates/ra_ide_api/src/runnables.rs
index 53e49da5b..f1de28094 100644
--- a/crates/ra_ide_api/src/runnables.rs
+++ b/crates/ra_ide_api/src/runnables.rs
@@ -92,3 +92,100 @@ fn runnable_mod(db: &RootDatabase, file_id: FileId, module: &ast::Module) -> Opt
         kind: RunnableKind::TestMod { path },
     })
 }
+
+#[cfg(test)]
+mod tests {
+    use insta::assert_debug_snapshot_matches;
+
+    use crate::mock_analysis::analysis_and_position;
+
+    #[test]
+    fn test_runnables() {
+        let (analysis, pos) = analysis_and_position(
+            r#"
+        //- /lib.rs
+        <|> //empty
+        fn main() {}
+
+        #[test]
+        fn test_foo() {}
+
+        #[test]
+        #[ignore]
+        fn test_foo() {}
+        "#,
+        );
+        let runnables = analysis.runnables(pos.file_id).unwrap();
+        assert_debug_snapshot_matches!("runnables", &runnables)
+    }
+
+    #[test]
+    fn test_runnables_module() {
+        let (analysis, pos) = analysis_and_position(
+            r#"
+        //- /lib.rs
+        <|> //empty
+        mod test_mod {
+            #[test]
+            fn test_foo1() {}
+        }
+        "#,
+        );
+        let runnables = analysis.runnables(pos.file_id).unwrap();
+        assert_debug_snapshot_matches!("runnables_module", &runnables)
+    }
+
+    #[test]
+    fn test_runnables_one_depth_layer_module() {
+        let (analysis, pos) = analysis_and_position(
+            r#"
+        //- /lib.rs
+        <|> //empty
+        mod foo {
+            mod test_mod {
+                #[test]
+                fn test_foo1() {}
+            }
+        }
+        "#,
+        );
+        let runnables = analysis.runnables(pos.file_id).unwrap();
+        assert_debug_snapshot_matches!("runnables_one_depth_layer_module", &runnables)
+    }
+
+    #[test]
+    fn test_runnables_multiple_depth_module() {
+        let (analysis, pos) = analysis_and_position(
+            r#"
+        //- /lib.rs
+        <|> //empty
+        mod foo {
+            mod bar {
+                mod test_mod {
+                    #[test]
+                    fn test_foo1() {}
+                }
+            }
+        }
+        "#,
+        );
+        let runnables = analysis.runnables(pos.file_id).unwrap();
+        assert_debug_snapshot_matches!("runnables_multiple_depth_module", &runnables)
+    }
+
+    #[test]
+    fn test_runnables_no_test_function_in_module() {
+        let (analysis, pos) = analysis_and_position(
+            r#"
+        //- /lib.rs
+        <|> //empty
+        mod test_mod {
+            fn foo1() {}
+        }
+        "#,
+        );
+        let runnables = analysis.runnables(pos.file_id).unwrap();
+        assert!(runnables.is_empty())
+    }
+
+}
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
new file mode 100644
index 000000000..b84aa9c78
--- /dev/null
+++ b/crates/ra_ide_api/src/snapshots/tests__highlight_query_group_macro.snap
@@ -0,0 +1,26 @@
+Created: 2019-01-15T11:15:20.732493641+00:00
+Creator: [email protected]
+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/snapshots/tests__highlights_code_inside_macros.snap b/crates/ra_ide_api/src/snapshots/tests__highlights_code_inside_macros.snap
new file mode 100644
index 000000000..14c6e5a4e
--- /dev/null
+++ b/crates/ra_ide_api/src/snapshots/tests__highlights_code_inside_macros.snap
@@ -0,0 +1,70 @@
+Created: 2019-01-15T11:15:20.732523231+00:00
+Creator: [email protected]
+Source: crates/ra_ide_api/src/syntax_highlighting.rs
+
+[
+    HighlightedRange {
+        range: [13; 15),
+        tag: "keyword"
+    },
+    HighlightedRange {
+        range: [16; 20),
+        tag: "function"
+    },
+    HighlightedRange {
+        range: [41; 46),
+        tag: "macro"
+    },
+    HighlightedRange {
+        range: [49; 52),
+        tag: "keyword"
+    },
+    HighlightedRange {
+        range: [57; 59),
+        tag: "literal"
+    },
+    HighlightedRange {
+        range: [82; 86),
+        tag: "macro"
+    },
+    HighlightedRange {
+        range: [89; 92),
+        tag: "keyword"
+    },
+    HighlightedRange {
+        range: [97; 99),
+        tag: "literal"
+    },
+    HighlightedRange {
+        range: [49; 52),
+        tag: "keyword"
+    },
+    HighlightedRange {
+        range: [53; 54),
+        tag: "function"
+    },
+    HighlightedRange {
+        range: [57; 59),
+        tag: "literal"
+    },
+    HighlightedRange {
+        range: [61; 62),
+        tag: "text"
+    },
+    HighlightedRange {
+        range: [89; 92),
+        tag: "keyword"
+    },
+    HighlightedRange {
+        range: [93; 94),
+        tag: "function"
+    },
+    HighlightedRange {
+        range: [97; 99),
+        tag: "literal"
+    },
+    HighlightedRange {
+        range: [101; 102),
+        tag: "text"
+    }
+]
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables.snap b/crates/ra_ide_api/src/snapshots/tests__runnables.snap
new file mode 100644
index 000000000..ba6cba0ab
--- /dev/null
+++ b/crates/ra_ide_api/src/snapshots/tests__runnables.snap
@@ -0,0 +1,22 @@
+Created: 2019-01-15T11:15:20.732460119+00:00
+Creator: [email protected]
+Source: crates/ra_ide_api/src/runnables.rs
+
+[
+    Runnable {
+        range: [1; 21),
+        kind: Bin
+    },
+    Runnable {
+        range: [22; 46),
+        kind: Test {
+            name: "test_foo"
+        }
+    },
+    Runnable {
+        range: [47; 81),
+        kind: Test {
+            name: "test_foo"
+        }
+    }
+]
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables_module.snap b/crates/ra_ide_api/src/snapshots/tests__runnables_module.snap
new file mode 100644
index 000000000..b3f2d4d6e
--- /dev/null
+++ b/crates/ra_ide_api/src/snapshots/tests__runnables_module.snap
@@ -0,0 +1,18 @@
+Created: 2019-01-15T11:15:20.732460109+00:00
+Creator: [email protected]
+Source: crates/ra_ide_api/src/runnables.rs
+
+[
+    Runnable {
+        range: [1; 59),
+        kind: TestMod {
+            path: "test_mod"
+        }
+    },
+    Runnable {
+        range: [28; 57),
+        kind: Test {
+            name: "test_foo1"
+        }
+    }
+]
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap b/crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap
new file mode 100644
index 000000000..6eba482e7
--- /dev/null
+++ b/crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap
@@ -0,0 +1,18 @@
+Created: 2019-01-15T11:15:20.732522773+00:00
+Creator: [email protected]
+Source: crates/ra_ide_api/src/runnables.rs
+
+[
+    Runnable {
+        range: [41; 115),
+        kind: TestMod {
+            path: "foo::bar::test_mod"
+        }
+    },
+    Runnable {
+        range: [68; 105),
+        kind: Test {
+            name: "test_foo1"
+        }
+    }
+]
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap b/crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap
new file mode 100644
index 000000000..f40c762f3
--- /dev/null
+++ b/crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap
@@ -0,0 +1,18 @@
+Created: 2019-01-15T11:15:20.732480089+00:00
+Creator: [email protected]
+Source: crates/ra_ide_api/src/runnables.rs
+
+[
+    Runnable {
+        range: [23; 85),
+        kind: TestMod {
+            path: "foo::test_mod"
+        }
+    },
+    Runnable {
+        range: [46; 79),
+        kind: Test {
+            name: "test_foo1"
+        }
+    }
+]
diff --git a/crates/ra_ide_api/src/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs
index cb19e9515..480b78dce 100644
--- a/crates/ra_ide_api/src/syntax_highlighting.rs
+++ b/crates/ra_ide_api/src/syntax_highlighting.rs
@@ -34,7 +34,8 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Cancelable<Vec<Hi
 #[cfg(test)]
 mod tests {
     use crate::mock_analysis::single_file;
-    use test_utils::assert_eq_dbg;
+
+    use insta::assert_debug_snapshot_matches;
 
     #[test]
     fn highlights_code_inside_macros() {
@@ -47,25 +48,7 @@ mod tests {
             ",
         );
         let highlights = analysis.highlight(file_id).unwrap();
-        assert_eq_dbg(
-            r#"[HighlightedRange { range: [13; 15), tag: "keyword" },
-                HighlightedRange { range: [16; 20), tag: "function" },
-                HighlightedRange { range: [41; 46), tag: "macro" },
-                HighlightedRange { range: [49; 52), tag: "keyword" },
-                HighlightedRange { range: [57; 59), tag: "literal" },
-                HighlightedRange { range: [82; 86), tag: "macro" },
-                HighlightedRange { range: [89; 92), tag: "keyword" },
-                HighlightedRange { range: [97; 99), tag: "literal" },
-                HighlightedRange { range: [49; 52), tag: "keyword" },
-                HighlightedRange { range: [53; 54), tag: "function" },
-                HighlightedRange { range: [57; 59), tag: "literal" },
-                HighlightedRange { range: [61; 62), tag: "text" },
-                HighlightedRange { range: [89; 92), tag: "keyword" },
-                HighlightedRange { range: [93; 94), tag: "function" },
-                HighlightedRange { range: [97; 99), tag: "literal" },
-                HighlightedRange { range: [101; 102), tag: "text" }]"#,
-            &highlights,
-        )
+        assert_debug_snapshot_matches!("highlights_code_inside_macros", &highlights);
     }
 
     // FIXME: this test is not really necessary: artifact of the inital hacky
@@ -80,13 +63,6 @@ mod tests {
             ",
         );
         let highlights = analysis.highlight(file_id).unwrap();
-        assert_eq_dbg(
-            r#"[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" }]"#,
-            &highlights,
-        )
+        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 7dc1dba73..2b863aedf 100644
--- a/crates/ra_ide_api/tests/test/main.rs
+++ b/crates/ra_ide_api/tests/test/main.rs
@@ -1,7 +1,6 @@
-mod runnables;
-
 use ra_syntax::TextRange;
-use test_utils::{assert_eq_dbg, assert_eq_text};
+use test_utils::assert_eq_text;
+use insta::assert_debug_snapshot_matches;
 
 use ra_ide_api::{
     mock_analysis::{single_file, single_file_with_position, MockAnalysis},
@@ -12,18 +11,7 @@ use ra_ide_api::{
 fn test_unresolved_module_diagnostic() {
     let (analysis, file_id) = single_file("mod foo;");
     let diagnostics = analysis.diagnostics(file_id).unwrap();
-    assert_eq_dbg(
-        r#"[Diagnostic {
-            message: "unresolved module",
-            range: [4; 7),
-            fix: Some(SourceChange {
-                label: "create module",
-                source_file_edits: [],
-                file_system_edits: [CreateFile { source_root: SourceRootId(0), path: "foo.rs" }],
-                cursor_position: None }),
-                severity: Error }]"#,
-        &diagnostics,
-    );
+    assert_debug_snapshot_matches!("unresolved_module_diagnostic", &diagnostics);
 }
 
 // FIXME: move this test to hir
@@ -31,7 +19,7 @@ fn test_unresolved_module_diagnostic() {
 fn test_unresolved_module_diagnostic_no_diag_for_inline_mode() {
     let (analysis, file_id) = single_file("mod foo {}");
     let diagnostics = analysis.diagnostics(file_id).unwrap();
-    assert_eq_dbg(r#"[]"#, &diagnostics);
+    assert!(diagnostics.is_empty());
 }
 
 #[test]
diff --git a/crates/ra_ide_api/tests/test/runnables.rs b/crates/ra_ide_api/tests/test/runnables.rs
deleted file mode 100644
index da8d5e0d5..000000000
--- a/crates/ra_ide_api/tests/test/runnables.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use test_utils::assert_eq_dbg;
-
-use ra_ide_api::mock_analysis::analysis_and_position;
-
-#[test]
-fn test_runnables() {
-    let (analysis, pos) = analysis_and_position(
-        r#"
-        //- /lib.rs
-        <|> //empty
-        fn main() {}
-
-        #[test]
-        fn test_foo() {}
-
-        #[test]
-        #[ignore]
-        fn test_foo() {}
-        "#,
-    );
-    let runnables = analysis.runnables(pos.file_id).unwrap();
-    assert_eq_dbg(
-        r#"[Runnable { range: [1; 21), kind: Bin },
-                Runnable { range: [22; 46), kind: Test { name: "test_foo" } },
-                Runnable { range: [47; 81), kind: Test { name: "test_foo" } }]"#,
-        &runnables,
-    )
-}
-
-#[test]
-fn test_runnables_module() {
-    let (analysis, pos) = analysis_and_position(
-        r#"
-        //- /lib.rs
-        <|> //empty
-        mod test_mod {
-            #[test]
-            fn test_foo1() {}
-        }
-        "#,
-    );
-    let runnables = analysis.runnables(pos.file_id).unwrap();
-    assert_eq_dbg(
-        r#"[Runnable { range: [1; 59), kind: TestMod { path: "test_mod" } },
-                Runnable { range: [28; 57), kind: Test { name: "test_foo1" } }]"#,
-        &runnables,
-    )
-}
-
-#[test]
-fn test_runnables_one_depth_layer_module() {
-    let (analysis, pos) = analysis_and_position(
-        r#"
-        //- /lib.rs
-        <|> //empty
-        mod foo {
-            mod test_mod {
-                #[test]
-                fn test_foo1() {}
-            }
-        }
-        "#,
-    );
-    let runnables = analysis.runnables(pos.file_id).unwrap();
-    assert_eq_dbg(
-        r#"[Runnable { range: [23; 85), kind: TestMod { path: "foo::test_mod" } },
-                Runnable { range: [46; 79), kind: Test { name: "test_foo1" } }]"#,
-        &runnables,
-    )
-}
-
-#[test]
-fn test_runnables_multiple_depth_module() {
-    let (analysis, pos) = analysis_and_position(
-        r#"
-        //- /lib.rs
-        <|> //empty
-        mod foo {
-            mod bar {
-                mod test_mod {
-                    #[test]
-                    fn test_foo1() {}
-                }
-            }
-        }
-        "#,
-    );
-    let runnables = analysis.runnables(pos.file_id).unwrap();
-    assert_eq_dbg(
-        r#"[Runnable { range: [41; 115), kind: TestMod { path: "foo::bar::test_mod" } },
-                Runnable { range: [68; 105), kind: Test { name: "test_foo1" } }]"#,
-        &runnables,
-    )
-}
-
-#[test]
-fn test_runnables_no_test_function_in_module() {
-    let (analysis, pos) = analysis_and_position(
-        r#"
-        //- /lib.rs
-        <|> //empty
-        mod test_mod {
-            fn foo1() {}
-        }
-        "#,
-    );
-    let runnables = analysis.runnables(pos.file_id).unwrap();
-    assert_eq_dbg(r#"[]"#, &runnables)
-}
diff --git a/crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap b/crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap
new file mode 100644
index 000000000..1b41e2b00
--- /dev/null
+++ b/crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap
@@ -0,0 +1,26 @@
+Created: 2019-01-15T11:15:20.891129945+00:00
+Creator: [email protected]
+Source: crates/ra_ide_api/tests/test/main.rs
+
+[
+    Diagnostic {
+        message: "unresolved module",
+        range: [4; 7),
+        fix: Some(
+            SourceChange {
+                label: "create module",
+                source_file_edits: [],
+                file_system_edits: [
+                    CreateFile {
+                        source_root: SourceRootId(
+                            0
+                        ),
+                        path: "foo.rs"
+                    }
+                ],
+                cursor_position: None
+            }
+        ),
+        severity: Error
+    }
+]