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

wip

Browse Source
This commit is contained in:
Aleksey Kladov 2020-05-20 10:30:18 +02:00
parent 2e74df4e2b
commit d790a443f3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/ra_assists/src/handlers/change_return_type_to_result.rs
View File

@ -34,18 +34,22 @@ pub(crate) fn change_return_type_to_result(acc: &mut Assists, ctx: &AssistContex
AssistId("change_return_type_to_result"), AssistId("change_return_type_to_result"),
"Change return type to Result", "Change return type to Result",
type_ref.syntax().text_range(), type_ref.syntax().text_range(),
|edit| { |builder| {
let mut tail_return_expr_collector = TailReturnCollector::new(); let mut tail_return_expr_collector = TailReturnCollector::new();
tail_return_expr_collector.collect_jump_exprs(block_expr, false); tail_return_expr_collector.collect_jump_exprs(block_expr, false);
tail_return_expr_collector.collect_tail_exprs(block_expr); tail_return_expr_collector.collect_tail_exprs(block_expr);
for ret_expr_arg in tail_return_expr_collector.exprs_to_wrap { for ret_expr_arg in tail_return_expr_collector.exprs_to_wrap {
edit.replace_node_and_indent(&ret_expr_arg, format!("Ok({})", ret_expr_arg)); builder.replace_node_and_indent(&ret_expr_arg, format!("Ok({})", ret_expr_arg));
} }
edit.replace_node_and_indent(type_ref.syntax(), format!("Result<{}, >", type_ref)); match ctx.config.snippet_cap {
Some(_) => {}
None => {}
}
builder.replace_node_and_indent(type_ref.syntax(), format!("Result<{}, >", type_ref));
if let Some(node_start) = result_insertion_offset(&type_ref) { if let Some(node_start) = result_insertion_offset(&type_ref) {
edit.set_cursor(node_start + TextSize::of(&format!("Result<{}, ", type_ref))); builder.set_cursor(node_start + TextSize::of(&format!("Result<{}, ", type_ref)));
} }
}, },
) )