mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better snippet when completing trait method

Browse Source
This commit is contained in:
Aleksey Kladov 2020-04-17 11:55:06 +02:00
parent 69f0cb6cd7
commit 3b75bc154f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ra_ide/src/completion/complete_trait_impl.rs
View File

@ -142,11 +142,11 @@ fn add_function_impl(
CompletionItemKind::Function CompletionItemKind::Function
}; };
let snippet = format!("{} {{}}", display); let snippet = format!("{} {{\n $0\n}}", display);
let range = TextRange::from_to(fn_def_node.text_range().start(), ctx.source_range().end()); let range = TextRange::from_to(fn_def_node.text_range().start(), ctx.source_range().end());
builder.text_edit(TextEdit::replace(range, snippet)).kind(completion_kind).add_to(acc); builder.snippet_edit(TextEdit::replace(range, snippet)).kind(completion_kind).add_to(acc);
} }
fn add_type_alias_impl( fn add_type_alias_impl(
@ -217,9 +217,10 @@ fn make_const_compl_syntax(const_: &ast::ConstDef) -> String {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
use insta::assert_debug_snapshot; use insta::assert_debug_snapshot;
use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
fn complete(code: &str) -> Vec<CompletionItem> { fn complete(code: &str) -> Vec<CompletionItem> {
do_completion(code, CompletionKind::Magic) do_completion(code, CompletionKind::Magic)
} }
@ -255,7 +256,7 @@ mod tests {
label: "fn test()", label: "fn test()",
source_range: [209; 210), source_range: [209; 210),
delete: [209; 210), delete: [209; 210),
insert: "fn test() {}", insert: "fn test() {\n $0\n}",
kind: Function, kind: Function,
lookup: "test", lookup: "test",
}, },
@ -313,7 +314,7 @@ mod tests {
label: "fn test()", label: "fn test()",
source_range: [139; 140), source_range: [139; 140),
delete: [139; 140), delete: [139; 140),
insert: "fn test() {}", insert: "fn test() {\n $0\n}",
kind: Function, kind: Function,
lookup: "test", lookup: "test",
}, },
@ -342,7 +343,7 @@ mod tests {
label: "fn foo()", label: "fn foo()",
source_range: [141; 142), source_range: [141; 142),
delete: [138; 142), delete: [138; 142),
insert: "fn foo() {}", insert: "fn foo() {\n $0\n}",
kind: Function, kind: Function,
lookup: "foo", lookup: "foo",
}, },
@ -374,7 +375,7 @@ mod tests {
label: "fn foo_bar()", label: "fn foo_bar()",
source_range: [200; 201), source_range: [200; 201),
delete: [197; 201), delete: [197; 201),
insert: "fn foo_bar() {}", insert: "fn foo_bar() {\n $0\n}",
kind: Function, kind: Function,
lookup: "foo_bar", lookup: "foo_bar",
}, },
@ -425,7 +426,7 @@ mod tests {
label: "fn foo()", label: "fn foo()",
source_range: [144; 145), source_range: [144; 145),
delete: [141; 145), delete: [141; 145),
insert: "fn foo<T>() {}", insert: "fn foo<T>() {\n $0\n}",
kind: Function, kind: Function,
lookup: "foo", lookup: "foo",
}, },
@ -454,7 +455,7 @@ mod tests {
label: "fn foo()", label: "fn foo()",
source_range: [166; 167), source_range: [166; 167),
delete: [163; 167), delete: [163; 167),
insert: "fn foo<T>()\nwhere T: Into<String> {}", insert: "fn foo<T>()\nwhere T: Into<String> {\n $0\n}",
kind: Function, kind: Function,
lookup: "foo", lookup: "foo",
}, },