language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-18 00:00:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #4534

Browse source 
4534: Add call postfix completion r=matklad a=vain0x

To make it easier to wrap an expression with Ok/Some/Rc::new etc.

Note I agree with conclusion of the discussion in #1431 that adding many completions is not the way to go. However, this PR still could be justified due to versatility of use.

Co-authored-by: vain0x <vainzerox@gmail.com>
This commit is contained in:
bors[bot] 2020-05-26 12:12:52 +00:00 • committed by GitHub
commit e3280eb4ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

59
crates/ra_ide/src/completion/complete_postfix.rs
View file

@ -184,6 +184,16 @@ pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
&format!("dbg!({})", receiver_text), &format!("dbg!({})", receiver_text),
) )
.add_to(acc); .add_to(acc);
postfix_snippet(
ctx,
cap,
&dot_receiver,
"call",
"function(expr)",
&format!("${{1}}({})", receiver_text),
)
.add_to(acc);
} }
fn get_receiver_text(receiver: &ast::Expr, receiver_is_ambiguous_float_literal: bool) -> String { fn get_receiver_text(receiver: &ast::Expr, receiver_is_ambiguous_float_literal: bool) -> String {
@ -255,6 +265,13 @@ mod tests {
insert: "Box::new(bar)", insert: "Box::new(bar)",
detail: "Box::new(expr)", detail: "Box::new(expr)",
}, },
CompletionItem {
label: "call",
source_range: 89..89,
delete: 85..89,
insert: "${1}(bar)",
detail: "function(expr)",
},
CompletionItem { CompletionItem {
label: "dbg", label: "dbg",
source_range: 89..89, source_range: 89..89,
@ -334,6 +351,13 @@ mod tests {
insert: "Box::new(bar)", insert: "Box::new(bar)",
detail: "Box::new(expr)", detail: "Box::new(expr)",
}, },
CompletionItem {
label: "call",
source_range: 210..210,
delete: 206..210,
insert: "${1}(bar)",
detail: "function(expr)",
},
CompletionItem { CompletionItem {
label: "dbg", label: "dbg",
source_range: 210..210, source_range: 210..210,
@ -413,6 +437,13 @@ mod tests {
insert: "Box::new(bar)", insert: "Box::new(bar)",
detail: "Box::new(expr)", detail: "Box::new(expr)",
}, },
CompletionItem {
label: "call",
source_range: 211..211,
delete: 207..211,
insert: "${1}(bar)",
detail: "function(expr)",
},
CompletionItem { CompletionItem {
label: "dbg", label: "dbg",
source_range: 211..211, source_range: 211..211,
@ -487,6 +518,13 @@ mod tests {
insert: "Box::new(bar)", insert: "Box::new(bar)",
detail: "Box::new(expr)", detail: "Box::new(expr)",
}, },
CompletionItem {
label: "call",
source_range: 91..91,
delete: 87..91,
insert: "${1}(bar)",
detail: "function(expr)",
},
CompletionItem { CompletionItem {
label: "dbg", label: "dbg",
source_range: 91..91, source_range: 91..91,
@ -546,6 +584,13 @@ mod tests {
insert: "Box::new(42)", insert: "Box::new(42)",
detail: "Box::new(expr)", detail: "Box::new(expr)",
}, },
CompletionItem {
label: "call",
source_range: 52..52,
delete: 49..52,
insert: "${1}(42)",
detail: "function(expr)",
},
CompletionItem { CompletionItem {
label: "dbg", label: "dbg",
source_range: 52..52, source_range: 52..52,
@ -607,6 +652,13 @@ mod tests {
insert: "Box::new(bar)", insert: "Box::new(bar)",
detail: "Box::new(expr)", detail: "Box::new(expr)",
}, },
CompletionItem {
label: "call",
source_range: 149..150,
delete: 145..150,
insert: "${1}(bar)",
detail: "function(expr)",
},
CompletionItem { CompletionItem {
label: "dbg", label: "dbg",
source_range: 149..150, source_range: 149..150,
@ -666,6 +718,13 @@ mod tests {
insert: "Box::new(&&&&42)", insert: "Box::new(&&&&42)",
detail: "Box::new(expr)", detail: "Box::new(expr)",
}, },
CompletionItem {
label: "call",
source_range: 56..56,
delete: 49..56,
insert: "${1}(&&&&42)",
detail: "function(expr)",
},
CompletionItem { CompletionItem {
label: "dbg", label: "dbg",
source_range: 56..56, source_range: 56..56,