Skip to content

Commit 384fae7

Browse files
committed
Switch order of assists
Destructure in sub-pattern before Destructure in place to favor the first one
1 parent d0cf283 commit 384fae7

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

crates/ide_assists/src/handlers/destructure_tuple_binding.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ pub(crate) fn destructure_tuple_binding_impl(
5858
let ident_pat = ctx.find_node_at_offset::<ast::IdentPat>()?;
5959
let data = collect_data(ident_pat, ctx)?;
6060

61-
acc.add(
62-
AssistId("destructure_tuple_binding", AssistKind::RefactorRewrite),
63-
if with_sub_pattern { "Destructure tuple in place" } else { "Destructure tuple" },
64-
data.range,
65-
|builder| {
66-
edit_tuple_assignment(&data, builder, ctx, false);
67-
edit_tuple_usages(&data, builder, ctx, false);
68-
},
69-
);
70-
7161
if with_sub_pattern {
7262
acc.add(
7363
AssistId("destructure_tuple_binding_in_sub_pattern", AssistKind::RefactorRewrite),
@@ -80,6 +70,16 @@ pub(crate) fn destructure_tuple_binding_impl(
8070
);
8171
}
8272

73+
acc.add(
74+
AssistId("destructure_tuple_binding", AssistKind::RefactorRewrite),
75+
if with_sub_pattern { "Destructure tuple in place" } else { "Destructure tuple" },
76+
data.range,
77+
|builder| {
78+
edit_tuple_assignment(&data, builder, ctx, false);
79+
edit_tuple_usages(&data, builder, ctx, false);
80+
},
81+
);
82+
8383
Some(())
8484
}
8585

0 commit comments

Comments
 (0)