From 384fae7fcd8e8063b30b3d318bcc8e545fca7d6b Mon Sep 17 00:00:00 2001 From: BooksBaum <15612932+Booksbaum@users.noreply.github.com> Date: Fri, 13 Aug 2021 19:16:36 +0200 Subject: [PATCH] Switch order of assists Destructure in sub-pattern before Destructure in place to favor the first one --- .../src/handlers/destructure_tuple_binding.rs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/ide_assists/src/handlers/destructure_tuple_binding.rs b/crates/ide_assists/src/handlers/destructure_tuple_binding.rs index a1aa0a04572b..1fe58442bf7e 100644 --- a/crates/ide_assists/src/handlers/destructure_tuple_binding.rs +++ b/crates/ide_assists/src/handlers/destructure_tuple_binding.rs @@ -58,16 +58,6 @@ pub(crate) fn destructure_tuple_binding_impl( let ident_pat = ctx.find_node_at_offset::()?; let data = collect_data(ident_pat, ctx)?; - acc.add( - AssistId("destructure_tuple_binding", AssistKind::RefactorRewrite), - if with_sub_pattern { "Destructure tuple in place" } else { "Destructure tuple" }, - data.range, - |builder| { - edit_tuple_assignment(&data, builder, ctx, false); - edit_tuple_usages(&data, builder, ctx, false); - }, - ); - if with_sub_pattern { acc.add( AssistId("destructure_tuple_binding_in_sub_pattern", AssistKind::RefactorRewrite), @@ -80,6 +70,16 @@ pub(crate) fn destructure_tuple_binding_impl( ); } + acc.add( + AssistId("destructure_tuple_binding", AssistKind::RefactorRewrite), + if with_sub_pattern { "Destructure tuple in place" } else { "Destructure tuple" }, + data.range, + |builder| { + edit_tuple_assignment(&data, builder, ctx, false); + edit_tuple_usages(&data, builder, ctx, false); + }, + ); + Some(()) }