From e0b1c17dcb367a3edfd9df4b1d7cfbcd059cd207 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Oct 2019 21:14:52 +0300 Subject: add `<>` when completing generic types --- crates/ra_ide_api/src/completion/complete_scope.rs | 154 +++++++++++---------- 1 file changed, 81 insertions(+), 73 deletions(-) (limited to 'crates/ra_ide_api/src/completion/complete_scope.rs') diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs index 38a6c3d37..84826cdcc 100644 --- a/crates/ra_ide_api/src/completion/complete_scope.rs +++ b/crates/ra_ide_api/src/completion/complete_scope.rs @@ -290,22 +290,24 @@ mod tests { } " ), - @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<$0>", + kind: Struct, + }, + ] + "### ); } @@ -319,22 +321,24 @@ mod tests { } " ), - @r###"[ - CompletionItem { - label: "Self", - source_range: [48; 48), - delete: [48; 48), - insert: "Self", - kind: TypeParam, - }, - CompletionItem { - label: "X", - source_range: [48; 48), - delete: [48; 48), - insert: "X", - kind: Enum, - }, -]"### + @r###" + [ + CompletionItem { + label: "Self", + source_range: [48; 48), + delete: [48; 48), + insert: "Self", + kind: TypeParam, + }, + CompletionItem { + label: "X", + source_range: [48; 48), + delete: [48; 48), + insert: "X", + kind: Enum, + }, + ] + "### ); } @@ -442,23 +446,25 @@ mod tests { 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()", + }, + ] + "### ); } @@ -538,30 +544,32 @@ mod tests { } " ), - @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, - }, -]"# + @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, + }, + ] + "### ); } -- cgit v1.2.3