diff options
Diffstat (limited to 'crates/ra_assists/src/handlers/merge_match_arms.rs')
| -rw-r--r-- | crates/ra_assists/src/handlers/merge_match_arms.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs index 9ae099b41..7c4d9d55d 100644 --- a/crates/ra_assists/src/handlers/merge_match_arms.rs +++ b/crates/ra_assists/src/handlers/merge_match_arms.rs | |||
| @@ -70,7 +70,7 @@ pub(crate) fn merge_match_arms(ctx: AssistCtx) -> Option<Assist> { | |||
| 70 | return None; | 70 | return None; |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | ctx.add_assist(AssistId("merge_match_arms"), "Merge match arms", |edit| { | 73 | ctx.add_assist(AssistId("merge_match_arms"), "Merge match arms", current_text_range, |edit| { |
| 74 | let pats = if arms_to_merge.iter().any(contains_placeholder) { | 74 | let pats = if arms_to_merge.iter().any(contains_placeholder) { |
| 75 | "_".into() | 75 | "_".into() |
| 76 | } else { | 76 | } else { |
| @@ -87,7 +87,6 @@ pub(crate) fn merge_match_arms(ctx: AssistCtx) -> Option<Assist> { | |||
| 87 | let start = arms_to_merge.first().unwrap().syntax().text_range().start(); | 87 | let start = arms_to_merge.first().unwrap().syntax().text_range().start(); |
| 88 | let end = arms_to_merge.last().unwrap().syntax().text_range().end(); | 88 | let end = arms_to_merge.last().unwrap().syntax().text_range().end(); |
| 89 | 89 | ||
| 90 | edit.target(current_text_range); | ||
| 91 | edit.set_cursor(match cursor_pos { | 90 | edit.set_cursor(match cursor_pos { |
| 92 | CursorPos::InExpr(back_offset) => start + TextSize::of(&arm) - back_offset, | 91 | CursorPos::InExpr(back_offset) => start + TextSize::of(&arm) - back_offset, |
| 93 | CursorPos::InPat(offset) => offset, | 92 | CursorPos::InPat(offset) => offset, |