diff options
| author | bors <bors@rust-lang.org> | 2023-03-15 13:20:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-15 13:20:18 +0000 |
| commit | c16f0517922c220e5b0aaac2ff50459578d6dfec (patch) | |
| tree | c2f3df3fe06d6237b1eca4814f28974de094136e | |
| parent | adbda9430355d5826afb01fcff40afb50c1e49eb (diff) | |
| parent | 802d7ea33595593a9fe1de189f9edcd431fa78c1 (diff) | |
| download | rust-c16f0517922c220e5b0aaac2ff50459578d6dfec.tar.gz rust-c16f0517922c220e5b0aaac2ff50459578d6dfec.zip | |
Auto merge of #14362 - Veykril:remove-dbg, r=Veykril
internal: Prioritize remove-dbg assist over inline-macro
| -rw-r--r-- | crates/ide-assists/src/handlers/remove_dbg.rs | 2 | ||||
| -rw-r--r-- | crates/ide-assists/src/lib.rs | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crates/ide-assists/src/handlers/remove_dbg.rs b/crates/ide-assists/src/handlers/remove_dbg.rs index 1361cdf00cc..a403d5bc672 100644 --- a/crates/ide-assists/src/handlers/remove_dbg.rs +++ b/crates/ide-assists/src/handlers/remove_dbg.rs @@ -46,7 +46,7 @@ pub(crate) fn remove_dbg(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<( acc.add( AssistId("remove_dbg", AssistKind::Refactor), "Remove dbg!()", - ctx.selection_trimmed(), + replacements.iter().map(|&(range, _)| range).reduce(|acc, range| acc.cover(range)).unwrap(), |builder| { for (range, expr) in replacements { if let Some(expr) = expr { diff --git a/crates/ide-assists/src/lib.rs b/crates/ide-assists/src/lib.rs index 4d489b62b5c..8b07e29a587 100644 --- a/crates/ide-assists/src/lib.rs +++ b/crates/ide-assists/src/lib.rs @@ -265,7 +265,6 @@ mod handlers { inline_local_variable::inline_local_variable, inline_type_alias::inline_type_alias, inline_type_alias::inline_type_alias_uses, - inline_macro::inline_macro, introduce_named_generic::introduce_named_generic, introduce_named_lifetime::introduce_named_lifetime, invert_if::invert_if, @@ -286,7 +285,6 @@ mod handlers { raw_string::add_hash, raw_string::make_usual_string, raw_string::remove_hash, - remove_dbg::remove_dbg, remove_mut::remove_mut, remove_unused_param::remove_unused_param, remove_parentheses::remove_parentheses, @@ -335,6 +333,9 @@ mod handlers { generate_setter::generate_setter, generate_delegate_methods::generate_delegate_methods, generate_deref::generate_deref, + // + remove_dbg::remove_dbg, + inline_macro::inline_macro, // Are you sure you want to add new assist here, and not to the // sorted list above? ] |