From eb7d1b0feeca276c485b8325df2851756ef861b4 Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Sun, 28 Jul 2019 11:24:29 +0100 Subject: Inline snapshots for all tests in complete_scope.rs --- crates/ra_ide_api/src/completion/complete_scope.rs | 465 ++++++++++++++++----- .../completion_item__bindings_from_for.snap | 23 - .../completion_item__bindings_from_if_let.snap | 31 -- .../completion_item__bindings_from_let.snap | 32 -- .../completion_item__completes_prelude.snap | 30 -- ...__dont_show_both_completions_for_shadowing.snap | 24 -- .../snapshots/completion_item__extern_prelude.snap | 15 - .../snapshots/completion_item__generic_params.snap | 23 - .../completion_item__generic_params_in_struct.snap | 22 - .../snapshots/completion_item__module_items.snap | 30 -- ...etion_item__module_items_in_nested_modules.snap | 23 - .../snapshots/completion_item__return_type.snap | 23 - .../completion_item__self_in_methods.snap | 23 - 13 files changed, 362 insertions(+), 402 deletions(-) delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap (limited to 'crates/ra_ide_api/src/completion') diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs index f92034055..1baa5227a 100644 --- a/crates/ra_ide_api/src/completion/complete_scope.rs +++ b/crates/ra_ide_api/src/completion/complete_scope.rs @@ -121,172 +121,431 @@ impl ImportResolver { #[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_reference_completion(name: &str, code: &str) { - check_completion(name, code, CompletionKind::Reference); + fn do_reference_completion(code: &str) -> Vec { + do_completion(code, CompletionKind::Reference) } #[test] fn completes_bindings_from_let() { - check_reference_completion( - "bindings_from_let", - r" - fn quux(x: i32) { - let y = 92; - 1 + <|>; - let z = (); - } - ", + assert_debug_snapshot_matches!( + do_reference_completion( + r" + fn quux(x: i32) { + let y = 92; + 1 + <|>; + let z = (); + } + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "quux", + ⋮ source_range: [91; 91), + ⋮ delete: [91; 91), + ⋮ insert: "quux($0)", + ⋮ kind: Function, + ⋮ detail: "fn quux(x: i32)", + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "x", + ⋮ source_range: [91; 91), + ⋮ delete: [91; 91), + ⋮ insert: "x", + ⋮ kind: Binding, + ⋮ detail: "i32", + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "y", + ⋮ source_range: [91; 91), + ⋮ delete: [91; 91), + ⋮ insert: "y", + ⋮ kind: Binding, + ⋮ detail: "i32", + ⋮ }, + ⋮] + "### ); } #[test] fn completes_bindings_from_if_let() { - check_reference_completion( - "bindings_from_if_let", - r" - fn quux() { - if let Some(x) = foo() { - let y = 92; - }; - if let Some(a) = bar() { - let b = 62; - 1 + <|> + assert_debug_snapshot_matches!( + do_reference_completion( + r" + fn quux() { + if let Some(x) = foo() { + let y = 92; + }; + if let Some(a) = bar() { + let b = 62; + 1 + <|> + } } - } - ", + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "a", + ⋮ source_range: [242; 242), + ⋮ delete: [242; 242), + ⋮ insert: "a", + ⋮ kind: Binding, + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "b", + ⋮ source_range: [242; 242), + ⋮ delete: [242; 242), + ⋮ insert: "b", + ⋮ kind: Binding, + ⋮ detail: "i32", + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "quux", + ⋮ source_range: [242; 242), + ⋮ delete: [242; 242), + ⋮ insert: "quux()$0", + ⋮ kind: Function, + ⋮ detail: "fn quux()", + ⋮ }, + ⋮] + "### ); } #[test] fn completes_bindings_from_for() { - check_reference_completion( - "bindings_from_for", - r" - fn quux() { - for x in &[1, 2, 3] { - <|> + assert_debug_snapshot_matches!( + do_reference_completion( + r" + fn quux() { + for x in &[1, 2, 3] { + <|> + } } - } - ", + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "quux", + ⋮ source_range: [95; 95), + ⋮ delete: [95; 95), + ⋮ insert: "quux()$0", + ⋮ kind: Function, + ⋮ detail: "fn quux()", + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "x", + ⋮ source_range: [95; 95), + ⋮ delete: [95; 95), + ⋮ insert: "x", + ⋮ kind: Binding, + ⋮ }, + ⋮] + "### ); } #[test] fn completes_generic_params() { - check_reference_completion( - "generic_params", - r" - fn quux() { - <|> - } - ", + assert_debug_snapshot_matches!( + do_reference_completion( + r" + fn quux() { + <|> + } + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "T", + ⋮ source_range: [52; 52), + ⋮ delete: [52; 52), + ⋮ insert: "T", + ⋮ kind: TypeParam, + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "quux", + ⋮ source_range: [52; 52), + ⋮ delete: [52; 52), + ⋮ insert: "quux()$0", + ⋮ kind: Function, + ⋮ detail: "fn quux()", + ⋮ }, + ⋮] + "### ); } #[test] fn completes_generic_params_in_struct() { - check_reference_completion( - "generic_params_in_struct", - r" - struct X { - x: <|> - } - ", + assert_debug_snapshot_matches!( + do_reference_completion( + r" + struct X { + x: <|> + } + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "T", + ⋮ source_range: [54; 54), + ⋮ delete: [54; 54), + ⋮ insert: "T", + ⋮ kind: TypeParam, + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "X", + ⋮ source_range: [54; 54), + ⋮ delete: [54; 54), + ⋮ insert: "X", + ⋮ kind: Struct, + ⋮ }, + ⋮] + "### ); } #[test] fn completes_module_items() { - check_reference_completion( - "module_items", - r" - struct Foo; - enum Baz {} - fn quux() { - <|> - } - ", + assert_debug_snapshot_matches!( + do_reference_completion( + r" + struct Foo; + enum Baz {} + fn quux() { + <|> + } + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "Baz", + ⋮ source_range: [105; 105), + ⋮ delete: [105; 105), + ⋮ insert: "Baz", + ⋮ kind: Enum, + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "Foo", + ⋮ source_range: [105; 105), + ⋮ delete: [105; 105), + ⋮ insert: "Foo", + ⋮ kind: Struct, + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "quux", + ⋮ source_range: [105; 105), + ⋮ delete: [105; 105), + ⋮ insert: "quux()$0", + ⋮ kind: Function, + ⋮ detail: "fn quux()", + ⋮ }, + ⋮] + "### ); } #[test] fn completes_extern_prelude() { - check_reference_completion( - "extern_prelude", - r" - //- /lib.rs - use <|>; + assert_debug_snapshot_matches!( + do_reference_completion( + r" + //- /lib.rs + use <|>; - //- /other_crate/lib.rs - // nothing here - ", + //- /other_crate/lib.rs + // nothing here + " + ), +@r#"[ + CompletionItem { + label: "other_crate", + source_range: [4; 4), + delete: [4; 4), + insert: "other_crate", + kind: Module, + }, +]"# ); } #[test] fn completes_module_items_in_nested_modules() { - check_reference_completion( - "module_items_in_nested_modules", - r" - struct Foo; - mod m { - struct Bar; - fn quux() { <|> } - } - ", + assert_debug_snapshot_matches!( + do_reference_completion( + r" + struct Foo; + mod m { + struct Bar; + fn quux() { <|> } + } + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "Bar", + ⋮ source_range: [117; 117), + ⋮ delete: [117; 117), + ⋮ insert: "Bar", + ⋮ kind: Struct, + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "quux", + ⋮ source_range: [117; 117), + ⋮ delete: [117; 117), + ⋮ insert: "quux()$0", + ⋮ kind: Function, + ⋮ detail: "fn quux()", + ⋮ }, + ⋮] + "### ); } #[test] fn completes_return_type() { - check_reference_completion( - "return_type", - r" - struct Foo; - fn x() -> <|> - ", - ) + assert_debug_snapshot_matches!( + do_reference_completion( + r" + struct Foo; + fn x() -> <|> + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "Foo", + ⋮ source_range: [55; 55), + ⋮ delete: [55; 55), + ⋮ insert: "Foo", + ⋮ kind: Struct, + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "x", + ⋮ source_range: [55; 55), + ⋮ delete: [55; 55), + ⋮ insert: "x()$0", + ⋮ kind: Function, + ⋮ detail: "fn x()", + ⋮ }, + ⋮] + "### + ); } #[test] fn dont_show_both_completions_for_shadowing() { - check_reference_completion( - "dont_show_both_completions_for_shadowing", - r" - fn foo() { - let bar = 92; - { - let bar = 62; - <|> + assert_debug_snapshot_matches!( + do_reference_completion( + r" + fn foo() { + let bar = 92; + { + let bar = 62; + <|> + } } - } - ", - ) + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "bar", + ⋮ source_range: [146; 146), + ⋮ delete: [146; 146), + ⋮ insert: "bar", + ⋮ kind: Binding, + ⋮ detail: "i32", + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "foo", + ⋮ source_range: [146; 146), + ⋮ delete: [146; 146), + ⋮ insert: "foo()$0", + ⋮ kind: Function, + ⋮ detail: "fn foo()", + ⋮ }, + ⋮] + "### + ); } #[test] fn completes_self_in_methods() { - check_reference_completion("self_in_methods", r"impl S { fn foo(&self) { <|> } }") + assert_debug_snapshot_matches!( + do_reference_completion(r"impl S { fn foo(&self) { <|> } }"), +@r#"[ + CompletionItem { + label: "Self", + source_range: [25; 25), + delete: [25; 25), + insert: "Self", + kind: TypeParam, + }, + CompletionItem { + label: "self", + source_range: [25; 25), + delete: [25; 25), + insert: "self", + kind: Binding, + detail: "&{unknown}", + }, +]"# + ); } #[test] fn completes_prelude() { - check_reference_completion( - "completes_prelude", - " - //- /main.rs - fn foo() { let x: <|> } + assert_debug_snapshot_matches!( + do_reference_completion( + " + //- /main.rs + fn foo() { let x: <|> } - //- /std/lib.rs - #[prelude_import] - use prelude::*; + //- /std/lib.rs + #[prelude_import] + use prelude::*; - mod prelude { - struct Option; - } - ", + mod prelude { + struct Option; + } + " + ), +@r#"[ + CompletionItem { + label: "Option", + source_range: [18; 18), + delete: [18; 18), + insert: "Option", + kind: Struct, + }, + CompletionItem { + label: "foo", + source_range: [18; 18), + delete: [18; 18), + insert: "foo()$0", + kind: Function, + detail: "fn foo()", + }, + CompletionItem { + label: "std", + source_range: [18; 18), + delete: [18; 18), + insert: "std", + kind: Module, + }, +]"# ); } } diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap deleted file mode 100644 index e9b717a45..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap +++ /dev/null @@ -1,23 +0,0 @@ ---- -created: "2019-05-23T22:23:35.119822026Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "quux", - source_range: [83; 83), - delete: [83; 83), - insert: "quux()$0", - kind: Function, - detail: "fn quux()", - }, - CompletionItem { - label: "x", - source_range: [83; 83), - delete: [83; 83), - insert: "x", - kind: Binding, - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap deleted file mode 100644 index f94477b43..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap +++ /dev/null @@ -1,31 +0,0 @@ ---- -created: "2019-07-23T16:11:48.828805910Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "a", - source_range: [214; 214), - delete: [214; 214), - insert: "a", - kind: Binding, - }, - CompletionItem { - label: "b", - source_range: [214; 214), - delete: [214; 214), - insert: "b", - kind: Binding, - detail: "i32", - }, - CompletionItem { - label: "quux", - source_range: [214; 214), - delete: [214; 214), - insert: "quux()$0", - kind: Function, - detail: "fn quux()", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap deleted file mode 100644 index 590e2a820..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap +++ /dev/null @@ -1,32 +0,0 @@ ---- -created: "2019-07-23T16:11:48.828811567Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "quux", - source_range: [79; 79), - delete: [79; 79), - insert: "quux($0)", - kind: Function, - detail: "fn quux(x: i32)", - }, - CompletionItem { - label: "x", - source_range: [79; 79), - delete: [79; 79), - insert: "x", - kind: Binding, - detail: "i32", - }, - CompletionItem { - label: "y", - source_range: [79; 79), - delete: [79; 79), - insert: "y", - kind: Binding, - detail: "i32", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap deleted file mode 100644 index b339c6c5f..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap +++ /dev/null @@ -1,30 +0,0 @@ ---- -created: "2019-05-23T22:23:35.139262926Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "Option", - source_range: [18; 18), - delete: [18; 18), - insert: "Option", - kind: Struct, - }, - CompletionItem { - label: "foo", - source_range: [18; 18), - delete: [18; 18), - insert: "foo()$0", - kind: Function, - detail: "fn foo()", - }, - CompletionItem { - label: "std", - source_range: [18; 18), - delete: [18; 18), - insert: "std", - kind: Module, - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap deleted file mode 100644 index 158a2e5b9..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap +++ /dev/null @@ -1,24 +0,0 @@ ---- -created: "2019-07-23T16:11:48.860949870Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "bar", - source_range: [126; 126), - delete: [126; 126), - insert: "bar", - kind: Binding, - detail: "i32", - }, - CompletionItem { - label: "foo", - source_range: [126; 126), - delete: [126; 126), - insert: "foo()$0", - kind: Function, - detail: "fn foo()", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap deleted file mode 100644 index b9449a76c..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap +++ /dev/null @@ -1,15 +0,0 @@ ---- -created: "2019-05-23T22:23:35.123197049Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "other_crate", - source_range: [4; 4), - delete: [4; 4), - insert: "other_crate", - kind: Module, - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap deleted file mode 100644 index eb1a4151a..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap +++ /dev/null @@ -1,23 +0,0 @@ ---- -created: "2019-05-23T22:23:35.123825399Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "T", - source_range: [44; 44), - delete: [44; 44), - insert: "T", - kind: TypeParam, - }, - CompletionItem { - label: "quux", - source_range: [44; 44), - delete: [44; 44), - insert: "quux()$0", - kind: Function, - detail: "fn quux()", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap deleted file mode 100644 index 52f08267f..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap +++ /dev/null @@ -1,22 +0,0 @@ ---- -created: "2019-05-23T22:23:35.130778739Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "T", - source_range: [46; 46), - delete: [46; 46), - insert: "T", - kind: TypeParam, - }, - CompletionItem { - label: "X", - source_range: [46; 46), - delete: [46; 46), - insert: "X", - kind: Struct, - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap deleted file mode 100644 index cee4898c3..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap +++ /dev/null @@ -1,30 +0,0 @@ ---- -created: "2019-05-23T22:23:35.133106898Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "Baz", - source_range: [89; 89), - delete: [89; 89), - insert: "Baz", - kind: Enum, - }, - CompletionItem { - label: "Foo", - source_range: [89; 89), - delete: [89; 89), - insert: "Foo", - kind: Struct, - }, - CompletionItem { - label: "quux", - source_range: [89; 89), - delete: [89; 89), - insert: "quux()$0", - kind: Function, - detail: "fn quux()", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap deleted file mode 100644 index ce18e5bb7..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap +++ /dev/null @@ -1,23 +0,0 @@ ---- -created: "2019-05-23T22:23:35.134417551Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "Bar", - source_range: [101; 101), - delete: [101; 101), - insert: "Bar", - kind: Struct, - }, - CompletionItem { - label: "quux", - source_range: [101; 101), - delete: [101; 101), - insert: "quux()$0", - kind: Function, - detail: "fn quux()", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap deleted file mode 100644 index 16dd18431..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap +++ /dev/null @@ -1,23 +0,0 @@ ---- -created: "2019-05-23T22:23:35.140648630Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "Foo", - source_range: [47; 47), - delete: [47; 47), - insert: "Foo", - kind: Struct, - }, - CompletionItem { - label: "x", - source_range: [47; 47), - delete: [47; 47), - insert: "x()$0", - kind: Function, - detail: "fn x()", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap deleted file mode 100644 index b7bcbe864..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap +++ /dev/null @@ -1,23 +0,0 @@ ---- -created: "2019-07-23T16:11:48.859812318Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "Self", - source_range: [25; 25), - delete: [25; 25), - insert: "Self", - kind: TypeParam, - }, - CompletionItem { - label: "self", - source_range: [25; 25), - delete: [25; 25), - insert: "self", - kind: Binding, - detail: "&{unknown}", - }, -] -- cgit v1.2.3 From 460423e66c7a8d48084813c0d592066b4bef3e85 Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Sun, 28 Jul 2019 11:35:48 +0100 Subject: Inline snapshots for all tests in presentation.rs --- crates/ra_ide_api/src/completion/presentation.rs | 209 +++++++++++++++------ ...ont_render_function_parens_if_already_call.snap | 24 --- ...r_function_parens_if_already_call_assoc_fn.snap | 16 -- ...m__dont_render_function_parens_in_use_item.snap | 16 -- ...n_item__inserts_parens_for_function_calls1.snap | 24 --- ...n_item__inserts_parens_for_function_calls2.snap | 24 --- ...n_item__inserts_parens_for_function_calls3.snap | 16 -- 7 files changed, 152 insertions(+), 177 deletions(-) delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap (limited to 'crates/ra_ide_api/src/completion') diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs index 5cf55a496..fe7581adf 100644 --- a/crates/ra_ide_api/src/completion/presentation.rs +++ b/crates/ra_ide_api/src/completion/presentation.rs @@ -183,79 +183,174 @@ impl Completions { #[cfg(test)] mod tests { use test_utils::covers; + use crate::completion::{do_completion, CompletionItem, CompletionKind}; + use insta::assert_debug_snapshot_matches; - use crate::completion::{check_completion, CompletionKind}; - - fn check_reference_completion(code: &str, expected_completions: &str) { - check_completion(code, expected_completions, CompletionKind::Reference); + fn do_reference_completion(code: &str) -> Vec { + do_completion(code, CompletionKind::Reference) } #[test] fn inserts_parens_for_function_calls() { covers!(inserts_parens_for_function_calls); - check_reference_completion( - "inserts_parens_for_function_calls1", - r" - fn no_args() {} - fn main() { no_<|> } - ", + assert_debug_snapshot_matches!( + do_reference_completion( + r" + fn no_args() {} + fn main() { no_<|> } + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "main", + ⋮ source_range: [61; 64), + ⋮ delete: [61; 64), + ⋮ insert: "main()$0", + ⋮ kind: Function, + ⋮ detail: "fn main()", + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "no_args", + ⋮ source_range: [61; 64), + ⋮ delete: [61; 64), + ⋮ insert: "no_args()$0", + ⋮ kind: Function, + ⋮ detail: "fn no_args()", + ⋮ }, + ⋮] + "### ); - check_reference_completion( - "inserts_parens_for_function_calls2", - r" - fn with_args(x: i32, y: String) {} - fn main() { with_<|> } - ", + assert_debug_snapshot_matches!( + do_reference_completion( + r" + fn with_args(x: i32, y: String) {} + fn main() { with_<|> } + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "main", + ⋮ source_range: [80; 85), + ⋮ delete: [80; 85), + ⋮ insert: "main()$0", + ⋮ kind: Function, + ⋮ detail: "fn main()", + ⋮ }, + ⋮ CompletionItem { + ⋮ label: "with_args", + ⋮ source_range: [80; 85), + ⋮ delete: [80; 85), + ⋮ insert: "with_args($0)", + ⋮ kind: Function, + ⋮ detail: "fn with_args(x: i32, y: String)", + ⋮ }, + ⋮] + "### + ); + assert_debug_snapshot_matches!( + do_reference_completion( + r" + struct S {} + impl S { + fn foo(&self) {} + } + fn bar(s: &S) { + s.f<|> + } + " + ), +@r###" + ⋮[ + ⋮ CompletionItem { + ⋮ label: "foo", + ⋮ source_range: [163; 164), + ⋮ delete: [163; 164), + ⋮ insert: "foo()$0", + ⋮ kind: Method, + ⋮ detail: "fn foo(&self)", + ⋮ }, + ⋮] + "### ); - check_reference_completion( - "inserts_parens_for_function_calls3", - r" - struct S {} - impl S { - fn foo(&self) {} - } - fn bar(s: &S) { - s.f<|> - } - ", - ) } #[test] fn dont_render_function_parens_in_use_item() { - check_reference_completion( - "dont_render_function_parens_in_use_item", - " - //- /lib.rs - mod m { pub fn foo() {} } - use crate::m::f<|>; - ", - ) + assert_debug_snapshot_matches!( + do_reference_completion( + " + //- /lib.rs + mod m { pub fn foo() {} } + use crate::m::f<|>; + " + ), +@r#"[ + CompletionItem { + label: "foo", + source_range: [40; 41), + delete: [40; 41), + insert: "foo", + kind: Function, + detail: "pub fn foo()", + }, +]"# + ); } #[test] fn dont_render_function_parens_if_already_call() { - check_reference_completion( - "dont_render_function_parens_if_already_call", - " - //- /lib.rs - fn frobnicate() {} - fn main() { - frob<|>(); - } - ", + assert_debug_snapshot_matches!( + do_reference_completion( + " + //- /lib.rs + fn frobnicate() {} + fn main() { + frob<|>(); + } + " + ), +@r#"[ + CompletionItem { + label: "frobnicate", + source_range: [35; 39), + delete: [35; 39), + insert: "frobnicate", + kind: Function, + detail: "fn frobnicate()", + }, + CompletionItem { + label: "main", + source_range: [35; 39), + delete: [35; 39), + insert: "main", + kind: Function, + detail: "fn main()", + }, +]"# + ); + assert_debug_snapshot_matches!( + do_reference_completion( + " + //- /lib.rs + struct Foo {} + impl Foo { fn new() -> Foo {} } + fn main() { + Foo::ne<|>(); + } + " + ), +@r#"[ + CompletionItem { + label: "new", + source_range: [67; 69), + delete: [67; 69), + insert: "new", + kind: Function, + detail: "fn new() -> Foo", + }, +]"# ); - check_reference_completion( - "dont_render_function_parens_if_already_call_assoc_fn", - " - //- /lib.rs - struct Foo {} - impl Foo { fn new() -> Foo {} } - fn main() { - Foo::ne<|>(); - } - ", - ) } - } diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap deleted file mode 100644 index 46bea2ccd..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap +++ /dev/null @@ -1,24 +0,0 @@ ---- -created: "2019-05-23T22:23:35.158296242Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "frobnicate", - source_range: [35; 39), - delete: [35; 39), - insert: "frobnicate", - kind: Function, - detail: "fn frobnicate()", - }, - CompletionItem { - label: "main", - source_range: [35; 39), - delete: [35; 39), - insert: "main", - kind: Function, - detail: "fn main()", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap deleted file mode 100644 index b09a6745e..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap +++ /dev/null @@ -1,16 +0,0 @@ ---- -created: "2019-05-23T22:44:10.920136527Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "new", - source_range: [67; 69), - delete: [67; 69), - insert: "new", - kind: Function, - detail: "fn new() -> Foo", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap deleted file mode 100644 index 84ccc8160..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap +++ /dev/null @@ -1,16 +0,0 @@ ---- -created: "2019-05-23T22:23:35.154795561Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "foo", - source_range: [40; 41), - delete: [40; 41), - insert: "foo", - kind: Function, - detail: "pub fn foo()", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap deleted file mode 100644 index c795b9aae..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap +++ /dev/null @@ -1,24 +0,0 @@ ---- -created: "2019-05-23T22:23:35.156115632Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "main", - source_range: [53; 56), - delete: [53; 56), - insert: "main()$0", - kind: Function, - detail: "fn main()", - }, - CompletionItem { - label: "no_args", - source_range: [53; 56), - delete: [53; 56), - insert: "no_args()$0", - kind: Function, - detail: "fn no_args()", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap deleted file mode 100644 index b49a838e0..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap +++ /dev/null @@ -1,24 +0,0 @@ ---- -created: "2019-05-23T22:44:10.916806744Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "main", - source_range: [72; 77), - delete: [72; 77), - insert: "main()$0", - kind: Function, - detail: "fn main()", - }, - CompletionItem { - label: "with_args", - source_range: [72; 77), - delete: [72; 77), - insert: "with_args($0)", - kind: Function, - detail: "fn with_args(x: i32, y: String)", - }, -] diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap deleted file mode 100644 index b62cb7aa1..000000000 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap +++ /dev/null @@ -1,16 +0,0 @@ ---- -created: "2019-05-23T22:44:40.543731193Z" -creator: insta@0.8.1 -source: crates/ra_ide_api/src/completion/completion_item.rs -expression: kind_completions ---- -[ - CompletionItem { - label: "foo", - source_range: [139; 140), - delete: [139; 140), - insert: "foo()$0", - kind: Method, - detail: "fn foo(&self)", - }, -] -- cgit v1.2.3 From 69244a6e18b3b53afaa0ee8073af52d93b983a86 Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Sun, 28 Jul 2019 11:45:03 +0100 Subject: Inline snapshots for all tests in complete_snippet, remove now-unused check_completion --- .../ra_ide_api/src/completion/complete_snippet.rs | 75 ++++++++++++++++------ .../ra_ide_api/src/completion/completion_item.rs | 7 -- ...item__should_not_complete_snippets_in_path.snap | 5 -- ...tem__should_not_complete_snippets_in_path2.snap | 5 -- .../completion_item__snippets_in_expressions.snap | 22 ------- .../completion_item__snippets_in_items.snap | 23 ------- 6 files changed, 57 insertions(+), 80 deletions(-) delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path2.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap delete mode 100644 crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap (limited to 'crates/ra_ide_api/src/completion') 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 { + 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 Date: Sun, 28 Jul 2019 12:08:06 +0100 Subject: cargo format --- crates/ra_ide_api/src/completion/complete_scope.rs | 118 ++++++++++----------- .../ra_ide_api/src/completion/complete_snippet.rs | 30 +++--- crates/ra_ide_api/src/completion/presentation.rs | 64 +++++------ 3 files changed, 106 insertions(+), 106 deletions(-) (limited to 'crates/ra_ide_api/src/completion') diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs index 1baa5227a..07c2e5f94 100644 --- a/crates/ra_ide_api/src/completion/complete_scope.rs +++ b/crates/ra_ide_api/src/completion/complete_scope.rs @@ -122,7 +122,7 @@ impl ImportResolver { #[cfg(test)] mod tests { use crate::completion::{do_completion, CompletionItem, CompletionKind}; - use insta::assert_debug_snapshot_matches; + use insta::assert_debug_snapshot_matches; fn do_reference_completion(code: &str) -> Vec { do_completion(code, CompletionKind::Reference) @@ -131,16 +131,16 @@ mod tests { #[test] fn completes_bindings_from_let() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn quux(x: i32) { let y = 92; 1 + <|>; let z = (); } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "quux", @@ -168,14 +168,14 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } #[test] fn completes_bindings_from_if_let() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn quux() { if let Some(x) = foo() { let y = 92; @@ -186,8 +186,8 @@ mod tests { } } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "a", @@ -214,22 +214,22 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } #[test] fn completes_bindings_from_for() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn quux() { for x in &[1, 2, 3] { <|> } } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "quux", @@ -248,20 +248,20 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } #[test] fn completes_generic_params() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn quux() { <|> } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "T", @@ -280,20 +280,20 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } #[test] fn completes_generic_params_in_struct() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct X { x: <|> } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "T", @@ -311,22 +311,22 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } #[test] fn completes_module_items() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct Foo; enum Baz {} fn quux() { <|> } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "Baz", @@ -352,22 +352,22 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } #[test] fn completes_extern_prelude() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" //- /lib.rs use <|>; //- /other_crate/lib.rs // nothing here " - ), -@r#"[ + ), + @r#"[ CompletionItem { label: "other_crate", source_range: [4; 4), @@ -376,22 +376,22 @@ mod tests { kind: Module, }, ]"# - ); + ); } #[test] fn completes_module_items_in_nested_modules() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct Foo; mod m { struct Bar; fn quux() { <|> } } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "Bar", @@ -410,19 +410,19 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } #[test] fn completes_return_type() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct Foo; fn x() -> <|> " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "Foo", @@ -441,14 +441,14 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } #[test] fn dont_show_both_completions_for_shadowing() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn foo() { let bar = 92; { @@ -457,8 +457,8 @@ mod tests { } } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "bar", @@ -478,14 +478,14 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } #[test] fn completes_self_in_methods() { assert_debug_snapshot_matches!( - do_reference_completion(r"impl S { fn foo(&self) { <|> } }"), -@r#"[ + do_reference_completion(r"impl S { fn foo(&self) { <|> } }"), + @r#"[ CompletionItem { label: "Self", source_range: [25; 25), @@ -502,14 +502,14 @@ mod tests { detail: "&{unknown}", }, ]"# - ); + ); } #[test] fn completes_prelude() { assert_debug_snapshot_matches!( - do_reference_completion( - " + do_reference_completion( + " //- /main.rs fn foo() { let x: <|> } @@ -521,8 +521,8 @@ mod tests { struct Option; } " - ), -@r#"[ + ), + @r#"[ CompletionItem { label: "Option", source_range: [18; 18), @@ -546,6 +546,6 @@ mod tests { kind: Module, }, ]"# - ); + ); } } diff --git a/crates/ra_ide_api/src/completion/complete_snippet.rs b/crates/ra_ide_api/src/completion/complete_snippet.rs index 063b69319..e0368b3b2 100644 --- a/crates/ra_ide_api/src/completion/complete_snippet.rs +++ b/crates/ra_ide_api/src/completion/complete_snippet.rs @@ -40,7 +40,7 @@ fn ${1:feature}() { #[cfg(test)] mod tests { use crate::completion::{do_completion, CompletionItem, CompletionKind}; - use insta::assert_debug_snapshot_matches; + use insta::assert_debug_snapshot_matches; fn do_snippet_completion(code: &str) -> Vec { do_completion(code, CompletionKind::Snippet) @@ -49,8 +49,8 @@ mod tests { #[test] fn completes_snippets_in_expressions() { assert_debug_snapshot_matches!( - do_snippet_completion(r"fn foo(x: i32) { <|> }"), -@r#"[ + do_snippet_completion(r"fn foo(x: i32) { <|> }"), + @r#"[ CompletionItem { label: "pd", source_range: [17; 17), @@ -66,33 +66,33 @@ mod tests { kind: Snippet, }, ]"# - ); + ); } #[test] fn should_not_complete_snippets_in_path() { assert_debug_snapshot_matches!( - do_snippet_completion(r"fn foo(x: i32) { ::foo<|> }"), -@r#"[]"# - ); + do_snippet_completion(r"fn foo(x: i32) { ::foo<|> }"), + @r#"[]"# + ); assert_debug_snapshot_matches!( - do_snippet_completion(r"fn foo(x: i32) { ::<|> }"), -@r#"[]"# - ); + do_snippet_completion(r"fn foo(x: i32) { ::<|> }"), + @r#"[]"# + ); } #[test] fn completes_snippets_in_items() { assert_debug_snapshot_matches!( - do_snippet_completion( - r" + do_snippet_completion( + r" #[cfg(test)] mod tests { <|> } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "Test function", @@ -111,6 +111,6 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } } diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs index fe7581adf..5df19990c 100644 --- a/crates/ra_ide_api/src/completion/presentation.rs +++ b/crates/ra_ide_api/src/completion/presentation.rs @@ -182,9 +182,9 @@ impl Completions { #[cfg(test)] mod tests { - use test_utils::covers; use crate::completion::{do_completion, CompletionItem, CompletionKind}; - use insta::assert_debug_snapshot_matches; + use insta::assert_debug_snapshot_matches; + use test_utils::covers; fn do_reference_completion(code: &str) -> Vec { do_completion(code, CompletionKind::Reference) @@ -194,13 +194,13 @@ mod tests { fn inserts_parens_for_function_calls() { covers!(inserts_parens_for_function_calls); assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn no_args() {} fn main() { no_<|> } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "main", @@ -220,15 +220,15 @@ mod tests { ⋮ }, ⋮] "### - ); + ); assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn with_args(x: i32, y: String) {} fn main() { with_<|> } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "main", @@ -248,10 +248,10 @@ mod tests { ⋮ }, ⋮] "### - ); + ); assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct S {} impl S { fn foo(&self) {} @@ -260,8 +260,8 @@ mod tests { s.f<|> } " - ), -@r###" + ), + @r###" ⋮[ ⋮ CompletionItem { ⋮ label: "foo", @@ -273,20 +273,20 @@ mod tests { ⋮ }, ⋮] "### - ); + ); } #[test] fn dont_render_function_parens_in_use_item() { assert_debug_snapshot_matches!( - do_reference_completion( - " + do_reference_completion( + " //- /lib.rs mod m { pub fn foo() {} } use crate::m::f<|>; " - ), -@r#"[ + ), + @r#"[ CompletionItem { label: "foo", source_range: [40; 41), @@ -296,22 +296,22 @@ mod tests { detail: "pub fn foo()", }, ]"# - ); + ); } #[test] fn dont_render_function_parens_if_already_call() { assert_debug_snapshot_matches!( - do_reference_completion( - " + do_reference_completion( + " //- /lib.rs fn frobnicate() {} fn main() { frob<|>(); } " - ), -@r#"[ + ), + @r#"[ CompletionItem { label: "frobnicate", source_range: [35; 39), @@ -329,10 +329,10 @@ mod tests { detail: "fn main()", }, ]"# - ); + ); assert_debug_snapshot_matches!( - do_reference_completion( - " + do_reference_completion( + " //- /lib.rs struct Foo {} impl Foo { fn new() -> Foo {} } @@ -340,8 +340,8 @@ mod tests { Foo::ne<|>(); } " - ), -@r#"[ + ), + @r#"[ CompletionItem { label: "new", source_range: [67; 69), @@ -351,6 +351,6 @@ mod tests { detail: "fn new() -> Foo", }, ]"# - ); + ); } } -- cgit v1.2.3 From 46c07ed57898251cd2821e41a3162d0c2d2e36d5 Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Sun, 28 Jul 2019 12:28:14 +0100 Subject: Remove vertical ellipses from tests in complete_scope.rs --- crates/ra_ide_api/src/completion/complete_scope.rs | 468 ++++++++++----------- 1 file changed, 225 insertions(+), 243 deletions(-) (limited to 'crates/ra_ide_api/src/completion') diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs index 07c2e5f94..079ecfacc 100644 --- a/crates/ra_ide_api/src/completion/complete_scope.rs +++ b/crates/ra_ide_api/src/completion/complete_scope.rs @@ -131,51 +131,49 @@ mod tests { #[test] fn completes_bindings_from_let() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn quux(x: i32) { let y = 92; 1 + <|>; let z = (); } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "quux", - ⋮ source_range: [91; 91), - ⋮ delete: [91; 91), - ⋮ insert: "quux($0)", - ⋮ kind: Function, - ⋮ detail: "fn quux(x: i32)", - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "x", - ⋮ source_range: [91; 91), - ⋮ delete: [91; 91), - ⋮ insert: "x", - ⋮ kind: Binding, - ⋮ detail: "i32", - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "y", - ⋮ source_range: [91; 91), - ⋮ delete: [91; 91), - ⋮ insert: "y", - ⋮ kind: Binding, - ⋮ detail: "i32", - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "quux", + source_range: [91; 91), + delete: [91; 91), + insert: "quux($0)", + kind: Function, + detail: "fn quux(x: i32)", + }, + CompletionItem { + label: "x", + source_range: [91; 91), + delete: [91; 91), + insert: "x", + kind: Binding, + detail: "i32", + }, + CompletionItem { + label: "y", + source_range: [91; 91), + delete: [91; 91), + insert: "y", + kind: Binding, + detail: "i32", + }, +]"### + ); } #[test] fn completes_bindings_from_if_let() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn quux() { if let Some(x) = foo() { let y = 92; @@ -186,188 +184,178 @@ mod tests { } } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "a", - ⋮ source_range: [242; 242), - ⋮ delete: [242; 242), - ⋮ insert: "a", - ⋮ kind: Binding, - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "b", - ⋮ source_range: [242; 242), - ⋮ delete: [242; 242), - ⋮ insert: "b", - ⋮ kind: Binding, - ⋮ detail: "i32", - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "quux", - ⋮ source_range: [242; 242), - ⋮ delete: [242; 242), - ⋮ insert: "quux()$0", - ⋮ kind: Function, - ⋮ detail: "fn quux()", - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "a", + source_range: [242; 242), + delete: [242; 242), + insert: "a", + kind: Binding, + }, + CompletionItem { + label: "b", + source_range: [242; 242), + delete: [242; 242), + insert: "b", + kind: Binding, + detail: "i32", + }, + CompletionItem { + label: "quux", + source_range: [242; 242), + delete: [242; 242), + insert: "quux()$0", + kind: Function, + detail: "fn quux()", + }, +]"### + ); } #[test] fn completes_bindings_from_for() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn quux() { for x in &[1, 2, 3] { <|> } } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "quux", - ⋮ source_range: [95; 95), - ⋮ delete: [95; 95), - ⋮ insert: "quux()$0", - ⋮ kind: Function, - ⋮ detail: "fn quux()", - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "x", - ⋮ source_range: [95; 95), - ⋮ delete: [95; 95), - ⋮ insert: "x", - ⋮ kind: Binding, - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "quux", + source_range: [95; 95), + delete: [95; 95), + insert: "quux()$0", + kind: Function, + detail: "fn quux()", + }, + CompletionItem { + label: "x", + source_range: [95; 95), + delete: [95; 95), + insert: "x", + kind: Binding, + }, +]"### + ); } #[test] fn completes_generic_params() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn quux() { <|> } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "T", - ⋮ source_range: [52; 52), - ⋮ delete: [52; 52), - ⋮ insert: "T", - ⋮ kind: TypeParam, - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "quux", - ⋮ source_range: [52; 52), - ⋮ delete: [52; 52), - ⋮ insert: "quux()$0", - ⋮ kind: Function, - ⋮ detail: "fn quux()", - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "T", + source_range: [52; 52), + delete: [52; 52), + insert: "T", + kind: TypeParam, + }, + CompletionItem { + label: "quux", + source_range: [52; 52), + delete: [52; 52), + insert: "quux()$0", + kind: Function, + detail: "fn quux()", + }, +]"### + ); } #[test] fn completes_generic_params_in_struct() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct X { x: <|> } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "T", - ⋮ source_range: [54; 54), - ⋮ delete: [54; 54), - ⋮ insert: "T", - ⋮ kind: TypeParam, - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "X", - ⋮ source_range: [54; 54), - ⋮ delete: [54; 54), - ⋮ insert: "X", - ⋮ kind: Struct, - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "T", + source_range: [54; 54), + delete: [54; 54), + insert: "T", + kind: TypeParam, + }, + CompletionItem { + label: "X", + source_range: [54; 54), + delete: [54; 54), + insert: "X", + kind: Struct, + }, +]"### + ); } #[test] fn completes_module_items() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct Foo; enum Baz {} fn quux() { <|> } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "Baz", - ⋮ source_range: [105; 105), - ⋮ delete: [105; 105), - ⋮ insert: "Baz", - ⋮ kind: Enum, - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "Foo", - ⋮ source_range: [105; 105), - ⋮ delete: [105; 105), - ⋮ insert: "Foo", - ⋮ kind: Struct, - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "quux", - ⋮ source_range: [105; 105), - ⋮ delete: [105; 105), - ⋮ insert: "quux()$0", - ⋮ kind: Function, - ⋮ detail: "fn quux()", - ⋮ }, - ⋮] - "### + ), + @r###"[ + CompletionItem { + label: "Baz", + source_range: [105; 105), + delete: [105; 105), + insert: "Baz", + kind: Enum, + }, + CompletionItem { + label: "Foo", + source_range: [105; 105), + delete: [105; 105), + insert: "Foo", + kind: Struct, + }, + CompletionItem { + label: "quux", + source_range: [105; 105), + delete: [105; 105), + insert: "quux()$0", + kind: Function, + detail: "fn quux()", + }, +]"### ); } #[test] fn completes_extern_prelude() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" //- /lib.rs use <|>; //- /other_crate/lib.rs // nothing here " - ), - @r#"[ + ), + @r#"[ CompletionItem { label: "other_crate", source_range: [4; 4), @@ -376,79 +364,75 @@ mod tests { kind: Module, }, ]"# - ); + ); } #[test] fn completes_module_items_in_nested_modules() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct Foo; mod m { struct Bar; fn quux() { <|> } } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "Bar", - ⋮ source_range: [117; 117), - ⋮ delete: [117; 117), - ⋮ insert: "Bar", - ⋮ kind: Struct, - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "quux", - ⋮ source_range: [117; 117), - ⋮ delete: [117; 117), - ⋮ insert: "quux()$0", - ⋮ kind: Function, - ⋮ detail: "fn quux()", - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "Bar", + source_range: [117; 117), + delete: [117; 117), + insert: "Bar", + kind: Struct, + }, + CompletionItem { + label: "quux", + source_range: [117; 117), + delete: [117; 117), + insert: "quux()$0", + kind: Function, + detail: "fn quux()", + }, +]"### + ); } #[test] fn completes_return_type() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct Foo; fn x() -> <|> " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "Foo", - ⋮ source_range: [55; 55), - ⋮ delete: [55; 55), - ⋮ insert: "Foo", - ⋮ kind: Struct, - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "x", - ⋮ source_range: [55; 55), - ⋮ delete: [55; 55), - ⋮ insert: "x()$0", - ⋮ kind: Function, - ⋮ detail: "fn x()", - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "Foo", + source_range: [55; 55), + delete: [55; 55), + insert: "Foo", + kind: Struct, + }, + CompletionItem { + label: "x", + source_range: [55; 55), + delete: [55; 55), + insert: "x()$0", + kind: Function, + detail: "fn x()", + }, +]"### + ); } #[test] fn dont_show_both_completions_for_shadowing() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn foo() { let bar = 92; { @@ -457,35 +441,33 @@ mod tests { } } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "bar", - ⋮ source_range: [146; 146), - ⋮ delete: [146; 146), - ⋮ insert: "bar", - ⋮ kind: Binding, - ⋮ detail: "i32", - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "foo", - ⋮ source_range: [146; 146), - ⋮ delete: [146; 146), - ⋮ insert: "foo()$0", - ⋮ kind: Function, - ⋮ detail: "fn foo()", - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "bar", + source_range: [146; 146), + delete: [146; 146), + insert: "bar", + kind: Binding, + detail: "i32", + }, + CompletionItem { + label: "foo", + source_range: [146; 146), + delete: [146; 146), + insert: "foo()$0", + kind: Function, + detail: "fn foo()", + }, +]"### + ); } #[test] fn completes_self_in_methods() { assert_debug_snapshot_matches!( - do_reference_completion(r"impl S { fn foo(&self) { <|> } }"), - @r#"[ + do_reference_completion(r"impl S { fn foo(&self) { <|> } }"), + @r#"[ CompletionItem { label: "Self", source_range: [25; 25), @@ -502,14 +484,14 @@ mod tests { detail: "&{unknown}", }, ]"# - ); + ); } #[test] fn completes_prelude() { assert_debug_snapshot_matches!( - do_reference_completion( - " + do_reference_completion( + " //- /main.rs fn foo() { let x: <|> } @@ -521,8 +503,8 @@ mod tests { struct Option; } " - ), - @r#"[ + ), + @r#"[ CompletionItem { label: "Option", source_range: [18; 18), @@ -546,6 +528,6 @@ mod tests { kind: Module, }, ]"# - ); + ); } } -- cgit v1.2.3 From 1b74eed8ca3abb14fa6ff404d1620397f3b2e4e8 Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Sun, 28 Jul 2019 12:33:21 +0100 Subject: Remove vertical ellipses from tests in complete_snippet.rs and presentation.rs --- .../ra_ide_api/src/completion/complete_snippet.rs | 44 +++--- crates/ra_ide_api/src/completion/presentation.rs | 152 ++++++++++----------- 2 files changed, 94 insertions(+), 102 deletions(-) (limited to 'crates/ra_ide_api/src/completion') diff --git a/crates/ra_ide_api/src/completion/complete_snippet.rs b/crates/ra_ide_api/src/completion/complete_snippet.rs index e0368b3b2..a35f31511 100644 --- a/crates/ra_ide_api/src/completion/complete_snippet.rs +++ b/crates/ra_ide_api/src/completion/complete_snippet.rs @@ -84,33 +84,31 @@ mod tests { #[test] fn completes_snippets_in_items() { assert_debug_snapshot_matches!( - do_snippet_completion( - r" + 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, - ⋮ }, - ⋮] - "### - ); + ), + @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/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs index 5df19990c..6878008d3 100644 --- a/crates/ra_ide_api/src/completion/presentation.rs +++ b/crates/ra_ide_api/src/completion/presentation.rs @@ -194,64 +194,60 @@ mod tests { fn inserts_parens_for_function_calls() { covers!(inserts_parens_for_function_calls); assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn no_args() {} fn main() { no_<|> } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "main", - ⋮ source_range: [61; 64), - ⋮ delete: [61; 64), - ⋮ insert: "main()$0", - ⋮ kind: Function, - ⋮ detail: "fn main()", - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "no_args", - ⋮ source_range: [61; 64), - ⋮ delete: [61; 64), - ⋮ insert: "no_args()$0", - ⋮ kind: Function, - ⋮ detail: "fn no_args()", - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "main", + source_range: [61; 64), + delete: [61; 64), + insert: "main()$0", + kind: Function, + detail: "fn main()", + }, + CompletionItem { + label: "no_args", + source_range: [61; 64), + delete: [61; 64), + insert: "no_args()$0", + kind: Function, + detail: "fn no_args()", + }, +]"### + ); assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" fn with_args(x: i32, y: String) {} fn main() { with_<|> } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "main", - ⋮ source_range: [80; 85), - ⋮ delete: [80; 85), - ⋮ insert: "main()$0", - ⋮ kind: Function, - ⋮ detail: "fn main()", - ⋮ }, - ⋮ CompletionItem { - ⋮ label: "with_args", - ⋮ source_range: [80; 85), - ⋮ delete: [80; 85), - ⋮ insert: "with_args($0)", - ⋮ kind: Function, - ⋮ detail: "fn with_args(x: i32, y: String)", - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "main", + source_range: [80; 85), + delete: [80; 85), + insert: "main()$0", + kind: Function, + detail: "fn main()", + }, + CompletionItem { + label: "with_args", + source_range: [80; 85), + delete: [80; 85), + insert: "with_args($0)", + kind: Function, + detail: "fn with_args(x: i32, y: String)", + }, +]"### + ); assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct S {} impl S { fn foo(&self) {} @@ -260,33 +256,31 @@ mod tests { s.f<|> } " - ), - @r###" - ⋮[ - ⋮ CompletionItem { - ⋮ label: "foo", - ⋮ source_range: [163; 164), - ⋮ delete: [163; 164), - ⋮ insert: "foo()$0", - ⋮ kind: Method, - ⋮ detail: "fn foo(&self)", - ⋮ }, - ⋮] - "### - ); + ), + @r###"[ + CompletionItem { + label: "foo", + source_range: [163; 164), + delete: [163; 164), + insert: "foo()$0", + kind: Method, + detail: "fn foo(&self)", + }, +]"### + ); } #[test] fn dont_render_function_parens_in_use_item() { assert_debug_snapshot_matches!( - do_reference_completion( - " + do_reference_completion( + " //- /lib.rs mod m { pub fn foo() {} } use crate::m::f<|>; " - ), - @r#"[ + ), + @r#"[ CompletionItem { label: "foo", source_range: [40; 41), @@ -296,22 +290,22 @@ mod tests { detail: "pub fn foo()", }, ]"# - ); + ); } #[test] fn dont_render_function_parens_if_already_call() { assert_debug_snapshot_matches!( - do_reference_completion( - " + do_reference_completion( + " //- /lib.rs fn frobnicate() {} fn main() { frob<|>(); } " - ), - @r#"[ + ), + @r#"[ CompletionItem { label: "frobnicate", source_range: [35; 39), @@ -329,10 +323,10 @@ mod tests { detail: "fn main()", }, ]"# - ); + ); assert_debug_snapshot_matches!( - do_reference_completion( - " + do_reference_completion( + " //- /lib.rs struct Foo {} impl Foo { fn new() -> Foo {} } @@ -340,8 +334,8 @@ mod tests { Foo::ne<|>(); } " - ), - @r#"[ + ), + @r#"[ CompletionItem { label: "new", source_range: [67; 69), @@ -351,6 +345,6 @@ mod tests { detail: "fn new() -> Foo", }, ]"# - ); + ); } } -- cgit v1.2.3 From 67e75ca1261863d21b48620e36b1632043ef36f9 Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Sun, 28 Jul 2019 12:45:01 +0100 Subject: Rerun cargo format, to make tests pass and formatting incorrect --- crates/ra_ide_api/src/completion/complete_scope.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/ra_ide_api/src/completion') diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs index 079ecfacc..2000d953a 100644 --- a/crates/ra_ide_api/src/completion/complete_scope.rs +++ b/crates/ra_ide_api/src/completion/complete_scope.rs @@ -307,16 +307,16 @@ mod tests { #[test] fn completes_module_items() { assert_debug_snapshot_matches!( - do_reference_completion( - r" + do_reference_completion( + r" struct Foo; enum Baz {} fn quux() { <|> } " - ), - @r###"[ + ), + @r###"[ CompletionItem { label: "Baz", source_range: [105; 105), @@ -340,7 +340,7 @@ mod tests { detail: "fn quux()", }, ]"### - ); + ); } #[test] -- cgit v1.2.3