7 files changed, 58 insertions, 81 deletions

diff --git a/crates/ra_ide_api/src/completion.rs b/crates/ra_ide_api/src/completion.rs
index 85160358a..a6b68be75 100644
--- a/crates/ra_ide_api/src/completion.rs
+++ b/crates/ra_ide_api/src/completion.rs
@@ -16,7 +16,7 @@ mod complete_postfix;
 use ra_db::SourceDatabase;
 
 #[cfg(test)]
-use crate::completion::completion_item::{check_completion, do_completion};
+use crate::completion::completion_item::do_completion;
 use crate::{
     completion::{
         completion_context::CompletionContext,
diff --git a/crates/ra_ide_api/src/completion/complete_snippet.rs b/crates/ra_ide_api/src/completion/complete_snippet.rs
index d2d364b57..063b69319 100644
--- a/crates/ra_ide_api/src/completion/complete_snippet.rs
+++ b/crates/ra_ide_api/src/completion/complete_snippet.rs
@@ -39,39 +39,78 @@ fn ${1:feature}() {
 
 #[cfg(test)]
 mod tests {
-    use crate::completion::{check_completion, CompletionKind};
+    use crate::completion::{do_completion, CompletionItem, CompletionKind};
+        use insta::assert_debug_snapshot_matches;
 
-    fn check_snippet_completion(name: &str, code: &str) {
-        check_completion(name, code, CompletionKind::Snippet);
+    fn do_snippet_completion(code: &str) -> Vec<CompletionItem> {
+        do_completion(code, CompletionKind::Snippet)
     }
 
     #[test]
     fn completes_snippets_in_expressions() {
-        check_snippet_completion("snippets_in_expressions", r"fn foo(x: i32) { <|> }");
+        assert_debug_snapshot_matches!(
+            do_snippet_completion(r"fn foo(x: i32) { <|> }"),
+@r#"[
+    CompletionItem {
+        label: "pd",
+        source_range: [17; 17),
+        delete: [17; 17),
+        insert: "eprintln!(\"$0 = {:?}\", $0);",
+        kind: Snippet,
+    },
+    CompletionItem {
+        label: "ppd",
+        source_range: [17; 17),
+        delete: [17; 17),
+        insert: "eprintln!(\"$0 = {:#?}\", $0);",
+        kind: Snippet,
+    },
+]"#
+        );
     }
 
     #[test]
     fn should_not_complete_snippets_in_path() {
-        check_snippet_completion(
-            "should_not_complete_snippets_in_path",
-            r"fn foo(x: i32) { ::foo<|> }",
+        assert_debug_snapshot_matches!(
+            do_snippet_completion(r"fn foo(x: i32) { ::foo<|> }"),
+@r#"[]"#
         );
-        check_snippet_completion(
-            "should_not_complete_snippets_in_path2",
-            r"fn foo(x: i32) { ::<|> }",
+        assert_debug_snapshot_matches!(
+            do_snippet_completion(r"fn foo(x: i32) { ::<|> }"),
+@r#"[]"#
         );
     }
 
     #[test]
     fn completes_snippets_in_items() {
-        check_snippet_completion(
-            "snippets_in_items",
-            r"
-            #[cfg(test)]
-            mod tests {
-                <|>
-            }
-            ",
+        assert_debug_snapshot_matches!(
+            do_snippet_completion(
+                r"
+                #[cfg(test)]
+                mod tests {
+                    <|>
+                }
+                "
+            ),
+@r###"
+       ⋮[
+       ⋮    CompletionItem {
+       ⋮        label: "Test function",
+       ⋮        source_range: [78; 78),
+       ⋮        delete: [78; 78),
+       ⋮        insert: "#[test]\nfn ${1:feature}() {\n    $0\n}",
+       ⋮        kind: Snippet,
+       ⋮        lookup: "tfn",
+       ⋮    },
+       ⋮    CompletionItem {
+       ⋮        label: "pub(crate)",
+       ⋮        source_range: [78; 78),
+       ⋮        delete: [78; 78),
+       ⋮        insert: "pub(crate) $0",
+       ⋮        kind: Snippet,
+       ⋮    },
+       ⋮]
+        "###
         );
     }
 }
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs
index f78c4c877..d787bb69e 100644
--- a/crates/ra_ide_api/src/completion/completion_item.rs
+++ b/crates/ra_ide_api/src/completion/completion_item.rs
@@ -299,10 +299,3 @@ pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionI
     kind_completions.sort_by_key(|c| c.label.clone());
     kind_completions
 }
-
-#[cfg(test)]
-pub(crate) fn check_completion(test_name: &str, code: &str, kind: CompletionKind) {
-    use insta::assert_debug_snapshot_matches;
-    let kind_completions = do_completion(code, kind);
-    assert_debug_snapshot_matches!(test_name, kind_completions);
-}
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path.snap
deleted file mode 100644
index cb3278edf..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path.snap
+++ /dev/null
@@ -1,5 +0,0 @@
-Created: 2019-01-23T05:19:36.475253+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
-[]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path2.snap
deleted file mode 100644
index 62c8e3de9..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path2.snap
+++ /dev/null
@@ -1,5 +0,0 @@
-Created: 2019-01-23T05:19:36.476869+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
-[]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
deleted file mode 100644
index 6f41bf76f..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
+++ /dev/null
@@ -1,22 +0,0 @@
----
-created: "2019-05-23T22:23:35.141901047Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "pd",
-        source_range: [17; 17),
-        delete: [17; 17),
-        insert: "eprintln!(\"$0 = {:?}\", $0);",
-        kind: Snippet,
-    },
-    CompletionItem {
-        label: "ppd",
-        source_range: [17; 17),
-        delete: [17; 17),
-        insert: "eprintln!(\"$0 = {:#?}\", $0);",
-        kind: Snippet,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
deleted file mode 100644
index 1eb0adebe..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
+++ /dev/null
@@ -1,23 +0,0 @@
----
-created: "2019-05-23T22:23:35.149234118Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "Test function",
-        source_range: [66; 66),
-        delete: [66; 66),
-        insert: "#[test]\nfn ${1:feature}() {\n    $0\n}",
-        kind: Snippet,
-        lookup: "tfn",
-    },
-    CompletionItem {
-        label: "pub(crate)",
-        source_range: [66; 66),
-        delete: [66; 66),
-        insert: "pub(crate) $0",
-        kind: Snippet,
-    },
-]