Merge pull request #19419 from ShoyuVanilla/issue-15132
Render layout and other extra information on hovering `Self`
diff --git a/crates/hir-def/src/attr.rs b/crates/hir-def/src/attr.rs
index 78f26d6..005d583 100644
--- a/crates/hir-def/src/attr.rs
+++ b/crates/hir-def/src/attr.rs
@@ -233,7 +233,12 @@
}
pub fn repr(&self) -> Option<ReprOptions> {
- self.by_key(&sym::repr).tt_values().find_map(parse_repr_tt)
+ self.by_key(&sym::repr).tt_values().filter_map(parse_repr_tt).fold(None, |acc, repr| {
+ acc.map_or(Some(repr), |mut acc| {
+ merge_repr(&mut acc, repr);
+ Some(acc)
+ })
+ })
}
}
@@ -260,6 +265,19 @@
indices.into_boxed_slice()
}
+fn merge_repr(this: &mut ReprOptions, other: ReprOptions) {
+ let ReprOptions { int, align, pack, flags, field_shuffle_seed: _ } = this;
+ flags.insert(other.flags);
+ *align = (*align).max(other.align);
+ *pack = match (*pack, other.pack) {
+ (Some(pack), None) | (None, Some(pack)) => Some(pack),
+ _ => (*pack).min(other.pack),
+ };
+ if other.int.is_some() {
+ *int = other.int;
+ }
+}
+
fn parse_repr_tt(tt: &crate::tt::TopSubtree) -> Option<ReprOptions> {
use crate::builtin_type::{BuiltinInt, BuiltinUint};
use rustc_abi::{Align, Integer, IntegerType, ReprFlags, ReprOptions};
@@ -269,83 +287,76 @@
_ => return None,
}
- let mut flags = ReprFlags::empty();
- let mut int = None;
- let mut max_align: Option<Align> = None;
- let mut min_pack: Option<Align> = None;
-
+ let mut acc = ReprOptions::default();
let mut tts = tt.iter();
while let Some(tt) = tts.next() {
- if let TtElement::Leaf(tt::Leaf::Ident(ident)) = tt {
- flags.insert(match &ident.sym {
- s if *s == sym::packed => {
- let pack = if let Some(TtElement::Subtree(_, mut tt_iter)) = tts.peek() {
- tts.next();
- if let Some(TtElement::Leaf(tt::Leaf::Literal(lit))) = tt_iter.next() {
- lit.symbol.as_str().parse().unwrap_or_default()
- } else {
- 0
- }
+ let TtElement::Leaf(tt::Leaf::Ident(ident)) = tt else {
+ continue;
+ };
+ let repr = match &ident.sym {
+ s if *s == sym::packed => {
+ let pack = if let Some(TtElement::Subtree(_, mut tt_iter)) = tts.peek() {
+ tts.next();
+ if let Some(TtElement::Leaf(tt::Leaf::Literal(lit))) = tt_iter.next() {
+ lit.symbol.as_str().parse().unwrap_or_default()
} else {
0
- };
- let pack = Align::from_bytes(pack).unwrap_or(Align::ONE);
- min_pack =
- Some(if let Some(min_pack) = min_pack { min_pack.min(pack) } else { pack });
- ReprFlags::empty()
- }
- s if *s == sym::align => {
- if let Some(TtElement::Subtree(_, mut tt_iter)) = tts.peek() {
- tts.next();
- if let Some(TtElement::Leaf(tt::Leaf::Literal(lit))) = tt_iter.next() {
- if let Ok(align) = lit.symbol.as_str().parse() {
- let align = Align::from_bytes(align).ok();
- max_align = max_align.max(align);
- }
+ }
+ } else {
+ 0
+ };
+ let pack = Some(Align::from_bytes(pack).unwrap_or(Align::ONE));
+ ReprOptions { pack, ..Default::default() }
+ }
+ s if *s == sym::align => {
+ let mut align = None;
+ if let Some(TtElement::Subtree(_, mut tt_iter)) = tts.peek() {
+ tts.next();
+ if let Some(TtElement::Leaf(tt::Leaf::Literal(lit))) = tt_iter.next() {
+ if let Ok(a) = lit.symbol.as_str().parse() {
+ align = Align::from_bytes(a).ok();
}
}
- ReprFlags::empty()
}
- s if *s == sym::C => ReprFlags::IS_C,
- s if *s == sym::transparent => ReprFlags::IS_TRANSPARENT,
- s if *s == sym::simd => ReprFlags::IS_SIMD,
- repr => {
- if let Some(builtin) = BuiltinInt::from_suffix_sym(repr)
- .map(Either::Left)
- .or_else(|| BuiltinUint::from_suffix_sym(repr).map(Either::Right))
- {
- int = Some(match builtin {
- Either::Left(bi) => match bi {
- BuiltinInt::Isize => IntegerType::Pointer(true),
- BuiltinInt::I8 => IntegerType::Fixed(Integer::I8, true),
- BuiltinInt::I16 => IntegerType::Fixed(Integer::I16, true),
- BuiltinInt::I32 => IntegerType::Fixed(Integer::I32, true),
- BuiltinInt::I64 => IntegerType::Fixed(Integer::I64, true),
- BuiltinInt::I128 => IntegerType::Fixed(Integer::I128, true),
- },
- Either::Right(bu) => match bu {
- BuiltinUint::Usize => IntegerType::Pointer(false),
- BuiltinUint::U8 => IntegerType::Fixed(Integer::I8, false),
- BuiltinUint::U16 => IntegerType::Fixed(Integer::I16, false),
- BuiltinUint::U32 => IntegerType::Fixed(Integer::I32, false),
- BuiltinUint::U64 => IntegerType::Fixed(Integer::I64, false),
- BuiltinUint::U128 => IntegerType::Fixed(Integer::I128, false),
- },
- });
- }
- ReprFlags::empty()
+ ReprOptions { align, ..Default::default() }
+ }
+ s if *s == sym::C => ReprOptions { flags: ReprFlags::IS_C, ..Default::default() },
+ s if *s == sym::transparent => {
+ ReprOptions { flags: ReprFlags::IS_TRANSPARENT, ..Default::default() }
+ }
+ s if *s == sym::simd => ReprOptions { flags: ReprFlags::IS_SIMD, ..Default::default() },
+ repr => {
+ let mut int = None;
+ if let Some(builtin) = BuiltinInt::from_suffix_sym(repr)
+ .map(Either::Left)
+ .or_else(|| BuiltinUint::from_suffix_sym(repr).map(Either::Right))
+ {
+ int = Some(match builtin {
+ Either::Left(bi) => match bi {
+ BuiltinInt::Isize => IntegerType::Pointer(true),
+ BuiltinInt::I8 => IntegerType::Fixed(Integer::I8, true),
+ BuiltinInt::I16 => IntegerType::Fixed(Integer::I16, true),
+ BuiltinInt::I32 => IntegerType::Fixed(Integer::I32, true),
+ BuiltinInt::I64 => IntegerType::Fixed(Integer::I64, true),
+ BuiltinInt::I128 => IntegerType::Fixed(Integer::I128, true),
+ },
+ Either::Right(bu) => match bu {
+ BuiltinUint::Usize => IntegerType::Pointer(false),
+ BuiltinUint::U8 => IntegerType::Fixed(Integer::I8, false),
+ BuiltinUint::U16 => IntegerType::Fixed(Integer::I16, false),
+ BuiltinUint::U32 => IntegerType::Fixed(Integer::I32, false),
+ BuiltinUint::U64 => IntegerType::Fixed(Integer::I64, false),
+ BuiltinUint::U128 => IntegerType::Fixed(Integer::I128, false),
+ },
+ });
}
- })
- }
+ ReprOptions { int, ..Default::default() }
+ }
+ };
+ merge_repr(&mut acc, repr);
}
- Some(ReprOptions {
- int,
- align: max_align,
- pack: min_pack,
- flags,
- field_shuffle_seed: rustc_hashes::Hash64::ZERO,
- })
+ Some(acc)
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
diff --git a/crates/hir-def/src/lib.rs b/crates/hir-def/src/lib.rs
index 615bd33..fad0b56 100644
--- a/crates/hir-def/src/lib.rs
+++ b/crates/hir-def/src/lib.rs
@@ -24,9 +24,6 @@
#[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_abi as rustc_abi;
-#[cfg(not(feature = "in-rust-tree"))]
-extern crate ra_ap_rustc_hashes as rustc_hashes;
-
pub mod db;
pub mod attr;
diff --git a/crates/hir-ty/src/layout.rs b/crates/hir-ty/src/layout.rs
index 0cb868d..81aa16b 100644
--- a/crates/hir-ty/src/layout.rs
+++ b/crates/hir-ty/src/layout.rs
@@ -388,6 +388,15 @@
None => pointee,
}
}
+ TyKind::Tuple(_, subst) => {
+ if let Some(last_field_ty) =
+ subst.iter(Interner).last().and_then(|arg| arg.ty(Interner))
+ {
+ struct_tail_erasing_lifetimes(db, last_field_ty.clone())
+ } else {
+ pointee
+ }
+ }
_ => pointee,
}
}
diff --git a/crates/hir-ty/src/layout/tests.rs b/crates/hir-ty/src/layout/tests.rs
index f671b30..ffac087 100644
--- a/crates/hir-ty/src/layout/tests.rs
+++ b/crates/hir-ty/src/layout/tests.rs
@@ -285,6 +285,18 @@
}
#[test]
+fn multiple_repr_attrs() {
+ size_and_align!(
+ #[repr(C)]
+ #[repr(packed)]
+ struct Goal {
+ id: i32,
+ u: u8,
+ }
+ )
+}
+
+#[test]
fn generic() {
size_and_align! {
struct Pair<A, B>(A, B);
@@ -469,6 +481,16 @@
}
#[test]
+fn tuple_ptr_with_dst_tail() {
+ size_and_align!(
+ struct Goal(*const ([u8],));
+ );
+ size_and_align!(
+ struct Goal(*const (u128, [u8]));
+ );
+}
+
+#[test]
fn non_zero_and_non_null() {
size_and_align! {
minicore: non_zero, non_null, option;
diff --git a/crates/ide-assists/src/handlers/add_braces.rs b/crates/ide-assists/src/handlers/add_braces.rs
index f9124d2..d8db7cc 100644
--- a/crates/ide-assists/src/handlers/add_braces.rs
+++ b/crates/ide-assists/src/handlers/add_braces.rs
@@ -3,7 +3,7 @@
ast::{self, edit_in_place::Indent, syntax_factory::SyntaxFactory},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: add_braces
//
@@ -32,7 +32,7 @@
let (expr_type, expr) = get_replacement_node(ctx)?;
acc.add(
- AssistId("add_braces", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("add_braces"),
match expr_type {
ParentType::ClosureExpr => "Add braces to closure body",
ParentType::MatchArmExpr => "Add braces to arm expression",
diff --git a/crates/ide-assists/src/handlers/add_explicit_enum_discriminant.rs b/crates/ide-assists/src/handlers/add_explicit_enum_discriminant.rs
index c8a6f9e..10b0879 100644
--- a/crates/ide-assists/src/handlers/add_explicit_enum_discriminant.rs
+++ b/crates/ide-assists/src/handlers/add_explicit_enum_discriminant.rs
@@ -1,9 +1,5 @@
use hir::Semantics;
-use ide_db::{
- RootDatabase,
- assists::{AssistId, AssistKind},
- source_change::SourceChangeBuilder,
-};
+use ide_db::{RootDatabase, assists::AssistId, source_change::SourceChangeBuilder};
use syntax::{AstNode, ast};
use crate::{AssistContext, Assists};
@@ -53,7 +49,7 @@
}
acc.add(
- AssistId("add_explicit_enum_discriminant", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("add_explicit_enum_discriminant"),
"Add explicit enum discriminants",
enum_node.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/add_explicit_type.rs b/crates/ide-assists/src/handlers/add_explicit_type.rs
index 8bc2856..35a65cc 100644
--- a/crates/ide-assists/src/handlers/add_explicit_type.rs
+++ b/crates/ide-assists/src/handlers/add_explicit_type.rs
@@ -2,7 +2,7 @@
use ide_db::syntax_helpers::node_ext::walk_ty;
use syntax::ast::{self, AstNode, LetStmt, Param};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: add_explicit_type
//
@@ -71,7 +71,7 @@
let inferred_type = ty.display_source_code(ctx.db(), module.into(), false).ok()?;
acc.add(
- AssistId("add_explicit_type", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("add_explicit_type"),
format!("Insert explicit type `{inferred_type}`"),
pat_range,
|builder| match ascribed_ty {
diff --git a/crates/ide-assists/src/handlers/add_label_to_loop.rs b/crates/ide-assists/src/handlers/add_label_to_loop.rs
index fc10501..d2b9034 100644
--- a/crates/ide-assists/src/handlers/add_label_to_loop.rs
+++ b/crates/ide-assists/src/handlers/add_label_to_loop.rs
@@ -4,7 +4,7 @@
ast::{self, AstNode, HasLoopBody},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: add_label_to_loop
//
@@ -35,7 +35,7 @@
}
acc.add(
- AssistId("add_label_to_loop", AssistKind::Generate),
+ AssistId::generate("add_label_to_loop"),
"Add Label",
loop_expr.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/add_lifetime_to_type.rs b/crates/ide-assists/src/handlers/add_lifetime_to_type.rs
index c3e05b8..dcdc7ea 100644
--- a/crates/ide-assists/src/handlers/add_lifetime_to_type.rs
+++ b/crates/ide-assists/src/handlers/add_lifetime_to_type.rs
@@ -1,6 +1,6 @@
use syntax::ast::{self, AstNode, HasGenericParams, HasName};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: add_lifetime_to_type
//
@@ -37,31 +37,26 @@
let ref_types = fetch_borrowed_types(&node)?;
let target = node.syntax().text_range();
- acc.add(
- AssistId("add_lifetime_to_type", AssistKind::Generate),
- "Add lifetime",
- target,
- |builder| {
- match node.generic_param_list() {
- Some(gen_param) => {
- if let Some(left_angle) = gen_param.l_angle_token() {
- builder.insert(left_angle.text_range().end(), "'a, ");
- }
- }
- None => {
- if let Some(name) = node.name() {
- builder.insert(name.syntax().text_range().end(), "<'a>");
- }
+ acc.add(AssistId::generate("add_lifetime_to_type"), "Add lifetime", target, |builder| {
+ match node.generic_param_list() {
+ Some(gen_param) => {
+ if let Some(left_angle) = gen_param.l_angle_token() {
+ builder.insert(left_angle.text_range().end(), "'a, ");
}
}
+ None => {
+ if let Some(name) = node.name() {
+ builder.insert(name.syntax().text_range().end(), "<'a>");
+ }
+ }
+ }
- for ref_type in ref_types {
- if let Some(amp_token) = ref_type.amp_token() {
- builder.insert(amp_token.text_range().end(), "'a ");
- }
+ for ref_type in ref_types {
+ if let Some(amp_token) = ref_type.amp_token() {
+ builder.insert(amp_token.text_range().end(), "'a ");
}
- },
- )
+ }
+ })
}
fn fetch_borrowed_types(node: &ast::Adt) -> Option<Vec<ast::RefType>> {
diff --git a/crates/ide-assists/src/handlers/add_missing_impl_members.rs b/crates/ide-assists/src/handlers/add_missing_impl_members.rs
index 6b8a877..65bd914 100644
--- a/crates/ide-assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/ide-assists/src/handlers/add_missing_impl_members.rs
@@ -5,7 +5,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
utils::{
DefaultMethods, IgnoreAssocItems, add_trait_assoc_items_to_impl, filter_assoc_items,
@@ -146,7 +146,7 @@
}
let target = impl_def.syntax().text_range();
- acc.add(AssistId(assist_id, AssistKind::QuickFix), label, target, |edit| {
+ acc.add(AssistId::quick_fix(assist_id), label, target, |edit| {
let new_impl_def = edit.make_mut(impl_def.clone());
let first_new_item = add_trait_assoc_items_to_impl(
&ctx.sema,
diff --git a/crates/ide-assists/src/handlers/add_missing_match_arms.rs b/crates/ide-assists/src/handlers/add_missing_match_arms.rs
index 78f3e26..4cabf4b 100644
--- a/crates/ide-assists/src/handlers/add_missing_match_arms.rs
+++ b/crates/ide-assists/src/handlers/add_missing_match_arms.rs
@@ -12,7 +12,7 @@
use syntax::ast::syntax_factory::SyntaxFactory;
use syntax::ast::{self, AstNode, MatchArmList, MatchExpr, Pat, make};
-use crate::{AssistContext, AssistId, AssistKind, Assists, utils};
+use crate::{AssistContext, AssistId, Assists, utils};
// Assist: add_missing_match_arms
//
@@ -205,7 +205,7 @@
}
acc.add(
- AssistId("add_missing_match_arms", AssistKind::QuickFix),
+ AssistId::quick_fix("add_missing_match_arms"),
"Fill match arms",
ctx.sema.original_range(match_expr.syntax()).range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/add_return_type.rs b/crates/ide-assists/src/handlers/add_return_type.rs
index 0c745af..a7104ce 100644
--- a/crates/ide-assists/src/handlers/add_return_type.rs
+++ b/crates/ide-assists/src/handlers/add_return_type.rs
@@ -1,7 +1,7 @@
use hir::HirDisplay;
use syntax::{AstNode, SyntaxKind, SyntaxToken, TextRange, TextSize, ast, match_ast};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: add_return_type
//
@@ -25,7 +25,7 @@
let ty = ty.display_source_code(ctx.db(), module.into(), true).ok()?;
acc.add(
- AssistId("add_return_type", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("add_return_type"),
match fn_type {
FnType::Function => "Add this function's return type",
FnType::Closure { .. } => "Add this closure's return type",
diff --git a/crates/ide-assists/src/handlers/add_turbo_fish.rs b/crates/ide-assists/src/handlers/add_turbo_fish.rs
index 372e0da..4901962 100644
--- a/crates/ide-assists/src/handlers/add_turbo_fish.rs
+++ b/crates/ide-assists/src/handlers/add_turbo_fish.rs
@@ -7,7 +7,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -89,7 +89,7 @@
let_stmt.pat()?;
acc.add(
- AssistId("add_type_ascription", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("add_type_ascription"),
"Add `: _` before assignment operator",
ident.text_range(),
|builder| {
@@ -135,7 +135,7 @@
.count();
acc.add(
- AssistId("add_turbo_fish", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("add_turbo_fish"),
"Add `::<>`",
ident.text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/apply_demorgan.rs b/crates/ide-assists/src/handlers/apply_demorgan.rs
index e584c70..daab992 100644
--- a/crates/ide-assists/src/handlers/apply_demorgan.rs
+++ b/crates/ide-assists/src/handlers/apply_demorgan.rs
@@ -17,7 +17,7 @@
syntax_editor::{Position, SyntaxEditor},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, utils::invert_boolean_expression};
+use crate::{AssistContext, AssistId, Assists, utils::invert_boolean_expression};
// Assist: apply_demorgan
//
@@ -107,7 +107,7 @@
acc.add_group(
&GroupLabel("Apply De Morgan's law".to_owned()),
- AssistId("apply_demorgan", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("apply_demorgan"),
"Apply De Morgan's law",
op_range,
|builder| {
@@ -190,7 +190,7 @@
let label = format!("Apply De Morgan's law to `Iterator::{}`", name.text().as_str());
acc.add_group(
&GroupLabel("Apply De Morgan's law".to_owned()),
- AssistId("apply_demorgan_iterator", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("apply_demorgan_iterator"),
label,
op_range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/auto_import.rs b/crates/ide-assists/src/handlers/auto_import.rs
index f491b93..2c7532d 100644
--- a/crates/ide-assists/src/handlers/auto_import.rs
+++ b/crates/ide-assists/src/handlers/auto_import.rs
@@ -10,7 +10,7 @@
};
use syntax::{AstNode, Edition, NodeOrToken, SyntaxElement, ast};
-use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel};
+use crate::{AssistContext, AssistId, Assists, GroupLabel};
// Feature: Auto Import
//
@@ -127,7 +127,7 @@
let import_path = import.import_path;
let (assist_id, import_name) =
- (AssistId("auto_import", AssistKind::QuickFix), import_path.display(ctx.db(), edition));
+ (AssistId::quick_fix("auto_import"), import_path.display(ctx.db(), edition));
acc.add_group(
&group_label,
assist_id,
diff --git a/crates/ide-assists/src/handlers/bind_unused_param.rs b/crates/ide-assists/src/handlers/bind_unused_param.rs
index 5048ff5..dadc38e 100644
--- a/crates/ide-assists/src/handlers/bind_unused_param.rs
+++ b/crates/ide-assists/src/handlers/bind_unused_param.rs
@@ -1,9 +1,5 @@
use crate::assist_context::{AssistContext, Assists};
-use ide_db::{
- LineIndexDatabase,
- assists::{AssistId, AssistKind},
- defs::Definition,
-};
+use ide_db::{LineIndexDatabase, assists::AssistId, defs::Definition};
use syntax::{
AstNode,
ast::{self, edit_in_place::Indent},
@@ -42,7 +38,7 @@
let r_curly_range = stmt_list.r_curly_token()?.text_range();
acc.add(
- AssistId("bind_unused_param", AssistKind::QuickFix),
+ AssistId::quick_fix("bind_unused_param"),
format!("Bind as `let _ = {ident_pat};`"),
param.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/change_visibility.rs b/crates/ide-assists/src/handlers/change_visibility.rs
index 8af9121..9b9f0c4 100644
--- a/crates/ide-assists/src/handlers/change_visibility.rs
+++ b/crates/ide-assists/src/handlers/change_visibility.rs
@@ -8,7 +8,7 @@
ast::{self, HasName, HasVisibility},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, utils::vis_offset};
+use crate::{AssistContext, AssistId, Assists, utils::vis_offset};
// Assist: change_visibility
//
@@ -76,7 +76,7 @@
};
acc.add(
- AssistId("change_visibility", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("change_visibility"),
"Change visibility to pub(crate)",
target,
|edit| {
@@ -112,7 +112,7 @@
if vis.syntax().text() == "pub" {
let target = vis.syntax().text_range();
return acc.add(
- AssistId("change_visibility", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("change_visibility"),
"Change Visibility to pub(crate)",
target,
|edit| {
@@ -123,7 +123,7 @@
if vis.syntax().text() == "pub(crate)" {
let target = vis.syntax().text_range();
return acc.add(
- AssistId("change_visibility", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("change_visibility"),
"Change visibility to pub",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/convert_bool_then.rs b/crates/ide-assists/src/handlers/convert_bool_then.rs
index c4a2189..f3210a6 100644
--- a/crates/ide-assists/src/handlers/convert_bool_then.rs
+++ b/crates/ide-assists/src/handlers/convert_bool_then.rs
@@ -14,7 +14,7 @@
};
use crate::{
- AssistContext, AssistId, AssistKind, Assists,
+ AssistContext, AssistId, Assists,
utils::{invert_boolean_expression, unwrap_trivial_block},
};
@@ -73,7 +73,7 @@
let target = expr.syntax().text_range();
acc.add(
- AssistId("convert_if_to_bool_then", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_if_to_bool_then"),
"Convert `if` expression to `bool::then` call",
target,
|builder| {
@@ -181,7 +181,7 @@
let target = mcall.syntax().text_range();
acc.add(
- AssistId("convert_bool_then_to_if", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_bool_then_to_if"),
"Convert `bool::then` call to `if`",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/convert_bool_to_enum.rs b/crates/ide-assists/src/handlers/convert_bool_to_enum.rs
index 8200ad7..e3ca28d 100644
--- a/crates/ide-assists/src/handlers/convert_bool_to_enum.rs
+++ b/crates/ide-assists/src/handlers/convert_bool_to_enum.rs
@@ -3,7 +3,7 @@
use ide_db::text_edit::TextRange;
use ide_db::{
FxHashSet,
- assists::{AssistId, AssistKind},
+ assists::AssistId,
defs::Definition,
helpers::mod_path_to_ast,
imports::insert_use::{ImportScope, insert_use},
@@ -62,7 +62,7 @@
let target = name.syntax().text_range();
acc.add(
- AssistId("convert_bool_to_enum", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_bool_to_enum"),
"Convert boolean to enum",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/convert_closure_to_fn.rs b/crates/ide-assists/src/handlers/convert_closure_to_fn.rs
index c11a411..fbd925e 100644
--- a/crates/ide-assists/src/handlers/convert_closure_to_fn.rs
+++ b/crates/ide-assists/src/handlers/convert_closure_to_fn.rs
@@ -1,12 +1,8 @@
use either::Either;
use hir::{CaptureKind, ClosureCapture, FileRangeWrapper, HirDisplay};
use ide_db::{
- FxHashSet,
- assists::{AssistId, AssistKind},
- base_db::SourceDatabase,
- defs::Definition,
- search::FileReferenceNode,
- source_change::SourceChangeBuilder,
+ FxHashSet, assists::AssistId, base_db::SourceDatabase, defs::Definition,
+ search::FileReferenceNode, source_change::SourceChangeBuilder,
};
use stdx::format_to;
use syntax::{
@@ -147,7 +143,7 @@
};
acc.add(
- AssistId("convert_closure_to_fn", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_closure_to_fn"),
"Convert closure to fn",
closure.param_list()?.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/convert_comment_block.rs b/crates/ide-assists/src/handlers/convert_comment_block.rs
index 92b86ce..0d36a5d 100644
--- a/crates/ide-assists/src/handlers/convert_comment_block.rs
+++ b/crates/ide-assists/src/handlers/convert_comment_block.rs
@@ -4,7 +4,7 @@
ast::{self, Comment, CommentKind, CommentShape, Whitespace, edit::IndentLevel},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: line_to_block
//
@@ -38,7 +38,7 @@
let target = comment.syntax().text_range();
acc.add(
- AssistId("block_to_line", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("block_to_line"),
"Replace block comment with line comments",
target,
|edit| {
@@ -80,7 +80,7 @@
);
acc.add(
- AssistId("line_to_block", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("line_to_block"),
"Replace line comments with a single block comment",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/convert_comment_from_or_to_doc.rs b/crates/ide-assists/src/handlers/convert_comment_from_or_to_doc.rs
index 7b4d271..187cc74 100644
--- a/crates/ide-assists/src/handlers/convert_comment_from_or_to_doc.rs
+++ b/crates/ide-assists/src/handlers/convert_comment_from_or_to_doc.rs
@@ -4,7 +4,7 @@
ast::{self, Comment, CommentPlacement, Whitespace, edit::IndentLevel},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: comment_to_doc
//
@@ -39,7 +39,7 @@
};
acc.add(
- AssistId("doc_to_comment", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("doc_to_comment"),
"Replace doc comment with comment",
target,
|edit| {
@@ -86,7 +86,7 @@
};
acc.add(
- AssistId("comment_to_doc", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("comment_to_doc"),
"Replace comment with doc comment",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/convert_for_to_while_let.rs b/crates/ide-assists/src/handlers/convert_for_to_while_let.rs
index 03041f3..801a57b 100644
--- a/crates/ide-assists/src/handlers/convert_for_to_while_let.rs
+++ b/crates/ide-assists/src/handlers/convert_for_to_while_let.rs
@@ -9,7 +9,7 @@
syntax_editor::Position,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: convert_for_loop_to_while_let
//
@@ -47,7 +47,7 @@
}
acc.add(
- AssistId("convert_for_loop_to_while_let", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_for_loop_to_while_let"),
"Replace this for loop with `while let`",
for_loop.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/convert_from_to_tryfrom.rs b/crates/ide-assists/src/handlers/convert_from_to_tryfrom.rs
index 07ad5a6..ec08eb9 100644
--- a/crates/ide-assists/src/handlers/convert_from_to_tryfrom.rs
+++ b/crates/ide-assists/src/handlers/convert_from_to_tryfrom.rs
@@ -5,7 +5,7 @@
ted,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: convert_from_to_tryfrom
//
@@ -71,7 +71,7 @@
}
acc.add(
- AssistId("convert_from_to_tryfrom", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_from_to_tryfrom"),
"Convert From to TryFrom",
impl_.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/convert_integer_literal.rs b/crates/ide-assists/src/handlers/convert_integer_literal.rs
index 270eecd..846f4e9 100644
--- a/crates/ide-assists/src/handlers/convert_integer_literal.rs
+++ b/crates/ide-assists/src/handlers/convert_integer_literal.rs
@@ -1,6 +1,6 @@
use syntax::{AstToken, ast, ast::Radix};
-use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel};
+use crate::{AssistContext, AssistId, Assists, GroupLabel};
// Assist: convert_integer_literal
//
@@ -47,7 +47,7 @@
acc.add_group(
&group_id,
- AssistId("convert_integer_literal", AssistKind::RefactorInline),
+ AssistId::refactor_rewrite("convert_integer_literal"),
label,
range,
|builder| builder.replace(range, converted),
diff --git a/crates/ide-assists/src/handlers/convert_into_to_from.rs b/crates/ide-assists/src/handlers/convert_into_to_from.rs
index 8c59ef4..b80276a 100644
--- a/crates/ide-assists/src/handlers/convert_into_to_from.rs
+++ b/crates/ide-assists/src/handlers/convert_into_to_from.rs
@@ -1,7 +1,7 @@
use ide_db::{famous_defs::FamousDefs, helpers::mod_path_to_ast, traits::resolve_target_trait};
use syntax::ast::{self, AstNode, HasGenericArgs, HasName};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// FIXME: this should be a diagnostic
@@ -85,7 +85,7 @@
.filter(|name| name.text() == "self" || name.text() == "Self");
acc.add(
- AssistId("convert_into_to_from", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_into_to_from"),
"Convert Into to From",
impl_.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs b/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs
index 713d215..d7f6594 100644
--- a/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs
+++ b/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs
@@ -6,7 +6,7 @@
ast::{self, HasArgList, HasLoopBody, edit_in_place::Indent, make},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: convert_iter_for_each_to_for
//
@@ -53,7 +53,7 @@
let range = stmt.as_ref().map_or(method.syntax(), AstNode::syntax).text_range();
acc.add(
- AssistId("convert_iter_for_each_to_for", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_iter_for_each_to_for"),
"Replace this `Iterator::for_each` with a for loop",
range,
|builder| {
@@ -108,7 +108,7 @@
}
acc.add(
- AssistId("convert_for_loop_with_for_each", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_for_loop_with_for_each"),
"Replace this for loop with `Iterator::for_each`",
for_loop.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/convert_let_else_to_match.rs b/crates/ide-assists/src/handlers/convert_let_else_to_match.rs
index 9f71031..df92b07 100644
--- a/crates/ide-assists/src/handlers/convert_let_else_to_match.rs
+++ b/crates/ide-assists/src/handlers/convert_let_else_to_match.rs
@@ -4,7 +4,7 @@
use syntax::ast::RangeItem;
use syntax::ast::{AstNode, HasName, LetStmt, Name, Pat, edit::AstNodeEdit};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: convert_let_else_to_match
//
@@ -43,7 +43,7 @@
let target = let_stmt.syntax().text_range();
acc.add(
- AssistId("convert_let_else_to_match", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_let_else_to_match"),
"Convert let-else to let and match",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/convert_match_to_let_else.rs b/crates/ide-assists/src/handlers/convert_match_to_let_else.rs
index 2db78f4..efcbcef 100644
--- a/crates/ide-assists/src/handlers/convert_match_to_let_else.rs
+++ b/crates/ide-assists/src/handlers/convert_match_to_let_else.rs
@@ -6,7 +6,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -55,7 +55,7 @@
let extracted_variable_positions = find_extracted_variable(ctx, &extracting_arm)?;
acc.add(
- AssistId("convert_match_to_let_else", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_match_to_let_else"),
"Convert match to let-else",
let_stmt.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/convert_named_struct_to_tuple_struct.rs b/crates/ide-assists/src/handlers/convert_named_struct_to_tuple_struct.rs
index 7b8804e..53a5a94 100644
--- a/crates/ide-assists/src/handlers/convert_named_struct_to_tuple_struct.rs
+++ b/crates/ide-assists/src/handlers/convert_named_struct_to_tuple_struct.rs
@@ -7,7 +7,7 @@
match_ast, ted,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, assist_context::SourceChangeBuilder};
+use crate::{AssistContext, AssistId, Assists, assist_context::SourceChangeBuilder};
// Assist: convert_named_struct_to_tuple_struct
//
@@ -69,7 +69,7 @@
};
acc.add(
- AssistId("convert_named_struct_to_tuple_struct", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_named_struct_to_tuple_struct"),
"Convert to tuple struct",
strukt.syntax().text_range(),
|edit| {
diff --git a/crates/ide-assists/src/handlers/convert_nested_function_to_closure.rs b/crates/ide-assists/src/handlers/convert_nested_function_to_closure.rs
index ea2752b..c0fd697 100644
--- a/crates/ide-assists/src/handlers/convert_nested_function_to_closure.rs
+++ b/crates/ide-assists/src/handlers/convert_nested_function_to_closure.rs
@@ -1,4 +1,4 @@
-use ide_db::assists::{AssistId, AssistKind};
+use ide_db::assists::AssistId;
use syntax::ast::{self, HasGenericParams, HasName};
use syntax::{AstNode, SyntaxKind};
@@ -44,7 +44,7 @@
let param_list = function.param_list()?;
acc.add(
- AssistId("convert_nested_function_to_closure", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_nested_function_to_closure"),
"Convert nested function to closure",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/convert_to_guarded_return.rs b/crates/ide-assists/src/handlers/convert_to_guarded_return.rs
index bd829d1..71a61f2 100644
--- a/crates/ide-assists/src/handlers/convert_to_guarded_return.rs
+++ b/crates/ide-assists/src/handlers/convert_to_guarded_return.rs
@@ -17,7 +17,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
utils::invert_boolean_expression_legacy,
};
@@ -128,7 +128,7 @@
let target = if_expr.syntax().text_range();
acc.add(
- AssistId("convert_to_guarded_return", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_to_guarded_return"),
"Convert to guarded return",
target,
|edit| {
@@ -210,7 +210,7 @@
};
acc.add(
- AssistId("convert_to_guarded_return", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_to_guarded_return"),
"Convert to guarded return",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/convert_tuple_return_type_to_struct.rs b/crates/ide-assists/src/handlers/convert_tuple_return_type_to_struct.rs
index 0d79937..87eafc3 100644
--- a/crates/ide-assists/src/handlers/convert_tuple_return_type_to_struct.rs
+++ b/crates/ide-assists/src/handlers/convert_tuple_return_type_to_struct.rs
@@ -2,7 +2,7 @@
use hir::ModuleDef;
use ide_db::{
FxHashSet,
- assists::{AssistId, AssistKind},
+ assists::AssistId,
defs::Definition,
helpers::mod_path_to_ast,
imports::insert_use::{ImportScope, insert_use},
@@ -63,7 +63,7 @@
let target = type_ref.syntax().text_range();
acc.add(
- AssistId("convert_tuple_return_type_to_struct", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_tuple_return_type_to_struct"),
"Convert tuple return type to tuple struct",
target,
move |edit| {
diff --git a/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs b/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs
index 83e4737..ae23fa0 100644
--- a/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs
+++ b/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs
@@ -6,7 +6,7 @@
match_ast, ted,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, assist_context::SourceChangeBuilder};
+use crate::{AssistContext, AssistId, Assists, assist_context::SourceChangeBuilder};
// Assist: convert_tuple_struct_to_named_struct
//
@@ -65,7 +65,7 @@
let target = strukt.as_ref().either(|s| s.syntax(), |v| v.syntax()).text_range();
acc.add(
- AssistId("convert_tuple_struct_to_named_struct", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_tuple_struct_to_named_struct"),
"Convert to named struct",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/convert_two_arm_bool_match_to_matches_macro.rs b/crates/ide-assists/src/handlers/convert_two_arm_bool_match_to_matches_macro.rs
index 6a5b11f..e582aa8 100644
--- a/crates/ide-assists/src/handlers/convert_two_arm_bool_match_to_matches_macro.rs
+++ b/crates/ide-assists/src/handlers/convert_two_arm_bool_match_to_matches_macro.rs
@@ -3,7 +3,7 @@
use stdx::format_to;
use syntax::ast::{self, AstNode};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: convert_two_arm_bool_match_to_matches_macro
//
@@ -56,7 +56,7 @@
let expr = match_expr.expr()?;
acc.add(
- AssistId("convert_two_arm_bool_match_to_matches_macro", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_two_arm_bool_match_to_matches_macro"),
"Convert to matches!",
target_range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/convert_while_to_loop.rs b/crates/ide-assists/src/handlers/convert_while_to_loop.rs
index 724de19..dbe3ee0 100644
--- a/crates/ide-assists/src/handlers/convert_while_to_loop.rs
+++ b/crates/ide-assists/src/handlers/convert_while_to_loop.rs
@@ -12,7 +12,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
utils::invert_boolean_expression_legacy,
};
@@ -47,7 +47,7 @@
let target = while_expr.syntax().text_range();
acc.add(
- AssistId("convert_while_to_loop", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("convert_while_to_loop"),
"Convert while to loop",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/destructure_struct_binding.rs b/crates/ide-assists/src/handlers/destructure_struct_binding.rs
index a8a3a8c..76fb6b6 100644
--- a/crates/ide-assists/src/handlers/destructure_struct_binding.rs
+++ b/crates/ide-assists/src/handlers/destructure_struct_binding.rs
@@ -2,7 +2,7 @@
use ide_db::text_edit::TextRange;
use ide_db::{
FxHashMap, FxHashSet,
- assists::{AssistId, AssistKind},
+ assists::AssistId,
defs::Definition,
helpers::mod_path_to_ast,
search::{FileReference, SearchScope},
@@ -47,7 +47,7 @@
let data = collect_data(ident_pat, ctx)?;
acc.add(
- AssistId("destructure_struct_binding", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("destructure_struct_binding"),
"Destructure struct binding",
data.ident_pat.syntax().text_range(),
|edit| destructure_struct_binding_impl(ctx, edit, &data),
diff --git a/crates/ide-assists/src/handlers/destructure_tuple_binding.rs b/crates/ide-assists/src/handlers/destructure_tuple_binding.rs
index 95eb88f..adf0f09 100644
--- a/crates/ide-assists/src/handlers/destructure_tuple_binding.rs
+++ b/crates/ide-assists/src/handlers/destructure_tuple_binding.rs
@@ -1,5 +1,5 @@
use ide_db::{
- assists::{AssistId, AssistKind},
+ assists::AssistId,
defs::Definition,
search::{FileReference, SearchScope},
syntax_helpers::suggest_name,
@@ -65,7 +65,7 @@
if with_sub_pattern {
acc.add(
- AssistId("destructure_tuple_binding_in_sub_pattern", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("destructure_tuple_binding_in_sub_pattern"),
"Destructure tuple in sub-pattern",
data.ident_pat.syntax().text_range(),
|edit| destructure_tuple_edit_impl(ctx, edit, &data, true),
@@ -73,7 +73,7 @@
}
acc.add(
- AssistId("destructure_tuple_binding", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("destructure_tuple_binding"),
if with_sub_pattern { "Destructure tuple in place" } else { "Destructure tuple" },
data.ident_pat.syntax().text_range(),
|edit| destructure_tuple_edit_impl(ctx, edit, &data, false),
diff --git a/crates/ide-assists/src/handlers/desugar_doc_comment.rs b/crates/ide-assists/src/handlers/desugar_doc_comment.rs
index 9d0797d..74bb0ba 100644
--- a/crates/ide-assists/src/handlers/desugar_doc_comment.rs
+++ b/crates/ide-assists/src/handlers/desugar_doc_comment.rs
@@ -6,7 +6,7 @@
};
use crate::{
- AssistContext, AssistId, AssistKind, Assists,
+ AssistContext, AssistId, Assists,
handlers::convert_comment_block::{line_comment_text, relevant_line_comments},
utils::required_hashes,
};
@@ -54,7 +54,7 @@
};
acc.add(
- AssistId("desugar_doc_comment", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("desugar_doc_comment"),
"Desugar doc-comment to attribute macro",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/expand_glob_import.rs b/crates/ide-assists/src/handlers/expand_glob_import.rs
index fae5530..307414c 100644
--- a/crates/ide-assists/src/handlers/expand_glob_import.rs
+++ b/crates/ide-assists/src/handlers/expand_glob_import.rs
@@ -13,7 +13,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -62,7 +62,7 @@
let target = parent.either(|n| n.syntax().clone(), |n| n.syntax().clone());
acc.add(
- AssistId("expand_glob_import", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("expand_glob_import"),
"Expand glob import",
target.text_range(),
|builder| {
@@ -123,7 +123,7 @@
let target = parent.either(|n| n.syntax().clone(), |n| n.syntax().clone());
acc.add(
- AssistId("expand_glob_reexport", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("expand_glob_reexport"),
"Expand glob reexport",
target.text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/expand_rest_pattern.rs b/crates/ide-assists/src/handlers/expand_rest_pattern.rs
index e437e7e..ceb13b2 100644
--- a/crates/ide-assists/src/handlers/expand_rest_pattern.rs
+++ b/crates/ide-assists/src/handlers/expand_rest_pattern.rs
@@ -74,7 +74,7 @@
let target_range = rest_pat.syntax().text_range();
acc.add(
- AssistId("expand_record_rest_pattern", crate::AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("expand_record_rest_pattern"),
"Fill struct fields",
target_range,
move |builder| builder.replace_ast(old_field_list, new_field_list),
@@ -155,7 +155,7 @@
let target_range = rest_pat.syntax().text_range();
acc.add(
- AssistId("expand_tuple_struct_rest_pattern", crate::AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("expand_tuple_struct_rest_pattern"),
"Fill tuple struct fields",
target_range,
move |builder| builder.replace_ast(pat, new_pat),
diff --git a/crates/ide-assists/src/handlers/extract_expressions_from_format_string.rs b/crates/ide-assists/src/handlers/extract_expressions_from_format_string.rs
index c9eb7c5..1212bb7 100644
--- a/crates/ide-assists/src/handlers/extract_expressions_from_format_string.rs
+++ b/crates/ide-assists/src/handlers/extract_expressions_from_format_string.rs
@@ -53,6 +53,7 @@
} else {
AssistKind::QuickFix
},
+ None,
),
"Extract format expressions",
tt.syntax().text_range(),
diff --git a/crates/ide-assists/src/handlers/extract_function.rs b/crates/ide-assists/src/handlers/extract_function.rs
index 6b535a2..abc0698 100644
--- a/crates/ide-assists/src/handlers/extract_function.rs
+++ b/crates/ide-assists/src/handlers/extract_function.rs
@@ -108,7 +108,7 @@
acc.add_group(
&GroupLabel("Extract into...".to_owned()),
- AssistId("extract_function", crate::AssistKind::RefactorExtract),
+ AssistId::refactor_extract("extract_function"),
"Extract into function",
target_range,
move |builder| {
diff --git a/crates/ide-assists/src/handlers/extract_module.rs b/crates/ide-assists/src/handlers/extract_module.rs
index 8a7bb5a..a77b5e4 100644
--- a/crates/ide-assists/src/handlers/extract_module.rs
+++ b/crates/ide-assists/src/handlers/extract_module.rs
@@ -5,7 +5,7 @@
use ide_db::base_db::salsa::AsDynDatabase;
use ide_db::{
FileId, FxHashMap, FxHashSet,
- assists::{AssistId, AssistKind},
+ assists::AssistId,
defs::{Definition, NameClass, NameRefClass},
search::{FileReference, SearchScope},
};
@@ -92,7 +92,7 @@
let old_item_indent = module.body_items[0].indent_level();
acc.add(
- AssistId("extract_module", AssistKind::RefactorExtract),
+ AssistId::refactor_extract("extract_module"),
"Extract Module",
module.text_range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs
index 7fba75f..72fdae2 100644
--- a/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -22,7 +22,7 @@
match_ast, ted,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, assist_context::SourceChangeBuilder};
+use crate::{AssistContext, AssistId, Assists, assist_context::SourceChangeBuilder};
// Assist: extract_struct_from_enum_variant
//
@@ -55,7 +55,7 @@
let enum_hir = ctx.sema.to_def(&enum_ast)?;
let target = variant.syntax().text_range();
acc.add(
- AssistId("extract_struct_from_enum_variant", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("extract_struct_from_enum_variant"),
"Extract struct from enum variant",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/extract_type_alias.rs b/crates/ide-assists/src/handlers/extract_type_alias.rs
index e6fb4d4..c1c9a82 100644
--- a/crates/ide-assists/src/handlers/extract_type_alias.rs
+++ b/crates/ide-assists/src/handlers/extract_type_alias.rs
@@ -5,7 +5,7 @@
syntax_editor,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: extract_type_alias
//
@@ -40,7 +40,7 @@
let target = ty.syntax().text_range();
acc.add(
- AssistId("extract_type_alias", AssistKind::RefactorExtract),
+ AssistId::refactor_extract("extract_type_alias"),
"Extract type as type alias",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/extract_variable.rs b/crates/ide-assists/src/handlers/extract_variable.rs
index 2e58e62..95ea8b3 100644
--- a/crates/ide-assists/src/handlers/extract_variable.rs
+++ b/crates/ide-assists/src/handlers/extract_variable.rs
@@ -13,7 +13,7 @@
syntax_editor::Position,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, utils::is_body_const};
+use crate::{AssistContext, AssistId, Assists, utils::is_body_const};
// Assist: extract_variable
//
@@ -311,7 +311,7 @@
ExtractionKind::Static => "extract_static",
};
- AssistId(s, AssistKind::RefactorExtract)
+ AssistId::refactor_extract(s)
}
fn label(&self) -> &'static str {
diff --git a/crates/ide-assists/src/handlers/fix_visibility.rs b/crates/ide-assists/src/handlers/fix_visibility.rs
index 51dbce2..6373699 100644
--- a/crates/ide-assists/src/handlers/fix_visibility.rs
+++ b/crates/ide-assists/src/handlers/fix_visibility.rs
@@ -7,7 +7,7 @@
ast::{self, HasVisibility as _, edit_in_place::HasVisibilityEdit, make},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// FIXME: this really should be a fix for diagnostic, rather than an assist.
@@ -78,7 +78,7 @@
}
};
- acc.add(AssistId("fix_visibility", AssistKind::QuickFix), assist_label, target, |edit| {
+ acc.add(AssistId::quick_fix("fix_visibility"), assist_label, target, |edit| {
edit.edit_file(target_file);
let vis_owner = edit.make_mut(vis_owner);
@@ -131,7 +131,7 @@
target_name.display(ctx.db(), current_edition)
);
- acc.add(AssistId("fix_visibility", AssistKind::QuickFix), assist_label, target, |edit| {
+ acc.add(AssistId::quick_fix("fix_visibility"), assist_label, target, |edit| {
edit.edit_file(target_file.file_id());
let vis_owner = edit.make_mut(vis_owner);
diff --git a/crates/ide-assists/src/handlers/flip_binexpr.rs b/crates/ide-assists/src/handlers/flip_binexpr.rs
index 75133c3..94d7b73 100644
--- a/crates/ide-assists/src/handlers/flip_binexpr.rs
+++ b/crates/ide-assists/src/handlers/flip_binexpr.rs
@@ -3,7 +3,7 @@
ast::{self, AstNode, BinExpr, syntax_factory::SyntaxFactory},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: flip_binexpr
//
@@ -43,7 +43,7 @@
}
acc.add(
- AssistId("flip_binexpr", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("flip_binexpr"),
"Flip binary expression",
op_token.text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/flip_comma.rs b/crates/ide-assists/src/handlers/flip_comma.rs
index 6900e94..25e514b 100644
--- a/crates/ide-assists/src/handlers/flip_comma.rs
+++ b/crates/ide-assists/src/handlers/flip_comma.rs
@@ -5,7 +5,7 @@
syntax_editor::SyntaxMapping,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: flip_comma
//
@@ -40,7 +40,7 @@
}
let target = comma.text_range();
- acc.add(AssistId("flip_comma", AssistKind::RefactorRewrite), "Flip comma", target, |builder| {
+ acc.add(AssistId::refactor_rewrite("flip_comma"), "Flip comma", target, |builder| {
let parent = comma.parent().unwrap();
let mut editor = builder.make_editor(&parent);
diff --git a/crates/ide-assists/src/handlers/flip_or_pattern.rs b/crates/ide-assists/src/handlers/flip_or_pattern.rs
index 6ef8aa6..c84d23f 100644
--- a/crates/ide-assists/src/handlers/flip_or_pattern.rs
+++ b/crates/ide-assists/src/handlers/flip_or_pattern.rs
@@ -4,7 +4,7 @@
ast::{self, AstNode},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: flip_or_pattern
//
@@ -31,17 +31,12 @@
let after = non_trivia_sibling(pipe.clone().into(), Direction::Next)?.into_node()?;
let target = pipe.text_range();
- acc.add(
- AssistId("flip_or_pattern", AssistKind::RefactorRewrite),
- "Flip patterns",
- target,
- |builder| {
- let mut editor = builder.make_editor(parent.syntax());
- editor.replace(before.clone(), after.clone());
- editor.replace(after, before);
- builder.add_file_edits(ctx.file_id(), editor);
- },
- )
+ acc.add(AssistId::refactor_rewrite("flip_or_pattern"), "Flip patterns", target, |builder| {
+ let mut editor = builder.make_editor(parent.syntax());
+ editor.replace(before.clone(), after.clone());
+ editor.replace(after, before);
+ builder.add_file_edits(ctx.file_id(), editor);
+ })
}
#[cfg(test)]
diff --git a/crates/ide-assists/src/handlers/flip_trait_bound.rs b/crates/ide-assists/src/handlers/flip_trait_bound.rs
index af40b09..2f3b047 100644
--- a/crates/ide-assists/src/handlers/flip_trait_bound.rs
+++ b/crates/ide-assists/src/handlers/flip_trait_bound.rs
@@ -4,7 +4,7 @@
ast::{self, AstNode},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: flip_trait_bound
//
@@ -29,7 +29,7 @@
let target = plus.text_range();
acc.add(
- AssistId("flip_trait_bound", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("flip_trait_bound"),
"Flip trait bounds",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/generate_constant.rs b/crates/ide-assists/src/handlers/generate_constant.rs
index 2f4b6a0..dbf3b6d 100644
--- a/crates/ide-assists/src/handlers/generate_constant.rs
+++ b/crates/ide-assists/src/handlers/generate_constant.rs
@@ -2,7 +2,7 @@
use hir::{HasVisibility, HirDisplay, HirFileIdExt, Module};
use ide_db::{
FileId,
- assists::{AssistId, AssistKind},
+ assists::AssistId,
base_db::Upcast,
defs::{Definition, NameRefClass},
};
@@ -88,17 +88,12 @@
);
let text = get_text_for_generate_constant(not_exist_name_ref, indent, outer_exists, type_name)?;
- acc.add(
- AssistId("generate_constant", AssistKind::QuickFix),
- "Generate constant",
- target,
- |builder| {
- if let Some(file_id) = file_id {
- builder.edit_file(file_id);
- }
- builder.insert(offset, format!("{text}{post_string}"));
- },
- )
+ acc.add(AssistId::quick_fix("generate_constant"), "Generate constant", target, |builder| {
+ if let Some(file_id) = file_id {
+ builder.edit_file(file_id);
+ }
+ builder.insert(offset, format!("{text}{post_string}"));
+ })
}
fn get_text_for_generate_constant(
diff --git a/crates/ide-assists/src/handlers/generate_default_from_enum_variant.rs b/crates/ide-assists/src/handlers/generate_default_from_enum_variant.rs
index c6725a0..6198dbc 100644
--- a/crates/ide-assists/src/handlers/generate_default_from_enum_variant.rs
+++ b/crates/ide-assists/src/handlers/generate_default_from_enum_variant.rs
@@ -1,7 +1,7 @@
use ide_db::{RootDatabase, famous_defs::FamousDefs};
use syntax::ast::{self, AstNode, HasName};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: generate_default_from_enum_variant
//
@@ -47,7 +47,7 @@
let target = variant.syntax().text_range();
acc.add(
- AssistId("generate_default_from_enum_variant", AssistKind::Generate),
+ AssistId::generate("generate_default_from_enum_variant"),
"Generate `Default` impl from this enum variant",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/generate_default_from_new.rs b/crates/ide-assists/src/handlers/generate_default_from_new.rs
index 1a4349c..79a78ab 100644
--- a/crates/ide-assists/src/handlers/generate_default_from_new.rs
+++ b/crates/ide-assists/src/handlers/generate_default_from_new.rs
@@ -65,7 +65,7 @@
let insert_location = impl_.syntax().text_range();
acc.add(
- AssistId("generate_default_from_new", crate::AssistKind::Generate),
+ AssistId::generate("generate_default_from_new"),
"Generate a Default impl from a new fn",
insert_location,
move |builder| {
diff --git a/crates/ide-assists/src/handlers/generate_delegate_methods.rs b/crates/ide-assists/src/handlers/generate_delegate_methods.rs
index 750f160..4794bf5 100644
--- a/crates/ide-assists/src/handlers/generate_delegate_methods.rs
+++ b/crates/ide-assists/src/handlers/generate_delegate_methods.rs
@@ -92,19 +92,18 @@
});
}
methods.sort_by(|(a, _), (b, _)| a.cmp(b));
- for (name, method) in methods {
+ for (index, (name, method)) in methods.into_iter().enumerate() {
let adt = ast::Adt::Struct(strukt.clone());
let name = name.display(ctx.db(), current_edition).to_string();
// if `find_struct_impl` returns None, that means that a function named `name` already exists.
let Some(impl_def) = find_struct_impl(ctx, &adt, std::slice::from_ref(&name)) else {
continue;
};
-
let field = make::ext::field_from_idents(["self", &field_name])?;
acc.add_group(
&GroupLabel("Generate delegate methods…".to_owned()),
- AssistId("generate_delegate_methods", AssistKind::Generate),
+ AssistId("generate_delegate_methods", AssistKind::Generate, Some(index)),
format!("Generate delegate for `{field_name}.{name}()`",),
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/generate_delegate_trait.rs b/crates/ide-assists/src/handlers/generate_delegate_trait.rs
index 5c39214..53a06ba 100644
--- a/crates/ide-assists/src/handlers/generate_delegate_trait.rs
+++ b/crates/ide-assists/src/handlers/generate_delegate_trait.rs
@@ -201,7 +201,7 @@
pub(crate) fn delegate(&self, field: Field, acc: &mut Assists, ctx: &AssistContext<'_>) {
let db = ctx.db();
- for delegee in &field.impls {
+ for (index, delegee) in field.impls.iter().enumerate() {
let trait_ = match delegee {
Delegee::Bound(b) => b,
Delegee::Impls(i, _) => i,
@@ -229,7 +229,11 @@
acc.add_group(
&GroupLabel(format!("Generate delegate trait impls for field `{}`", field.name)),
- AssistId("generate_delegate_trait", ide_db::assists::AssistKind::Generate),
+ AssistId(
+ "generate_delegate_trait",
+ ide_db::assists::AssistKind::Generate,
+ Some(index),
+ ),
format!("Generate delegate trait impl `{}` for `{}`", signature, field.name),
field.range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/generate_deref.rs b/crates/ide-assists/src/handlers/generate_deref.rs
index 7bf2997..c7b97dc 100644
--- a/crates/ide-assists/src/handlers/generate_deref.rs
+++ b/crates/ide-assists/src/handlers/generate_deref.rs
@@ -8,7 +8,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists, SourceChangeBuilder},
utils::generate_trait_impl_text,
};
@@ -65,7 +65,7 @@
let field_name = field.name()?;
let target = field.syntax().text_range();
acc.add(
- AssistId("generate_deref", AssistKind::Generate),
+ AssistId::generate("generate_deref"),
format!("Generate `{deref_type_to_generate:?}` impl using `{field_name}`"),
target,
|edit| {
@@ -106,7 +106,7 @@
let field_type = field.ty()?;
let target = field.syntax().text_range();
acc.add(
- AssistId("generate_deref", AssistKind::Generate),
+ AssistId::generate("generate_deref"),
format!("Generate `{deref_type_to_generate:?}` impl using `{field}`"),
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/generate_derive.rs b/crates/ide-assists/src/handlers/generate_derive.rs
index 8b4dbef..73a69c8 100644
--- a/crates/ide-assists/src/handlers/generate_derive.rs
+++ b/crates/ide-assists/src/handlers/generate_derive.rs
@@ -3,7 +3,7 @@
ast::{self, AstNode, HasAttrs, edit_in_place::AttrsOwnerEdit, make},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: generate_derive
//
@@ -39,7 +39,7 @@
Some(tt) => Some(tt.right_delimiter_token()?),
};
- acc.add(AssistId("generate_derive", AssistKind::Generate), "Add `#[derive]`", target, |edit| {
+ acc.add(AssistId::generate("generate_derive"), "Add `#[derive]`", target, |edit| {
match derive_attr {
None => {
let derive = make::attr_outer(make::meta_token_tree(
diff --git a/crates/ide-assists/src/handlers/generate_documentation_template.rs b/crates/ide-assists/src/handlers/generate_documentation_template.rs
index df05c0d..d4d1b34 100644
--- a/crates/ide-assists/src/handlers/generate_documentation_template.rs
+++ b/crates/ide-assists/src/handlers/generate_documentation_template.rs
@@ -1,5 +1,5 @@
use hir::{AsAssocItem, HasVisibility, ModuleDef, Visibility};
-use ide_db::assists::{AssistId, AssistKind};
+use ide_db::assists::AssistId;
use itertools::Itertools;
use stdx::{format_to, to_lower_snake_case};
use syntax::{
@@ -56,7 +56,7 @@
let indent_level = IndentLevel::from_node(parent_syntax);
acc.add(
- AssistId("generate_documentation_template", AssistKind::Generate),
+ AssistId::generate("generate_documentation_template"),
"Generate a documentation template",
text_range,
|builder| {
@@ -115,7 +115,7 @@
let indent_level = IndentLevel::from_node(&node);
acc.add(
- AssistId("generate_doc_example", AssistKind::Generate),
+ AssistId::generate("generate_doc_example"),
"Generate a documentation example",
node.text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/generate_enum_is_method.rs b/crates/ide-assists/src/handlers/generate_enum_is_method.rs
index 78fdca9..3e6d0be 100644
--- a/crates/ide-assists/src/handlers/generate_enum_is_method.rs
+++ b/crates/ide-assists/src/handlers/generate_enum_is_method.rs
@@ -4,7 +4,7 @@
use syntax::ast::{self, AstNode, HasName};
use crate::{
- AssistContext, AssistId, AssistKind, Assists,
+ AssistContext, AssistId, Assists,
utils::{add_method_to_adt, find_struct_impl},
};
@@ -57,7 +57,7 @@
let target = variant.syntax().text_range();
acc.add_group(
&GroupLabel("Generate an `is_`,`as_`, or `try_into_` for this enum variant".to_owned()),
- AssistId("generate_enum_is_method", AssistKind::Generate),
+ AssistId::generate("generate_enum_is_method"),
"Generate an `is_` method for this enum variant",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/generate_enum_projection_method.rs b/crates/ide-assists/src/handlers/generate_enum_projection_method.rs
index e96be67..3974bcf 100644
--- a/crates/ide-assists/src/handlers/generate_enum_projection_method.rs
+++ b/crates/ide-assists/src/handlers/generate_enum_projection_method.rs
@@ -5,7 +5,7 @@
use syntax::ast::{self, AstNode, HasName};
use crate::{
- AssistContext, AssistId, AssistKind, Assists,
+ AssistContext, AssistId, Assists,
utils::{add_method_to_adt, find_struct_impl},
};
@@ -153,7 +153,7 @@
let target = variant.syntax().text_range();
acc.add_group(
&GroupLabel("Generate an `is_`,`as_`, or `try_into_` for this enum variant".to_owned()),
- AssistId(assist_id, AssistKind::Generate),
+ AssistId::generate(assist_id),
assist_description,
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/generate_enum_variant.rs b/crates/ide-assists/src/handlers/generate_enum_variant.rs
index 51b6a4b..8a20a2d 100644
--- a/crates/ide-assists/src/handlers/generate_enum_variant.rs
+++ b/crates/ide-assists/src/handlers/generate_enum_variant.rs
@@ -1,5 +1,5 @@
use hir::{HasSource, HirDisplay, InRealFile};
-use ide_db::assists::{AssistId, AssistKind};
+use ide_db::assists::AssistId;
use syntax::{
AstNode, SyntaxNode,
ast::{self, HasArgList, syntax_factory::SyntaxFactory},
@@ -58,21 +58,16 @@
let db = ctx.db();
let InRealFile { file_id, value: enum_node } = e.source(db)?.original_ast_node_rooted(db)?;
- acc.add(
- AssistId("generate_enum_variant", AssistKind::Generate),
- "Generate variant",
- target,
- |builder| {
- let mut editor = builder.make_editor(enum_node.syntax());
- let make = SyntaxFactory::new();
- let field_list = parent.make_field_list(ctx, &make);
- let variant = make.variant(None, make.name(&name_ref.text()), field_list, None);
- if let Some(it) = enum_node.variant_list() {
- it.add_variant(&mut editor, &variant);
- }
- builder.add_file_edits(file_id, editor);
- },
- )
+ acc.add(AssistId::generate("generate_enum_variant"), "Generate variant", target, |builder| {
+ let mut editor = builder.make_editor(enum_node.syntax());
+ let make = SyntaxFactory::new();
+ let field_list = parent.make_field_list(ctx, &make);
+ let variant = make.variant(None, make.name(&name_ref.text()), field_list, None);
+ if let Some(it) = enum_node.variant_list() {
+ it.add_variant(&mut editor, &variant);
+ }
+ builder.add_file_edits(file_id, editor);
+ })
}
#[derive(Debug)]
diff --git a/crates/ide-assists/src/handlers/generate_fn_type_alias.rs b/crates/ide-assists/src/handlers/generate_fn_type_alias.rs
index bc890ac..7ece5f8 100644
--- a/crates/ide-assists/src/handlers/generate_fn_type_alias.rs
+++ b/crates/ide-assists/src/handlers/generate_fn_type_alias.rs
@@ -1,5 +1,5 @@
use either::Either;
-use ide_db::assists::{AssistId, AssistKind, GroupLabel};
+use ide_db::assists::{AssistId, GroupLabel};
use syntax::{
AstNode,
ast::{self, HasGenericParams, HasName, edit::IndentLevel, make},
@@ -139,7 +139,7 @@
ParamStyle::Unnamed => "generate_fn_type_alias_unnamed",
};
- AssistId(s, AssistKind::Generate)
+ AssistId::generate(s)
}
fn label(&self) -> &'static str {
diff --git a/crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs b/crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs
index 8822682..af949a0 100644
--- a/crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs
+++ b/crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs
@@ -1,9 +1,7 @@
use ide_db::{RootDatabase, famous_defs::FamousDefs};
use syntax::ast::{self, AstNode, HasName};
-use crate::{
- AssistContext, AssistId, AssistKind, Assists, utils::generate_trait_impl_text_intransitive,
-};
+use crate::{AssistContext, AssistId, Assists, utils::generate_trait_impl_text_intransitive};
// Assist: generate_from_impl_for_enum
//
@@ -53,7 +51,7 @@
let target = variant.syntax().text_range();
acc.add(
- AssistId("generate_from_impl_for_enum", AssistKind::Generate),
+ AssistId::generate("generate_from_impl_for_enum"),
"Generate `From` impl for this enum variant",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/generate_function.rs b/crates/ide-assists/src/handlers/generate_function.rs
index a74d477..55187c3 100644
--- a/crates/ide-assists/src/handlers/generate_function.rs
+++ b/crates/ide-assists/src/handlers/generate_function.rs
@@ -23,7 +23,7 @@
};
use crate::{
- AssistContext, AssistId, AssistKind, Assists,
+ AssistContext, AssistId, Assists,
utils::{convert_reference_type, find_struct_impl},
};
@@ -173,7 +173,7 @@
adt_info: Option<AdtInfo>,
label: String,
) -> Option<()> {
- acc.add(AssistId("generate_function", AssistKind::Generate), label, text_range, |edit| {
+ acc.add(AssistId::generate("generate_function"), label, text_range, |edit| {
edit.edit_file(file);
let target = function_builder.target.clone();
diff --git a/crates/ide-assists/src/handlers/generate_getter_or_setter.rs b/crates/ide-assists/src/handlers/generate_getter_or_setter.rs
index 8183a11..c7e5e41 100644
--- a/crates/ide-assists/src/handlers/generate_getter_or_setter.rs
+++ b/crates/ide-assists/src/handlers/generate_getter_or_setter.rs
@@ -7,7 +7,7 @@
};
use crate::{
- AssistContext, AssistId, AssistKind, Assists, GroupLabel,
+ AssistContext, AssistId, Assists, GroupLabel,
utils::{convert_reference_type, find_struct_impl, generate_impl},
};
@@ -63,7 +63,7 @@
acc.add_group(
&GroupLabel("Generate getter/setter".to_owned()),
- AssistId("generate_setter", AssistKind::Generate),
+ AssistId::generate("generate_setter"),
"Generate a setter method",
target,
|builder| build_source_change(builder, ctx, info_of_record_fields, setter_info),
@@ -204,7 +204,7 @@
acc.add_group(
&GroupLabel("Generate getter/setter".to_owned()),
- AssistId(id, AssistKind::Generate),
+ AssistId::generate(id),
label,
target,
|builder| build_source_change(builder, ctx, info_of_record_fields, getter_info),
diff --git a/crates/ide-assists/src/handlers/generate_impl.rs b/crates/ide-assists/src/handlers/generate_impl.rs
index ff4f388..2862e6d 100644
--- a/crates/ide-assists/src/handlers/generate_impl.rs
+++ b/crates/ide-assists/src/handlers/generate_impl.rs
@@ -3,7 +3,7 @@
ted,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, utils};
+use crate::{AssistContext, AssistId, Assists, utils};
fn insert_impl(impl_: ast::Impl, nominal: &ast::Adt) {
let indent = nominal.indent_level();
@@ -44,7 +44,7 @@
}
acc.add(
- AssistId("generate_impl", AssistKind::Generate),
+ AssistId::generate("generate_impl"),
format!("Generate impl for `{name}`"),
target,
|edit| {
@@ -90,7 +90,7 @@
}
acc.add(
- AssistId("generate_trait_impl", AssistKind::Generate),
+ AssistId::generate("generate_trait_impl"),
format!("Generate trait impl for `{name}`"),
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/generate_is_empty_from_len.rs b/crates/ide-assists/src/handlers/generate_is_empty_from_len.rs
index d9ed811..f86c717 100644
--- a/crates/ide-assists/src/handlers/generate_is_empty_from_len.rs
+++ b/crates/ide-assists/src/handlers/generate_is_empty_from_len.rs
@@ -5,7 +5,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -69,7 +69,7 @@
let range = node.syntax().value.text_range();
acc.add(
- AssistId("generate_is_empty_from_len", AssistKind::Generate),
+ AssistId::generate("generate_is_empty_from_len"),
"Generate a is_empty impl from a len function",
range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/generate_mut_trait_impl.rs b/crates/ide-assists/src/handlers/generate_mut_trait_impl.rs
index 8d107e4..2ac960e 100644
--- a/crates/ide-assists/src/handlers/generate_mut_trait_impl.rs
+++ b/crates/ide-assists/src/handlers/generate_mut_trait_impl.rs
@@ -5,7 +5,7 @@
ted,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// FIXME: Generate proper `index_mut` method body refer to `index` method body may impossible due to the unpredictable case [#15581].
// Here just leave the `index_mut` method body be same as `index` method body, user can modify it manually to meet their need.
@@ -102,7 +102,7 @@
let target = impl_def.syntax().text_range();
acc.add(
- AssistId("generate_mut_trait_impl", AssistKind::Generate),
+ AssistId::generate("generate_mut_trait_impl"),
"Generate `IndexMut` impl from this `Index` trait",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/generate_new.rs b/crates/ide-assists/src/handlers/generate_new.rs
index f14a4c1..f963f48 100644
--- a/crates/ide-assists/src/handlers/generate_new.rs
+++ b/crates/ide-assists/src/handlers/generate_new.rs
@@ -7,7 +7,7 @@
};
use crate::{
- AssistContext, AssistId, AssistKind, Assists,
+ AssistContext, AssistId, Assists,
utils::{find_struct_impl, generate_impl},
};
@@ -48,7 +48,7 @@
let current_module = ctx.sema.scope(strukt.syntax())?.module();
let target = strukt.syntax().text_range();
- acc.add(AssistId("generate_new", AssistKind::Generate), "Generate `new`", target, |builder| {
+ acc.add(AssistId::generate("generate_new"), "Generate `new`", target, |builder| {
let trivial_constructors = field_list
.fields()
.map(|f| {
diff --git a/crates/ide-assists/src/handlers/generate_trait_from_impl.rs b/crates/ide-assists/src/handlers/generate_trait_from_impl.rs
index 3470a4d..154b502 100644
--- a/crates/ide-assists/src/handlers/generate_trait_from_impl.rs
+++ b/crates/ide-assists/src/handlers/generate_trait_from_impl.rs
@@ -95,7 +95,7 @@
let impl_name = impl_ast.self_ty()?;
acc.add(
- AssistId("generate_trait_from_impl", ide_db::assists::AssistKind::Generate),
+ AssistId::generate("generate_trait_from_impl"),
"Generate trait from impl",
impl_ast.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/inline_call.rs b/crates/ide-assists/src/handlers/inline_call.rs
index b8381a8..bb445e5 100644
--- a/crates/ide-assists/src/handlers/inline_call.rs
+++ b/crates/ide-assists/src/handlers/inline_call.rs
@@ -27,7 +27,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -98,7 +98,7 @@
}
acc.add(
- AssistId("inline_into_callers", AssistKind::RefactorInline),
+ AssistId::refactor_inline("inline_into_callers"),
"Inline into all callers",
name.syntax().text_range(),
|builder| {
@@ -232,21 +232,16 @@
}
let syntax = call_info.node.syntax().clone();
- acc.add(
- AssistId("inline_call", AssistKind::RefactorInline),
- label,
- syntax.text_range(),
- |builder| {
- let replacement = inline(&ctx.sema, file_id, function, &fn_body, ¶ms, &call_info);
- builder.replace_ast(
- match call_info.node {
- ast::CallableExpr::Call(it) => ast::Expr::CallExpr(it),
- ast::CallableExpr::MethodCall(it) => ast::Expr::MethodCallExpr(it),
- },
- replacement,
- );
- },
- )
+ acc.add(AssistId::refactor_inline("inline_call"), label, syntax.text_range(), |builder| {
+ let replacement = inline(&ctx.sema, file_id, function, &fn_body, ¶ms, &call_info);
+ builder.replace_ast(
+ match call_info.node {
+ ast::CallableExpr::Call(it) => ast::Expr::CallExpr(it),
+ ast::CallableExpr::MethodCall(it) => ast::Expr::MethodCallExpr(it),
+ },
+ replacement,
+ );
+ })
}
struct CallInfo {
diff --git a/crates/ide-assists/src/handlers/inline_const_as_literal.rs b/crates/ide-assists/src/handlers/inline_const_as_literal.rs
index 10f9652..e5ed04f 100644
--- a/crates/ide-assists/src/handlers/inline_const_as_literal.rs
+++ b/crates/ide-assists/src/handlers/inline_const_as_literal.rs
@@ -1,7 +1,7 @@
use hir::HasCrate;
use syntax::{AstNode, ast};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: inline_const_as_literal
//
@@ -44,7 +44,7 @@
.ok()?
.render(ctx.sema.db, konst.krate(ctx.sema.db).to_display_target(ctx.sema.db));
- let id = AssistId("inline_const_as_literal", AssistKind::RefactorInline);
+ let id = AssistId::refactor_inline("inline_const_as_literal");
let label = "Inline const as literal".to_owned();
let target = variable.syntax().text_range();
diff --git a/crates/ide-assists/src/handlers/inline_local_variable.rs b/crates/ide-assists/src/handlers/inline_local_variable.rs
index 8b7aa8f..f1a3f72 100644
--- a/crates/ide-assists/src/handlers/inline_local_variable.rs
+++ b/crates/ide-assists/src/handlers/inline_local_variable.rs
@@ -10,7 +10,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -74,7 +74,7 @@
};
acc.add(
- AssistId("inline_local_variable", AssistKind::RefactorInline),
+ AssistId::refactor_inline("inline_local_variable"),
"Inline variable",
target.text_range(),
move |builder| {
diff --git a/crates/ide-assists/src/handlers/inline_macro.rs b/crates/ide-assists/src/handlers/inline_macro.rs
index cd6f900..37d9b34 100644
--- a/crates/ide-assists/src/handlers/inline_macro.rs
+++ b/crates/ide-assists/src/handlers/inline_macro.rs
@@ -2,7 +2,7 @@
use ide_db::syntax_helpers::prettify_macro_expansion;
use syntax::ast::{self, AstNode};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: inline_macro
//
@@ -42,7 +42,7 @@
let text_range = unexpanded.syntax().text_range();
acc.add(
- AssistId("inline_macro", AssistKind::RefactorInline),
+ AssistId::refactor_inline("inline_macro"),
"Inline macro".to_owned(),
text_range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/inline_type_alias.rs b/crates/ide-assists/src/handlers/inline_type_alias.rs
index 936b09d..6a132e1 100644
--- a/crates/ide-assists/src/handlers/inline_type_alias.rs
+++ b/crates/ide-assists/src/handlers/inline_type_alias.rs
@@ -16,7 +16,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -60,7 +60,7 @@
// until this is ok
acc.add(
- AssistId("inline_type_alias_uses", AssistKind::RefactorInline),
+ AssistId::refactor_inline("inline_type_alias_uses"),
"Inline type alias into all uses",
name.syntax().text_range(),
|builder| {
@@ -149,7 +149,7 @@
let target = alias_instance.syntax().text_range();
acc.add(
- AssistId("inline_type_alias", AssistKind::RefactorInline),
+ AssistId::refactor_inline("inline_type_alias"),
"Inline type alias",
target,
|builder| builder.replace(target, replacement.to_text(&concrete_type)),
diff --git a/crates/ide-assists/src/handlers/into_to_qualified_from.rs b/crates/ide-assists/src/handlers/into_to_qualified_from.rs
index c8ec3da..47b2735 100644
--- a/crates/ide-assists/src/handlers/into_to_qualified_from.rs
+++ b/crates/ide-assists/src/handlers/into_to_qualified_from.rs
@@ -1,8 +1,5 @@
use hir::{AsAssocItem, HirDisplay};
-use ide_db::{
- assists::{AssistId, AssistKind},
- famous_defs::FamousDefs,
-};
+use ide_db::{assists::AssistId, famous_defs::FamousDefs};
use syntax::{AstNode, ast};
use crate::assist_context::{AssistContext, Assists};
@@ -60,7 +57,7 @@
let sc = adjusted_tc.display_source_code(db, scope.module().into(), true).ok()?;
acc.add(
- AssistId("into_to_qualified_from", AssistKind::Generate),
+ AssistId::generate("into_to_qualified_from"),
"Convert `into` to fully qualified `from`",
nameref.syntax().text_range(),
|edit| {
diff --git a/crates/ide-assists/src/handlers/introduce_named_lifetime.rs b/crates/ide-assists/src/handlers/introduce_named_lifetime.rs
index 587e765..264e376 100644
--- a/crates/ide-assists/src/handlers/introduce_named_lifetime.rs
+++ b/crates/ide-assists/src/handlers/introduce_named_lifetime.rs
@@ -5,7 +5,7 @@
ted::{self, Position},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, assist_context::SourceChangeBuilder};
+use crate::{AssistContext, AssistId, Assists, assist_context::SourceChangeBuilder};
static ASSIST_NAME: &str = "introduce_named_lifetime";
static ASSIST_LABEL: &str = "Introduce named lifetime";
@@ -83,7 +83,7 @@
_ => return None,
}
};
- acc.add(AssistId(ASSIST_NAME, AssistKind::Refactor), ASSIST_LABEL, lifetime_loc, |builder| {
+ acc.add(AssistId::refactor(ASSIST_NAME), ASSIST_LABEL, lifetime_loc, |builder| {
let fn_def = builder.make_mut(fn_def);
let lifetime = builder.make_mut(lifetime);
let loc_needing_lifetime =
@@ -107,7 +107,7 @@
lifetime: ast::Lifetime,
) -> Option<()> {
let new_lifetime_param = generate_unique_lifetime_param_name(impl_def.generic_param_list())?;
- acc.add(AssistId(ASSIST_NAME, AssistKind::Refactor), ASSIST_LABEL, lifetime_loc, |builder| {
+ acc.add(AssistId::refactor(ASSIST_NAME), ASSIST_LABEL, lifetime_loc, |builder| {
let impl_def = builder.make_mut(impl_def);
let lifetime = builder.make_mut(lifetime);
diff --git a/crates/ide-assists/src/handlers/introduce_named_type_parameter.rs b/crates/ide-assists/src/handlers/introduce_named_type_parameter.rs
index d60106c..9c39a7a 100644
--- a/crates/ide-assists/src/handlers/introduce_named_type_parameter.rs
+++ b/crates/ide-assists/src/handlers/introduce_named_type_parameter.rs
@@ -2,7 +2,7 @@
use itertools::Itertools;
use syntax::ast::{self, AstNode, HasGenericParams, HasName, syntax_factory::SyntaxFactory};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: introduce_named_type_parameter
//
@@ -27,7 +27,7 @@
let make = SyntaxFactory::new();
let target = fn_.syntax().text_range();
acc.add(
- AssistId("introduce_named_type_parameter", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("introduce_named_type_parameter"),
"Replace impl trait with type parameter",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/invert_if.rs b/crates/ide-assists/src/handlers/invert_if.rs
index 4273a85..d198870 100644
--- a/crates/ide-assists/src/handlers/invert_if.rs
+++ b/crates/ide-assists/src/handlers/invert_if.rs
@@ -5,7 +5,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
utils::invert_boolean_expression_legacy,
};
@@ -47,7 +47,7 @@
ast::ElseBranch::IfExpr(_) => return None,
};
- acc.add(AssistId("invert_if", AssistKind::RefactorRewrite), "Invert if", if_range, |edit| {
+ acc.add(AssistId::refactor_rewrite("invert_if"), "Invert if", if_range, |edit| {
let flip_cond = invert_boolean_expression_legacy(cond.clone());
edit.replace_ast(cond, flip_cond);
diff --git a/crates/ide-assists/src/handlers/merge_imports.rs b/crates/ide-assists/src/handlers/merge_imports.rs
index aae0075..b7f7cb9 100644
--- a/crates/ide-assists/src/handlers/merge_imports.rs
+++ b/crates/ide-assists/src/handlers/merge_imports.rs
@@ -12,7 +12,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
utils::next_prev,
};
@@ -69,55 +69,50 @@
(selection_range, edits?)
};
- acc.add(
- AssistId("merge_imports", AssistKind::RefactorRewrite),
- "Merge imports",
- target,
- |builder| {
- let edits_mut: Vec<Edit> = edits
- .into_iter()
- .map(|it| match it {
- Remove(Either::Left(it)) => Remove(Either::Left(builder.make_mut(it))),
- Remove(Either::Right(it)) => Remove(Either::Right(builder.make_mut(it))),
- Replace(old, new) => Replace(builder.make_syntax_mut(old), new),
- })
- .collect();
- for edit in edits_mut {
- match edit {
- Remove(it) => it.as_ref().either(Removable::remove, Removable::remove),
- Replace(old, new) => {
- ted::replace(old, &new);
+ acc.add(AssistId::refactor_rewrite("merge_imports"), "Merge imports", target, |builder| {
+ let edits_mut: Vec<Edit> = edits
+ .into_iter()
+ .map(|it| match it {
+ Remove(Either::Left(it)) => Remove(Either::Left(builder.make_mut(it))),
+ Remove(Either::Right(it)) => Remove(Either::Right(builder.make_mut(it))),
+ Replace(old, new) => Replace(builder.make_syntax_mut(old), new),
+ })
+ .collect();
+ for edit in edits_mut {
+ match edit {
+ Remove(it) => it.as_ref().either(Removable::remove, Removable::remove),
+ Replace(old, new) => {
+ ted::replace(old, &new);
- // If there's a selection and we're replacing a use tree in a tree list,
- // normalize the parent use tree if it only contains the merged subtree.
- if !ctx.has_empty_selection() {
- let normalized_use_tree = ast::UseTree::cast(new)
- .as_ref()
- .and_then(ast::UseTree::parent_use_tree_list)
- .and_then(|use_tree_list| {
- if use_tree_list.use_trees().collect_tuple::<(_,)>().is_some() {
- Some(use_tree_list.parent_use_tree())
- } else {
- None
- }
- })
- .and_then(|target_tree| {
- try_normalize_use_tree(
- &target_tree,
- ctx.config.insert_use.granularity.into(),
- )
- .map(|top_use_tree_flat| (target_tree, top_use_tree_flat))
- });
- if let Some((old_tree, new_tree)) = normalized_use_tree {
- cov_mark::hit!(replace_parent_with_normalized_use_tree);
- ted::replace(old_tree.syntax(), new_tree.syntax());
- }
+ // If there's a selection and we're replacing a use tree in a tree list,
+ // normalize the parent use tree if it only contains the merged subtree.
+ if !ctx.has_empty_selection() {
+ let normalized_use_tree = ast::UseTree::cast(new)
+ .as_ref()
+ .and_then(ast::UseTree::parent_use_tree_list)
+ .and_then(|use_tree_list| {
+ if use_tree_list.use_trees().collect_tuple::<(_,)>().is_some() {
+ Some(use_tree_list.parent_use_tree())
+ } else {
+ None
+ }
+ })
+ .and_then(|target_tree| {
+ try_normalize_use_tree(
+ &target_tree,
+ ctx.config.insert_use.granularity.into(),
+ )
+ .map(|top_use_tree_flat| (target_tree, top_use_tree_flat))
+ });
+ if let Some((old_tree, new_tree)) = normalized_use_tree {
+ cov_mark::hit!(replace_parent_with_normalized_use_tree);
+ ted::replace(old_tree.syntax(), new_tree.syntax());
}
}
}
}
- },
- )
+ }
+ })
}
trait Merge: AstNode + Clone {
diff --git a/crates/ide-assists/src/handlers/merge_match_arms.rs b/crates/ide-assists/src/handlers/merge_match_arms.rs
index be73377..42f3521 100644
--- a/crates/ide-assists/src/handlers/merge_match_arms.rs
+++ b/crates/ide-assists/src/handlers/merge_match_arms.rs
@@ -7,7 +7,7 @@
ast::{self, AstNode, HasName},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, TextRange};
+use crate::{AssistContext, AssistId, Assists, TextRange};
// Assist: merge_match_arms
//
@@ -73,7 +73,7 @@
}
acc.add(
- AssistId("merge_match_arms", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("merge_match_arms"),
"Merge match arms",
current_text_range,
|edit| {
diff --git a/crates/ide-assists/src/handlers/merge_nested_if.rs b/crates/ide-assists/src/handlers/merge_nested_if.rs
index 89bd62a..73cb820 100644
--- a/crates/ide-assists/src/handlers/merge_nested_if.rs
+++ b/crates/ide-assists/src/handlers/merge_nested_if.rs
@@ -5,7 +5,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
// Assist: merge_nested_if
@@ -69,29 +69,24 @@
let nested_if_then_branch = nested_if_to_merge.then_branch()?;
let then_branch_range = then_branch.syntax().text_range();
- acc.add(
- AssistId("merge_nested_if", AssistKind::RefactorRewrite),
- "Merge nested if",
- if_range,
- |edit| {
- let cond_text = if has_logic_op_or(&cond) {
- format!("({})", cond.syntax().text())
- } else {
- cond.syntax().text().to_string()
- };
+ acc.add(AssistId::refactor_rewrite("merge_nested_if"), "Merge nested if", if_range, |edit| {
+ let cond_text = if has_logic_op_or(&cond) {
+ format!("({})", cond.syntax().text())
+ } else {
+ cond.syntax().text().to_string()
+ };
- let nested_if_cond_text = if has_logic_op_or(&nested_if_cond) {
- format!("({})", nested_if_cond.syntax().text())
- } else {
- nested_if_cond.syntax().text().to_string()
- };
+ let nested_if_cond_text = if has_logic_op_or(&nested_if_cond) {
+ format!("({})", nested_if_cond.syntax().text())
+ } else {
+ nested_if_cond.syntax().text().to_string()
+ };
- let replace_cond = format!("{cond_text} && {nested_if_cond_text}");
+ let replace_cond = format!("{cond_text} && {nested_if_cond_text}");
- edit.replace(cond_range, replace_cond);
- edit.replace(then_branch_range, nested_if_then_branch.syntax().text());
- },
- )
+ edit.replace(cond_range, replace_cond);
+ edit.replace(then_branch_range, nested_if_then_branch.syntax().text());
+ })
}
/// Returns whether the given if condition has logical operators.
diff --git a/crates/ide-assists/src/handlers/move_bounds.rs b/crates/ide-assists/src/handlers/move_bounds.rs
index 35571ed..7e8735b 100644
--- a/crates/ide-assists/src/handlers/move_bounds.rs
+++ b/crates/ide-assists/src/handlers/move_bounds.rs
@@ -7,7 +7,7 @@
match_ast,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: move_bounds_to_where_clause
//
@@ -42,7 +42,7 @@
let target = type_param_list.syntax().text_range();
acc.add(
- AssistId("move_bounds_to_where_clause", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("move_bounds_to_where_clause"),
"Move to where clause",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/move_const_to_impl.rs b/crates/ide-assists/src/handlers/move_const_to_impl.rs
index 71b1461..5c9318f 100644
--- a/crates/ide-assists/src/handlers/move_const_to_impl.rs
+++ b/crates/ide-assists/src/handlers/move_const_to_impl.rs
@@ -83,7 +83,7 @@
}
acc.add(
- AssistId("move_const_to_impl", crate::AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("move_const_to_impl"),
"Move const to impl block",
const_.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/move_from_mod_rs.rs b/crates/ide-assists/src/handlers/move_from_mod_rs.rs
index 0d6fc49..00469f0 100644
--- a/crates/ide-assists/src/handlers/move_from_mod_rs.rs
+++ b/crates/ide-assists/src/handlers/move_from_mod_rs.rs
@@ -1,7 +1,4 @@
-use ide_db::{
- assists::{AssistId, AssistKind},
- base_db::AnchoredPathBuf,
-};
+use ide_db::{assists::AssistId, base_db::AnchoredPathBuf};
use syntax::{AstNode, ToSmolStr, ast};
use crate::{
@@ -43,7 +40,7 @@
let path = format!("../{module_name}.rs");
let dst = AnchoredPathBuf { anchor: ctx.file_id().into(), path };
acc.add(
- AssistId("move_from_mod_rs", AssistKind::Refactor),
+ AssistId::refactor("move_from_mod_rs"),
format!("Convert {module_name}/mod.rs to {module_name}.rs"),
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/move_guard.rs b/crates/ide-assists/src/handlers/move_guard.rs
index abba3de..644d1f6 100644
--- a/crates/ide-assists/src/handlers/move_guard.rs
+++ b/crates/ide-assists/src/handlers/move_guard.rs
@@ -3,7 +3,7 @@
ast::{AstNode, BlockExpr, ElseBranch, Expr, IfExpr, MatchArm, Pat, edit::AstNodeEdit, make},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: move_guard_to_arm_body
//
@@ -49,7 +49,7 @@
let target = guard.syntax().text_range();
acc.add(
- AssistId("move_guard_to_arm_body", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("move_guard_to_arm_body"),
"Move guard to arm body",
target,
|edit| {
@@ -118,7 +118,7 @@
let (conds_blocks, tail) = parse_if_chain(if_expr)?;
acc.add(
- AssistId("move_arm_cond_to_match_guard", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("move_arm_cond_to_match_guard"),
"Move condition to match guard",
replace_node.text_range(),
|edit| {
diff --git a/crates/ide-assists/src/handlers/move_module_to_file.rs b/crates/ide-assists/src/handlers/move_module_to_file.rs
index 5f54759..cfca89f 100644
--- a/crates/ide-assists/src/handlers/move_module_to_file.rs
+++ b/crates/ide-assists/src/handlers/move_module_to_file.rs
@@ -10,7 +10,7 @@
ast::{self, HasName, edit::AstNodeEdit},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: move_module_to_file
//
@@ -45,7 +45,7 @@
let parent_module = module_def.parent(ctx.db())?;
acc.add(
- AssistId("move_module_to_file", AssistKind::RefactorExtract),
+ AssistId::refactor_extract("move_module_to_file"),
"Extract module to file",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/move_to_mod_rs.rs b/crates/ide-assists/src/handlers/move_to_mod_rs.rs
index a19c122..ffa3894 100644
--- a/crates/ide-assists/src/handlers/move_to_mod_rs.rs
+++ b/crates/ide-assists/src/handlers/move_to_mod_rs.rs
@@ -1,7 +1,4 @@
-use ide_db::{
- assists::{AssistId, AssistKind},
- base_db::AnchoredPathBuf,
-};
+use ide_db::{assists::AssistId, base_db::AnchoredPathBuf};
use syntax::{AstNode, ToSmolStr, ast};
use crate::{
@@ -43,7 +40,7 @@
let path = format!("./{module_name}/mod.rs");
let dst = AnchoredPathBuf { anchor: ctx.file_id().into(), path };
acc.add(
- AssistId("move_to_mod_rs", AssistKind::Refactor),
+ AssistId::refactor("move_to_mod_rs"),
format!("Convert {module_name}.rs to {module_name}/mod.rs"),
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/normalize_import.rs b/crates/ide-assists/src/handlers/normalize_import.rs
index 813c2dd..bba28b5 100644
--- a/crates/ide-assists/src/handlers/normalize_import.rs
+++ b/crates/ide-assists/src/handlers/normalize_import.rs
@@ -2,7 +2,7 @@
use syntax::{AstNode, ast};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -28,14 +28,9 @@
let normalized_use_item =
try_normalize_import(&use_item, ctx.config.insert_use.granularity.into())?;
- acc.add(
- AssistId("normalize_import", AssistKind::RefactorRewrite),
- "Normalize import",
- target,
- |builder| {
- builder.replace_ast(use_item, normalized_use_item);
- },
- )
+ acc.add(AssistId::refactor_rewrite("normalize_import"), "Normalize import", target, |builder| {
+ builder.replace_ast(use_item, normalized_use_item);
+ })
}
#[cfg(test)]
diff --git a/crates/ide-assists/src/handlers/number_representation.rs b/crates/ide-assists/src/handlers/number_representation.rs
index 9b81aec..1fe40f8 100644
--- a/crates/ide-assists/src/handlers/number_representation.rs
+++ b/crates/ide-assists/src/handlers/number_representation.rs
@@ -1,6 +1,6 @@
use syntax::{AstToken, ast, ast::Radix};
-use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel};
+use crate::{AssistContext, AssistId, Assists, GroupLabel};
const MIN_NUMBER_OF_DIGITS_TO_FORMAT: usize = 5;
@@ -42,7 +42,7 @@
let range = literal.syntax().text_range();
acc.add_group(
&group_id,
- AssistId("reformat_number_literal", AssistKind::RefactorInline),
+ AssistId::refactor_inline("reformat_number_literal"),
label,
range,
|builder| builder.replace(range, converted),
@@ -54,7 +54,7 @@
let range = literal.syntax().text_range();
acc.add_group(
&group_id,
- AssistId("reformat_number_literal", AssistKind::RefactorInline),
+ AssistId::refactor_inline("reformat_number_literal"),
"Remove digit separators",
range,
|builder| builder.replace(range, literal.text().replace('_', "")),
diff --git a/crates/ide-assists/src/handlers/promote_local_to_const.rs b/crates/ide-assists/src/handlers/promote_local_to_const.rs
index 04a19d7..6316a8f 100644
--- a/crates/ide-assists/src/handlers/promote_local_to_const.rs
+++ b/crates/ide-assists/src/handlers/promote_local_to_const.rs
@@ -1,8 +1,5 @@
use hir::HirDisplay;
-use ide_db::{
- assists::{AssistId, AssistKind},
- defs::Definition,
-};
+use ide_db::{assists::AssistId, defs::Definition};
use stdx::to_upper_snake_case;
use syntax::{
AstNode,
@@ -68,7 +65,7 @@
}
acc.add(
- AssistId("promote_local_to_const", AssistKind::Refactor),
+ AssistId::refactor("promote_local_to_const"),
"Promote local to constant",
let_stmt.syntax().text_range(),
|edit| {
diff --git a/crates/ide-assists/src/handlers/pull_assignment_up.rs b/crates/ide-assists/src/handlers/pull_assignment_up.rs
index d9e71ec..5f626d2 100644
--- a/crates/ide-assists/src/handlers/pull_assignment_up.rs
+++ b/crates/ide-assists/src/handlers/pull_assignment_up.rs
@@ -5,7 +5,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -68,7 +68,7 @@
}
acc.add(
- AssistId("pull_assignment_up", AssistKind::RefactorExtract),
+ AssistId::refactor_extract("pull_assignment_up"),
"Pull assignment up",
tgt.syntax().text_range(),
move |edit| {
diff --git a/crates/ide-assists/src/handlers/qualify_method_call.rs b/crates/ide-assists/src/handlers/qualify_method_call.rs
index d8ade0e..9851217 100644
--- a/crates/ide-assists/src/handlers/qualify_method_call.rs
+++ b/crates/ide-assists/src/handlers/qualify_method_call.rs
@@ -1,5 +1,5 @@
use hir::{AsAssocItem, AssocItem, AssocItemContainer, ItemInNs, ModuleDef, db::HirDatabase};
-use ide_db::assists::{AssistId, AssistKind};
+use ide_db::assists::AssistId;
use syntax::{AstNode, ast};
use crate::{
@@ -54,7 +54,7 @@
let qualify_candidate = QualifyCandidate::ImplMethod(ctx.sema.db, call, resolved_call);
acc.add(
- AssistId("qualify_method_call", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("qualify_method_call"),
format!("Qualify `{ident}` method call"),
range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/qualify_path.rs b/crates/ide-assists/src/handlers/qualify_path.rs
index a4f066a..4c213a2 100644
--- a/crates/ide-assists/src/handlers/qualify_path.rs
+++ b/crates/ide-assists/src/handlers/qualify_path.rs
@@ -15,7 +15,7 @@
};
use crate::{
- AssistId, AssistKind, GroupLabel,
+ AssistId, GroupLabel,
assist_context::{AssistContext, Assists},
handlers::auto_import::find_importable_node,
};
@@ -104,7 +104,7 @@
for import in proposed_imports {
acc.add_group(
&group_label,
- AssistId("qualify_path", AssistKind::QuickFix),
+ AssistId::quick_fix("qualify_path"),
label(ctx.db(), candidate, &import, current_edition),
range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/raw_string.rs b/crates/ide-assists/src/handlers/raw_string.rs
index 21c697f..ed86380 100644
--- a/crates/ide-assists/src/handlers/raw_string.rs
+++ b/crates/ide-assists/src/handlers/raw_string.rs
@@ -2,7 +2,7 @@
use syntax::{AstToken, TextRange, TextSize, ast, ast::IsString};
-use crate::{AssistContext, AssistId, AssistKind, Assists, utils::required_hashes};
+use crate::{AssistContext, AssistId, Assists, utils::required_hashes};
// Assist: make_raw_string
//
@@ -28,7 +28,7 @@
let value = token.value().ok()?;
let target = token.syntax().text_range();
acc.add(
- AssistId("make_raw_string", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("make_raw_string"),
"Rewrite as raw string",
target,
|edit| {
@@ -67,7 +67,7 @@
let value = token.value().ok()?;
let target = token.syntax().text_range();
acc.add(
- AssistId("make_usual_string", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("make_usual_string"),
"Rewrite as regular string",
target,
|edit| {
@@ -108,7 +108,7 @@
}
let text_range = token.syntax().text_range();
let target = text_range;
- acc.add(AssistId("add_hash", AssistKind::Refactor), "Add #", target, |edit| {
+ acc.add(AssistId::refactor("add_hash"), "Add #", target, |edit| {
edit.insert(text_range.start() + TextSize::of('r'), "#");
edit.insert(text_range.end(), "#");
})
@@ -150,7 +150,7 @@
return None;
}
- acc.add(AssistId("remove_hash", AssistKind::RefactorRewrite), "Remove #", text_range, |edit| {
+ acc.add(AssistId::refactor_rewrite("remove_hash"), "Remove #", text_range, |edit| {
edit.delete(TextRange::at(text_range.start() + TextSize::of('r'), TextSize::of('#')));
edit.delete(TextRange::new(text_range.end() - TextSize::of('#'), text_range.end()));
})
diff --git a/crates/ide-assists/src/handlers/remove_dbg.rs b/crates/ide-assists/src/handlers/remove_dbg.rs
index cbc2e4f..809ef6d 100644
--- a/crates/ide-assists/src/handlers/remove_dbg.rs
+++ b/crates/ide-assists/src/handlers/remove_dbg.rs
@@ -5,7 +5,7 @@
match_ast, ted,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: remove_dbg
//
@@ -42,7 +42,7 @@
macro_calls.into_iter().filter_map(compute_dbg_replacement).collect::<Vec<_>>();
acc.add(
- AssistId("remove_dbg", AssistKind::QuickFix),
+ AssistId::quick_fix("remove_dbg"),
"Remove dbg!()",
replacements.iter().map(|&(range, _)| range).reduce(|acc, range| acc.cover(range))?,
|builder| {
diff --git a/crates/ide-assists/src/handlers/remove_mut.rs b/crates/ide-assists/src/handlers/remove_mut.rs
index 43740a5..1b2a833 100644
--- a/crates/ide-assists/src/handlers/remove_mut.rs
+++ b/crates/ide-assists/src/handlers/remove_mut.rs
@@ -1,6 +1,6 @@
use syntax::{SyntaxKind, T};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: remove_mut
//
@@ -21,18 +21,13 @@
let mut_token = ctx.find_token_syntax_at_offset(T![mut])?;
let target = mut_token.text_range();
- acc.add(
- AssistId("remove_mut", AssistKind::Refactor),
- "Remove `mut` keyword",
- target,
- |builder| {
- let mut editor = builder.make_editor(&mut_token.parent().unwrap());
- match mut_token.next_token() {
- Some(it) if it.kind() == SyntaxKind::WHITESPACE => editor.delete(it),
- _ => (),
- }
- editor.delete(mut_token);
- builder.add_file_edits(ctx.file_id(), editor);
- },
- )
+ acc.add(AssistId::refactor("remove_mut"), "Remove `mut` keyword", target, |builder| {
+ let mut editor = builder.make_editor(&mut_token.parent().unwrap());
+ match mut_token.next_token() {
+ Some(it) if it.kind() == SyntaxKind::WHITESPACE => editor.delete(it),
+ _ => (),
+ }
+ editor.delete(mut_token);
+ builder.add_file_edits(ctx.file_id(), editor);
+ })
}
diff --git a/crates/ide-assists/src/handlers/remove_parentheses.rs b/crates/ide-assists/src/handlers/remove_parentheses.rs
index 9bd8dec..f5b3e00 100644
--- a/crates/ide-assists/src/handlers/remove_parentheses.rs
+++ b/crates/ide-assists/src/handlers/remove_parentheses.rs
@@ -4,7 +4,7 @@
syntax_editor::Position,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: remove_parentheses
//
@@ -40,7 +40,7 @@
let target = parens.syntax().text_range();
acc.add(
- AssistId("remove_parentheses", AssistKind::Refactor),
+ AssistId::refactor("remove_parentheses"),
"Remove redundant parentheses",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/remove_unused_imports.rs b/crates/ide-assists/src/handlers/remove_unused_imports.rs
index 01c4eed..09697eb 100644
--- a/crates/ide-assists/src/handlers/remove_unused_imports.rs
+++ b/crates/ide-assists/src/handlers/remove_unused_imports.rs
@@ -12,7 +12,7 @@
ast::{self, Rename},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: remove_unused_imports
//
@@ -126,7 +126,7 @@
// Peek so we terminate early if an unused use is found. Only do the rest of the work if the user selects the assist.
if unused.peek().is_some() {
acc.add(
- AssistId("remove_unused_imports", AssistKind::QuickFix),
+ AssistId::quick_fix("remove_unused_imports"),
"Remove all the unused imports",
selected_el.text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/remove_unused_param.rs b/crates/ide-assists/src/handlers/remove_unused_param.rs
index 6ebc900..5ed1efe 100644
--- a/crates/ide-assists/src/handlers/remove_unused_param.rs
+++ b/crates/ide-assists/src/handlers/remove_unused_param.rs
@@ -11,8 +11,7 @@
use SyntaxKind::WHITESPACE;
use crate::{
- AssistContext, AssistId, AssistKind, Assists, assist_context::SourceChangeBuilder,
- utils::next_prev,
+ AssistContext, AssistId, Assists, assist_context::SourceChangeBuilder, utils::next_prev,
};
// Assist: remove_unused_param
@@ -79,7 +78,7 @@
}
let parent = param.syntax().parent()?;
acc.add(
- AssistId("remove_unused_param", AssistKind::Refactor),
+ AssistId::refactor("remove_unused_param"),
"Remove unused parameter",
param.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/reorder_fields.rs b/crates/ide-assists/src/handlers/reorder_fields.rs
index 410e2bb..1951d00 100644
--- a/crates/ide-assists/src/handlers/reorder_fields.rs
+++ b/crates/ide-assists/src/handlers/reorder_fields.rs
@@ -3,7 +3,7 @@
use itertools::Itertools;
use syntax::{AstNode, SmolStr, SyntaxElement, ToSmolStr, ast, syntax_editor::SyntaxEditor};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: reorder_fields
//
@@ -67,7 +67,7 @@
}
let target = record.as_ref().either(AstNode::syntax, AstNode::syntax).text_range();
acc.add(
- AssistId("reorder_fields", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("reorder_fields"),
"Reorder record fields",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/reorder_impl_items.rs b/crates/ide-assists/src/handlers/reorder_impl_items.rs
index e254fb9..1222ba9 100644
--- a/crates/ide-assists/src/handlers/reorder_impl_items.rs
+++ b/crates/ide-assists/src/handlers/reorder_impl_items.rs
@@ -6,7 +6,7 @@
ast::{self, HasName},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: reorder_impl_items
//
@@ -95,7 +95,7 @@
let target = items.syntax().text_range();
acc.add(
- AssistId("reorder_impl_items", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("reorder_impl_items"),
"Sort items by trait definition",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/replace_arith_op.rs b/crates/ide-assists/src/handlers/replace_arith_op.rs
index 39f350f..6b385a0 100644
--- a/crates/ide-assists/src/handlers/replace_arith_op.rs
+++ b/crates/ide-assists/src/handlers/replace_arith_op.rs
@@ -1,4 +1,4 @@
-use ide_db::assists::{AssistId, AssistKind, GroupLabel};
+use ide_db::assists::{AssistId, GroupLabel};
use syntax::{
AstNode, TextRange,
ast::{self, ArithOp, BinaryOp},
@@ -132,7 +132,7 @@
ArithKind::Wrapping => "replace_arith_with_wrapping",
};
- AssistId(s, AssistKind::RefactorRewrite)
+ AssistId::refactor_rewrite(s)
}
fn label(&self) -> &'static str {
diff --git a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
index c5faf6d..691ae93 100644
--- a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
+++ b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
@@ -9,7 +9,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists, SourceChangeBuilder},
utils::{
DefaultMethods, IgnoreAssocItems, add_trait_assoc_items_to_impl, filter_assoc_items,
@@ -125,101 +125,94 @@
let annotated_name = adt.name()?;
let label = format!("Convert to manual `impl {replace_trait_path} for {annotated_name}`");
- acc.add(
- AssistId("replace_derive_with_manual_impl", AssistKind::Refactor),
- label,
- target,
- |builder| {
- let insert_after = ted::Position::after(builder.make_mut(adt.clone()).syntax());
- let impl_is_unsafe = trait_.map(|s| s.is_unsafe(ctx.db())).unwrap_or(false);
- let impl_def_with_items =
- impl_def_from_trait(&ctx.sema, adt, &annotated_name, trait_, replace_trait_path);
- update_attribute(builder, old_derives, old_tree, old_trait_path, attr);
+ acc.add(AssistId::refactor("replace_derive_with_manual_impl"), label, target, |builder| {
+ let insert_after = ted::Position::after(builder.make_mut(adt.clone()).syntax());
+ let impl_is_unsafe = trait_.map(|s| s.is_unsafe(ctx.db())).unwrap_or(false);
+ let impl_def_with_items =
+ impl_def_from_trait(&ctx.sema, adt, &annotated_name, trait_, replace_trait_path);
+ update_attribute(builder, old_derives, old_tree, old_trait_path, attr);
- let trait_path = make::ty_path(replace_trait_path.clone());
+ let trait_path = make::ty_path(replace_trait_path.clone());
- match (ctx.config.snippet_cap, impl_def_with_items) {
- (None, None) => {
- let impl_def = generate_trait_impl(adt, trait_path);
- if impl_is_unsafe {
- ted::insert(
- Position::first_child_of(impl_def.syntax()),
- make::token(T![unsafe]),
- );
- }
-
- ted::insert_all(
- insert_after,
- vec![make::tokens::blank_line().into(), impl_def.syntax().clone().into()],
+ match (ctx.config.snippet_cap, impl_def_with_items) {
+ (None, None) => {
+ let impl_def = generate_trait_impl(adt, trait_path);
+ if impl_is_unsafe {
+ ted::insert(
+ Position::first_child_of(impl_def.syntax()),
+ make::token(T![unsafe]),
);
}
- (None, Some((impl_def, _))) => {
- if impl_is_unsafe {
- ted::insert(
- Position::first_child_of(impl_def.syntax()),
- make::token(T![unsafe]),
- );
- }
- ted::insert_all(
- insert_after,
- vec![make::tokens::blank_line().into(), impl_def.syntax().clone().into()],
+
+ ted::insert_all(
+ insert_after,
+ vec![make::tokens::blank_line().into(), impl_def.syntax().clone().into()],
+ );
+ }
+ (None, Some((impl_def, _))) => {
+ if impl_is_unsafe {
+ ted::insert(
+ Position::first_child_of(impl_def.syntax()),
+ make::token(T![unsafe]),
);
}
- (Some(cap), None) => {
- let impl_def = generate_trait_impl(adt, trait_path);
+ ted::insert_all(
+ insert_after,
+ vec![make::tokens::blank_line().into(), impl_def.syntax().clone().into()],
+ );
+ }
+ (Some(cap), None) => {
+ let impl_def = generate_trait_impl(adt, trait_path);
- if impl_is_unsafe {
- ted::insert(
- Position::first_child_of(impl_def.syntax()),
- make::token(T![unsafe]),
- );
- }
-
- if let Some(l_curly) =
- impl_def.assoc_item_list().and_then(|it| it.l_curly_token())
- {
- builder.add_tabstop_after_token(cap, l_curly);
- }
-
- ted::insert_all(
- insert_after,
- vec![make::tokens::blank_line().into(), impl_def.syntax().clone().into()],
+ if impl_is_unsafe {
+ ted::insert(
+ Position::first_child_of(impl_def.syntax()),
+ make::token(T![unsafe]),
);
}
- (Some(cap), Some((impl_def, first_assoc_item))) => {
- let mut added_snippet = false;
- if impl_is_unsafe {
- ted::insert(
- Position::first_child_of(impl_def.syntax()),
- make::token(T![unsafe]),
- );
- }
+ if let Some(l_curly) = impl_def.assoc_item_list().and_then(|it| it.l_curly_token())
+ {
+ builder.add_tabstop_after_token(cap, l_curly);
+ }
- if let ast::AssocItem::Fn(ref func) = first_assoc_item {
- if let Some(m) = func.syntax().descendants().find_map(ast::MacroCall::cast)
- {
- if m.syntax().text() == "todo!()" {
- // Make the `todo!()` a placeholder
- builder.add_placeholder_snippet(cap, m);
- added_snippet = true;
- }
+ ted::insert_all(
+ insert_after,
+ vec![make::tokens::blank_line().into(), impl_def.syntax().clone().into()],
+ );
+ }
+ (Some(cap), Some((impl_def, first_assoc_item))) => {
+ let mut added_snippet = false;
+
+ if impl_is_unsafe {
+ ted::insert(
+ Position::first_child_of(impl_def.syntax()),
+ make::token(T![unsafe]),
+ );
+ }
+
+ if let ast::AssocItem::Fn(ref func) = first_assoc_item {
+ if let Some(m) = func.syntax().descendants().find_map(ast::MacroCall::cast) {
+ if m.syntax().text() == "todo!()" {
+ // Make the `todo!()` a placeholder
+ builder.add_placeholder_snippet(cap, m);
+ added_snippet = true;
}
}
-
- if !added_snippet {
- // If we haven't already added a snippet, add a tabstop before the generated function
- builder.add_tabstop_before(cap, first_assoc_item);
- }
-
- ted::insert_all(
- insert_after,
- vec![make::tokens::blank_line().into(), impl_def.syntax().clone().into()],
- );
}
- };
- },
- )
+
+ if !added_snippet {
+ // If we haven't already added a snippet, add a tabstop before the generated function
+ builder.add_tabstop_before(cap, first_assoc_item);
+ }
+
+ ted::insert_all(
+ insert_after,
+ vec![make::tokens::blank_line().into(), impl_def.syntax().clone().into()],
+ );
+ }
+ };
+ })
}
fn impl_def_from_trait(
diff --git a/crates/ide-assists/src/handlers/replace_if_let_with_match.rs b/crates/ide-assists/src/handlers/replace_if_let_with_match.rs
index c3b7536..734bd17 100644
--- a/crates/ide-assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/ide-assists/src/handlers/replace_if_let_with_match.rs
@@ -13,7 +13,7 @@
};
use crate::{
- AssistContext, AssistId, AssistKind, Assists,
+ AssistContext, AssistId, Assists,
utils::{does_pat_match_variant, does_pat_variant_nested_or_literal, unwrap_trivial_block},
};
@@ -101,7 +101,7 @@
let let_ = if pat_seen { " let" } else { "" };
acc.add(
- AssistId("replace_if_let_with_match", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_if_let_with_match"),
format!("Replace if{let_} with match"),
available_range,
move |builder| {
@@ -249,7 +249,7 @@
_ => " let",
};
acc.add(
- AssistId("replace_match_with_if_let", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_match_with_if_let"),
format!("Replace match with if{let_}"),
match_expr.syntax().text_range(),
move |builder| {
diff --git a/crates/ide-assists/src/handlers/replace_is_method_with_if_let_method.rs b/crates/ide-assists/src/handlers/replace_is_method_with_if_let_method.rs
index c49f285..e933bcc 100644
--- a/crates/ide-assists/src/handlers/replace_is_method_with_if_let_method.rs
+++ b/crates/ide-assists/src/handlers/replace_is_method_with_if_let_method.rs
@@ -4,7 +4,7 @@
ted,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: replace_is_some_with_if_let_some
//
@@ -56,7 +56,7 @@
};
acc.add(
- AssistId(assist_id, AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite(assist_id),
message,
call_expr.syntax().text_range(),
|edit| {
diff --git a/crates/ide-assists/src/handlers/replace_let_with_if_let.rs b/crates/ide-assists/src/handlers/replace_let_with_if_let.rs
index 34bbd6b..a2dcbf9 100644
--- a/crates/ide-assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/ide-assists/src/handlers/replace_let_with_if_let.rs
@@ -4,7 +4,7 @@
ast::{self, edit::IndentLevel, edit_in_place::Indent, syntax_factory::SyntaxFactory},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: replace_let_with_if_let
//
@@ -38,7 +38,7 @@
let target = let_kw.text_range();
acc.add(
- AssistId("replace_let_with_if_let", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_let_with_if_let"),
"Replace let with if let",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/replace_method_eager_lazy.rs b/crates/ide-assists/src/handlers/replace_method_eager_lazy.rs
index 88b56eb..afac6cd 100644
--- a/crates/ide-assists/src/handlers/replace_method_eager_lazy.rs
+++ b/crates/ide-assists/src/handlers/replace_method_eager_lazy.rs
@@ -1,4 +1,4 @@
-use ide_db::assists::{AssistId, AssistKind};
+use ide_db::assists::AssistId;
use syntax::{
AstNode,
ast::{self, Expr, HasArgList, make},
@@ -60,7 +60,7 @@
)?;
acc.add(
- AssistId("replace_with_lazy_method", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_with_lazy_method"),
format!("Replace {method_name} with {method_name_lazy}"),
call.syntax().text_range(),
|builder| {
@@ -136,7 +136,7 @@
)?;
acc.add(
- AssistId("replace_with_eager_method", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_with_eager_method"),
format!("Replace {method_name} with {method_name_eager}"),
call.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/replace_named_generic_with_impl.rs b/crates/ide-assists/src/handlers/replace_named_generic_with_impl.rs
index f99394e..3cd7b58 100644
--- a/crates/ide-assists/src/handlers/replace_named_generic_with_impl.rs
+++ b/crates/ide-assists/src/handlers/replace_named_generic_with_impl.rs
@@ -14,7 +14,7 @@
match_ast, ted,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: replace_named_generic_with_impl
//
@@ -70,7 +70,7 @@
let target = type_param.syntax().text_range();
acc.add(
- AssistId("replace_named_generic_with_impl", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_named_generic_with_impl"),
"Replace named generic with impl trait",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs
index 08a4d28..c067747 100644
--- a/crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs
@@ -9,7 +9,7 @@
match_ast, ted,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: replace_qualified_name_with_use
//
@@ -75,7 +75,7 @@
let scope = ImportScope::find_insert_use_container(original_path.syntax(), &ctx.sema)?;
let target = original_path.syntax().text_range();
acc.add(
- AssistId("replace_qualified_name_with_use", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_qualified_name_with_use"),
"Replace qualified path with use",
target,
|builder| {
diff --git a/crates/ide-assists/src/handlers/replace_string_with_char.rs b/crates/ide-assists/src/handlers/replace_string_with_char.rs
index 176b4e4..0eab704 100644
--- a/crates/ide-assists/src/handlers/replace_string_with_char.rs
+++ b/crates/ide-assists/src/handlers/replace_string_with_char.rs
@@ -5,7 +5,7 @@
ast::IsString,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: replace_string_with_char
//
@@ -33,7 +33,7 @@
let quote_offsets = token.quote_offsets()?;
acc.add(
- AssistId("replace_string_with_char", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_string_with_char"),
"Replace string with char",
target,
|edit| {
@@ -67,7 +67,7 @@
let target = token.text_range();
acc.add(
- AssistId("replace_char_with_string", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_char_with_string"),
"Replace char with string",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/replace_try_expr_with_match.rs b/crates/ide-assists/src/handlers/replace_try_expr_with_match.rs
index 93dfe48..3fd59f3 100644
--- a/crates/ide-assists/src/handlers/replace_try_expr_with_match.rs
+++ b/crates/ide-assists/src/handlers/replace_try_expr_with_match.rs
@@ -1,9 +1,6 @@
use std::iter;
-use ide_db::{
- assists::{AssistId, AssistKind},
- ty_filter::TryEnum,
-};
+use ide_db::{assists::AssistId, ty_filter::TryEnum};
use syntax::{
AstNode, T,
ast::{
@@ -48,7 +45,7 @@
let target = qm_kw_parent.syntax().text_range();
acc.add(
- AssistId("replace_try_expr_with_match", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_try_expr_with_match"),
"Replace try expression with match",
target,
|edit| {
diff --git a/crates/ide-assists/src/handlers/replace_turbofish_with_explicit_type.rs b/crates/ide-assists/src/handlers/replace_turbofish_with_explicit_type.rs
index 39ebca2..311cbf6a 100644
--- a/crates/ide-assists/src/handlers/replace_turbofish_with_explicit_type.rs
+++ b/crates/ide-assists/src/handlers/replace_turbofish_with_explicit_type.rs
@@ -5,7 +5,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -74,7 +74,7 @@
let ident_range = let_stmt.pat()?.syntax().text_range();
return acc.add(
- AssistId("replace_turbofish_with_explicit_type", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_turbofish_with_explicit_type"),
"Replace turbofish with explicit type",
TextRange::new(initializer_start, turbofish_range.end()),
|builder| {
@@ -89,7 +89,7 @@
let underscore_range = t.syntax().text_range();
return acc.add(
- AssistId("replace_turbofish_with_explicit_type", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("replace_turbofish_with_explicit_type"),
"Replace `_` with turbofish type",
turbofish_range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/sort_items.rs b/crates/ide-assists/src/handlers/sort_items.rs
index 73dfbf0..e973e70 100644
--- a/crates/ide-assists/src/handlers/sort_items.rs
+++ b/crates/ide-assists/src/handlers/sort_items.rs
@@ -7,7 +7,7 @@
ast::{self, HasName},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, utils::get_methods};
+use crate::{AssistContext, AssistId, Assists, utils::get_methods};
// Assist: sort_items
//
@@ -126,20 +126,15 @@
new: Vec<T>,
target: &SyntaxNode,
) -> Option<()> {
- self.add(
- AssistId("sort_items", AssistKind::RefactorRewrite),
- label,
- target.text_range(),
- |builder| {
- let mut editor = builder.make_editor(target);
+ self.add(AssistId::refactor_rewrite("sort_items"), label, target.text_range(), |builder| {
+ let mut editor = builder.make_editor(target);
- old.into_iter()
- .zip(new)
- .for_each(|(old, new)| editor.replace(old.syntax(), new.syntax()));
+ old.into_iter()
+ .zip(new)
+ .for_each(|(old, new)| editor.replace(old.syntax(), new.syntax()));
- builder.add_file_edits(builder.file_id, editor)
- },
- )
+ builder.add_file_edits(builder.file_id, editor)
+ })
}
}
diff --git a/crates/ide-assists/src/handlers/split_import.rs b/crates/ide-assists/src/handlers/split_import.rs
index 63371dd..1729a06 100644
--- a/crates/ide-assists/src/handlers/split_import.rs
+++ b/crates/ide-assists/src/handlers/split_import.rs
@@ -1,6 +1,6 @@
use syntax::{AstNode, T, ast};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: split_import
//
@@ -29,7 +29,7 @@
}
let target = colon_colon.text_range();
- acc.add(AssistId("split_import", AssistKind::RefactorRewrite), "Split import", target, |edit| {
+ acc.add(AssistId::refactor_rewrite("split_import"), "Split import", target, |edit| {
let use_tree = edit.make_mut(use_tree.clone());
let path = edit.make_mut(path);
use_tree.split_prefix(&path);
diff --git a/crates/ide-assists/src/handlers/term_search.rs b/crates/ide-assists/src/handlers/term_search.rs
index 7b2598b..86121e7 100644
--- a/crates/ide-assists/src/handlers/term_search.rs
+++ b/crates/ide-assists/src/handlers/term_search.rs
@@ -1,7 +1,7 @@
//! Term search assist
use hir::term_search::{TermSearchConfig, TermSearchCtx};
use ide_db::{
- assists::{AssistId, AssistKind, GroupLabel},
+ assists::{AssistId, GroupLabel},
famous_defs::FamousDefs,
};
@@ -68,7 +68,7 @@
for code in paths {
acc.add_group(
&GroupLabel(String::from("Term search")),
- AssistId("term_search", AssistKind::Generate),
+ AssistId::generate("term_search"),
format!("Replace {macro_name}!() with {code}"),
goal_range,
|builder| {
diff --git a/crates/ide-assists/src/handlers/toggle_async_sugar.rs b/crates/ide-assists/src/handlers/toggle_async_sugar.rs
index 9f45b28..eed070c 100644
--- a/crates/ide-assists/src/handlers/toggle_async_sugar.rs
+++ b/crates/ide-assists/src/handlers/toggle_async_sugar.rs
@@ -1,8 +1,5 @@
use hir::ModuleDef;
-use ide_db::{
- assists::{AssistId, AssistKind},
- famous_defs::FamousDefs,
-};
+use ide_db::{assists::AssistId, famous_defs::FamousDefs};
use syntax::{
AstNode, NodeOrToken, SyntaxKind, SyntaxNode, SyntaxToken, TextRange,
ast::{self, HasGenericArgs, HasVisibility},
@@ -60,7 +57,7 @@
let future_output = unwrap_future_output(main_trait_path)?;
acc.add(
- AssistId("sugar_impl_future_into_async", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("sugar_impl_future_into_async"),
"Convert `impl Future` into async",
function.syntax().text_range(),
|builder| {
@@ -145,7 +142,7 @@
let trait_path = trait_path.display(ctx.db(), edition);
acc.add(
- AssistId("desugar_async_into_impl_future", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("desugar_async_into_impl_future"),
"Convert async into `impl Future`",
function.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/toggle_ignore.rs b/crates/ide-assists/src/handlers/toggle_ignore.rs
index c1ea7dc4..7a29928 100644
--- a/crates/ide-assists/src/handlers/toggle_ignore.rs
+++ b/crates/ide-assists/src/handlers/toggle_ignore.rs
@@ -3,7 +3,7 @@
ast::{self, HasAttrs},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists, utils::test_related_attribute_syn};
+use crate::{AssistContext, AssistId, Assists, utils::test_related_attribute_syn};
// Assist: toggle_ignore
//
@@ -30,13 +30,13 @@
match has_ignore_attribute(&func) {
None => acc.add(
- AssistId("toggle_ignore", AssistKind::None),
+ AssistId::none("toggle_ignore"),
"Ignore this test",
attr.syntax().text_range(),
|builder| builder.insert(attr.syntax().text_range().end(), "\n#[ignore]"),
),
Some(ignore_attr) => acc.add(
- AssistId("toggle_ignore", AssistKind::None),
+ AssistId::none("toggle_ignore"),
"Re-enable this test",
ignore_attr.syntax().text_range(),
|builder| {
diff --git a/crates/ide-assists/src/handlers/toggle_macro_delimiter.rs b/crates/ide-assists/src/handlers/toggle_macro_delimiter.rs
index 80834ab..109269b 100644
--- a/crates/ide-assists/src/handlers/toggle_macro_delimiter.rs
+++ b/crates/ide-assists/src/handlers/toggle_macro_delimiter.rs
@@ -1,4 +1,4 @@
-use ide_db::assists::{AssistId, AssistKind};
+use ide_db::assists::AssistId;
use syntax::{
AstNode, T,
ast::{self, make},
@@ -63,7 +63,7 @@
};
acc.add(
- AssistId("toggle_macro_delimiter", AssistKind::Refactor),
+ AssistId::refactor("toggle_macro_delimiter"),
match token {
MacroDelims::LPar | MacroDelims::RPar => "Replace delimiters with braces",
MacroDelims::LBra | MacroDelims::RBra => "Replace delimiters with parentheses",
diff --git a/crates/ide-assists/src/handlers/unmerge_match_arm.rs b/crates/ide-assists/src/handlers/unmerge_match_arm.rs
index 8b6aef0..31ff47a 100644
--- a/crates/ide-assists/src/handlers/unmerge_match_arm.rs
+++ b/crates/ide-assists/src/handlers/unmerge_match_arm.rs
@@ -5,7 +5,7 @@
ted::{self, Position},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: unmerge_match_arm
//
@@ -47,7 +47,7 @@
let old_parent_range = new_parent.text_range();
acc.add(
- AssistId("unmerge_match_arm", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("unmerge_match_arm"),
"Unmerge match arm",
pipe_token.text_range(),
|edit| {
diff --git a/crates/ide-assists/src/handlers/unmerge_use.rs b/crates/ide-assists/src/handlers/unmerge_use.rs
index 7f2dd19..805a734 100644
--- a/crates/ide-assists/src/handlers/unmerge_use.rs
+++ b/crates/ide-assists/src/handlers/unmerge_use.rs
@@ -5,7 +5,7 @@
};
use crate::{
- AssistId, AssistKind,
+ AssistId,
assist_context::{AssistContext, Assists},
};
@@ -43,7 +43,7 @@
};
let target = tree.syntax().text_range();
- acc.add(AssistId("unmerge_use", AssistKind::RefactorRewrite), label, target, |builder| {
+ acc.add(AssistId::refactor_rewrite("unmerge_use"), label, target, |builder| {
let new_use = make::use_(
use_.visibility(),
make::use_tree(path, tree.use_tree_list(), tree.rename(), tree.star_token().is_some()),
diff --git a/crates/ide-assists/src/handlers/unnecessary_async.rs b/crates/ide-assists/src/handlers/unnecessary_async.rs
index f3ae701..ac10a82 100644
--- a/crates/ide-assists/src/handlers/unnecessary_async.rs
+++ b/crates/ide-assists/src/handlers/unnecessary_async.rs
@@ -1,6 +1,6 @@
use ide_db::{
EditionedFileId,
- assists::{AssistId, AssistKind},
+ assists::AssistId,
defs::Definition,
search::{FileReference, FileReferenceNode},
syntax_helpers::node_ext::full_path_of_name_ref,
@@ -60,7 +60,7 @@
// Otherwise, we may remove the `async` keyword.
acc.add(
- AssistId("unnecessary_async", AssistKind::QuickFix),
+ AssistId::quick_fix("unnecessary_async"),
"Remove unnecessary async",
async_range,
|edit| {
diff --git a/crates/ide-assists/src/handlers/unqualify_method_call.rs b/crates/ide-assists/src/handlers/unqualify_method_call.rs
index 712c8c3..ebb8ef9 100644
--- a/crates/ide-assists/src/handlers/unqualify_method_call.rs
+++ b/crates/ide-assists/src/handlers/unqualify_method_call.rs
@@ -4,7 +4,7 @@
ast::{self, AstNode, HasArgList, prec::ExprPrecedence},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: unqualify_method_call
//
@@ -69,7 +69,7 @@
);
acc.add(
- AssistId("unqualify_method_call", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("unqualify_method_call"),
"Unqualify method call",
call.syntax().text_range(),
|edit| {
diff --git a/crates/ide-assists/src/handlers/unwrap_block.rs b/crates/ide-assists/src/handlers/unwrap_block.rs
index 80d8ceb..a83f683 100644
--- a/crates/ide-assists/src/handlers/unwrap_block.rs
+++ b/crates/ide-assists/src/handlers/unwrap_block.rs
@@ -7,7 +7,7 @@
},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: unwrap_block
//
@@ -27,9 +27,8 @@
// }
// ```
pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
- let assist_id = AssistId("unwrap_block", AssistKind::RefactorRewrite);
+ let assist_id = AssistId::refactor_rewrite("unwrap_block");
let assist_label = "Unwrap block";
-
let l_curly_token = ctx.find_token_syntax_at_offset(T!['{'])?;
let mut block = ast::BlockExpr::cast(l_curly_token.parent_ancestors().nth(1)?)?;
let target = block.syntax().text_range();
diff --git a/crates/ide-assists/src/handlers/unwrap_return_type.rs b/crates/ide-assists/src/handlers/unwrap_return_type.rs
index f6eb685..8804fea 100644
--- a/crates/ide-assists/src/handlers/unwrap_return_type.rs
+++ b/crates/ide-assists/src/handlers/unwrap_return_type.rs
@@ -9,7 +9,7 @@
match_ast,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: unwrap_option_return_type
//
@@ -187,7 +187,7 @@
UnwrapperKind::Result => "unwrap_result_return_type",
};
- AssistId(s, AssistKind::RefactorRewrite)
+ AssistId::refactor_rewrite(s)
}
fn label(&self) -> &'static str {
diff --git a/crates/ide-assists/src/handlers/unwrap_tuple.rs b/crates/ide-assists/src/handlers/unwrap_tuple.rs
index 55053ac..ecfecbb 100644
--- a/crates/ide-assists/src/handlers/unwrap_tuple.rs
+++ b/crates/ide-assists/src/handlers/unwrap_tuple.rs
@@ -3,7 +3,7 @@
ast::{self, edit::AstNodeEdit},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: unwrap_tuple
//
@@ -56,7 +56,7 @@
let parent = let_kw.parent()?;
acc.add(
- AssistId("unwrap_tuple", AssistKind::RefactorRewrite),
+ AssistId::refactor_rewrite("unwrap_tuple"),
"Unwrap tuple",
let_kw.text_range(),
|edit| {
diff --git a/crates/ide-assists/src/handlers/wrap_return_type.rs b/crates/ide-assists/src/handlers/wrap_return_type.rs
index 8857c44..a044068 100644
--- a/crates/ide-assists/src/handlers/wrap_return_type.rs
+++ b/crates/ide-assists/src/handlers/wrap_return_type.rs
@@ -12,7 +12,7 @@
match_ast,
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: wrap_return_type_in_option
//
@@ -155,7 +155,7 @@
WrapperKind::Result => "wrap_return_type_in_result",
};
- AssistId(s, AssistKind::RefactorRewrite)
+ AssistId::refactor_rewrite(s)
}
fn label(&self) -> &'static str {
diff --git a/crates/ide-assists/src/handlers/wrap_unwrap_cfg_attr.rs b/crates/ide-assists/src/handlers/wrap_unwrap_cfg_attr.rs
index 717c68d..1068d5d 100644
--- a/crates/ide-assists/src/handlers/wrap_unwrap_cfg_attr.rs
+++ b/crates/ide-assists/src/handlers/wrap_unwrap_cfg_attr.rs
@@ -6,7 +6,7 @@
ted::{self, Position},
};
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{AssistContext, AssistId, Assists};
// Assist: wrap_unwrap_cfg_attr
//
@@ -210,7 +210,7 @@
};
acc.add(
- AssistId("wrap_unwrap_cfg_attr", AssistKind::Refactor),
+ AssistId::refactor("wrap_unwrap_cfg_attr"),
format!("Wrap #[derive({path_text})] in `cfg_attr`",),
range,
handle_source_change,
@@ -267,7 +267,7 @@
}
};
acc.add(
- AssistId("wrap_unwrap_cfg_attr", AssistKind::Refactor),
+ AssistId::refactor("wrap_unwrap_cfg_attr"),
"Convert to `cfg_attr`",
range,
handle_source_change,
@@ -336,7 +336,7 @@
f.replace(range, inner_attrs);
};
acc.add(
- AssistId("wrap_unwrap_cfg_attr", AssistKind::Refactor),
+ AssistId::refactor("wrap_unwrap_cfg_attr"),
"Extract Inner Attributes from `cfg_attr`",
range,
handle_source_change,
diff --git a/crates/ide-assists/src/tests.rs b/crates/ide-assists/src/tests.rs
index a23461e..13e0617 100644
--- a/crates/ide-assists/src/tests.rs
+++ b/crates/ide-assists/src/tests.rs
@@ -504,6 +504,7 @@
id: AssistId(
"extract_variable",
RefactorExtract,
+ None,
),
label: "Extract into variable",
group: Some(
@@ -524,6 +525,7 @@
id: AssistId(
"extract_constant",
RefactorExtract,
+ None,
),
label: "Extract into constant",
group: Some(
@@ -544,6 +546,7 @@
id: AssistId(
"extract_static",
RefactorExtract,
+ None,
),
label: "Extract into static",
group: Some(
@@ -564,6 +567,7 @@
id: AssistId(
"extract_function",
RefactorExtract,
+ None,
),
label: "Extract into function",
group: Some(
@@ -586,6 +590,7 @@
AssistResolveStrategy::Single(SingleResolve {
assist_id: "SOMETHING_MISMATCHING".to_owned(),
assist_kind: AssistKind::RefactorExtract,
+ assist_subtype: None,
}),
frange.into(),
);
@@ -598,6 +603,7 @@
id: AssistId(
"extract_variable",
RefactorExtract,
+ None,
),
label: "Extract into variable",
group: Some(
@@ -618,6 +624,7 @@
id: AssistId(
"extract_constant",
RefactorExtract,
+ None,
),
label: "Extract into constant",
group: Some(
@@ -638,6 +645,7 @@
id: AssistId(
"extract_static",
RefactorExtract,
+ None,
),
label: "Extract into static",
group: Some(
@@ -658,6 +666,7 @@
id: AssistId(
"extract_function",
RefactorExtract,
+ None,
),
label: "Extract into function",
group: Some(
@@ -680,6 +689,7 @@
AssistResolveStrategy::Single(SingleResolve {
assist_id: "extract_variable".to_owned(),
assist_kind: AssistKind::RefactorExtract,
+ assist_subtype: None,
}),
frange.into(),
);
@@ -692,6 +702,7 @@
id: AssistId(
"extract_variable",
RefactorExtract,
+ None,
),
label: "Extract into variable",
group: Some(
@@ -758,6 +769,7 @@
id: AssistId(
"extract_constant",
RefactorExtract,
+ None,
),
label: "Extract into constant",
group: Some(
@@ -778,6 +790,7 @@
id: AssistId(
"extract_static",
RefactorExtract,
+ None,
),
label: "Extract into static",
group: Some(
@@ -798,6 +811,7 @@
id: AssistId(
"extract_function",
RefactorExtract,
+ None,
),
label: "Extract into function",
group: Some(
@@ -824,6 +838,7 @@
id: AssistId(
"extract_variable",
RefactorExtract,
+ None,
),
label: "Extract into variable",
group: Some(
@@ -890,6 +905,7 @@
id: AssistId(
"extract_constant",
RefactorExtract,
+ None,
),
label: "Extract into constant",
group: Some(
@@ -960,6 +976,7 @@
id: AssistId(
"extract_static",
RefactorExtract,
+ None,
),
label: "Extract into static",
group: Some(
@@ -1030,6 +1047,7 @@
id: AssistId(
"extract_function",
RefactorExtract,
+ None,
),
label: "Extract into function",
group: Some(
diff --git a/crates/ide-db/src/assists.rs b/crates/ide-db/src/assists.rs
index 1c40685..9ff3e10 100644
--- a/crates/ide-db/src/assists.rs
+++ b/crates/ide-db/src/assists.rs
@@ -105,7 +105,37 @@
/// Unique identifier of the assist, should not be shown to the user
/// directly.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct AssistId(pub &'static str, pub AssistKind);
+pub struct AssistId(pub &'static str, pub AssistKind, pub Option<usize>);
+
+impl AssistId {
+ pub fn none(id: &'static str) -> AssistId {
+ AssistId(id, AssistKind::None, None)
+ }
+
+ pub fn quick_fix(id: &'static str) -> AssistId {
+ AssistId(id, AssistKind::QuickFix, None)
+ }
+
+ pub fn generate(id: &'static str) -> AssistId {
+ AssistId(id, AssistKind::Generate, None)
+ }
+
+ pub fn refactor(id: &'static str) -> AssistId {
+ AssistId(id, AssistKind::Refactor, None)
+ }
+
+ pub fn refactor_extract(id: &'static str) -> AssistId {
+ AssistId(id, AssistKind::RefactorExtract, None)
+ }
+
+ pub fn refactor_inline(id: &'static str) -> AssistId {
+ AssistId(id, AssistKind::RefactorInline, None)
+ }
+
+ pub fn refactor_rewrite(id: &'static str) -> AssistId {
+ AssistId(id, AssistKind::RefactorRewrite, None)
+ }
+}
/// A way to control how many assist to resolve during the assist resolution.
/// When an assist is resolved, its edits are calculated that might be costly to always do by default.
@@ -128,6 +158,8 @@
pub assist_id: String,
// The kind of the assist.
pub assist_kind: AssistKind,
+ /// Subtype of the assist. When many assists have the same id, it differentiates among them.
+ pub assist_subtype: Option<usize>,
}
impl AssistResolveStrategy {
@@ -136,7 +168,9 @@
AssistResolveStrategy::None => false,
AssistResolveStrategy::All => true,
AssistResolveStrategy::Single(single_resolve) => {
- single_resolve.assist_id == id.0 && single_resolve.assist_kind == id.1
+ single_resolve.assist_id == id.0
+ && single_resolve.assist_kind == id.1
+ && single_resolve.assist_subtype == id.2
}
}
}
diff --git a/crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs b/crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs
index 7923168..9f1901f 100644
--- a/crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs
+++ b/crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs
@@ -1,7 +1,7 @@
use hir::{HasSource, HirDisplay, db::ExpandDatabase};
use ide_db::text_edit::TextRange;
use ide_db::{
- assists::{Assist, AssistId, AssistKind},
+ assists::{Assist, AssistId},
label::Label,
source_change::SourceChangeBuilder,
};
@@ -97,7 +97,7 @@
add_assoc_item_def(&mut source_change_builder)?;
Some(vec![Assist {
- id: AssistId("add assoc item def into trait def", AssistKind::QuickFix),
+ id: AssistId::quick_fix("add assoc item def into trait def"),
label: Label::new("Add assoc item def into trait def".to_owned()),
group: None,
target: range,
diff --git a/crates/ide-diagnostics/src/handlers/typed_hole.rs b/crates/ide-diagnostics/src/handlers/typed_hole.rs
index e817929..0bef91f 100644
--- a/crates/ide-diagnostics/src/handlers/typed_hole.rs
+++ b/crates/ide-diagnostics/src/handlers/typed_hole.rs
@@ -5,7 +5,7 @@
};
use ide_db::text_edit::TextEdit;
use ide_db::{
- assists::{Assist, AssistId, AssistKind, GroupLabel},
+ assists::{Assist, AssistId, GroupLabel},
label::Label,
source_change::SourceChange,
};
@@ -78,7 +78,7 @@
})
.unique()
.map(|code| Assist {
- id: AssistId("typed-hole", AssistKind::QuickFix),
+ id: AssistId::quick_fix("typed-hole"),
label: Label::new(format!("Replace `_` with `{code}`")),
group: Some(GroupLabel("Replace `_` with a term".to_owned())),
target: original_range.range,
diff --git a/crates/ide-diagnostics/src/handlers/unresolved_field.rs b/crates/ide-diagnostics/src/handlers/unresolved_field.rs
index 7020fce..986ebb8 100644
--- a/crates/ide-diagnostics/src/handlers/unresolved_field.rs
+++ b/crates/ide-diagnostics/src/handlers/unresolved_field.rs
@@ -4,7 +4,7 @@
use hir::{Adt, FileRange, HasSource, HirDisplay, InFile, Struct, Union, db::ExpandDatabase};
use ide_db::text_edit::TextEdit;
use ide_db::{
- assists::{Assist, AssistId, AssistKind},
+ assists::{Assist, AssistId},
helpers::is_editable_crate,
label::Label,
source_change::{SourceChange, SourceChangeBuilder},
@@ -122,7 +122,7 @@
let mut src_change_builder = SourceChangeBuilder::new(range.file_id);
src_change_builder.insert(offset, record_field);
Some(Assist {
- id: AssistId("add-variant-to-union", AssistKind::QuickFix),
+ id: AssistId::quick_fix("add-variant-to-union"),
label: Label::new("Add field to union".to_owned()),
group: None,
target: error_range.range,
@@ -170,7 +170,7 @@
// FIXME: Allow for choosing a visibility modifier see https://github.com/rust-lang/rust-analyzer/issues/11563
src_change_builder.insert(offset, record_field);
Some(Assist {
- id: AssistId("add-field-to-record-struct", AssistKind::QuickFix),
+ id: AssistId::quick_fix("add-field-to-record-struct"),
label: Label::new("Add field to Record Struct".to_owned()),
group: None,
target: error_range.range,
@@ -206,7 +206,7 @@
src_change_builder.replace(semi_colon.text_range(), record_field_list.to_string());
Some(Assist {
- id: AssistId("convert-unit-struct-to-record-struct", AssistKind::QuickFix),
+ id: AssistId::quick_fix("convert-unit-struct-to-record-struct"),
label: Label::new("Convert Unit Struct to Record Struct and add field".to_owned()),
group: None,
target: error_range.range,
@@ -265,7 +265,7 @@
let expr = expr_ptr.value.to_node(&root);
let FileRange { range, file_id } = ctx.sema.original_range_opt(expr.syntax())?;
Some(Assist {
- id: AssistId("expected-field-found-method-call-fix", AssistKind::QuickFix),
+ id: AssistId::quick_fix("expected-field-found-method-call-fix"),
label: Label::new("Use parentheses to call the method".to_owned()),
group: None,
target: range,
diff --git a/crates/ide-diagnostics/src/handlers/unresolved_method.rs b/crates/ide-diagnostics/src/handlers/unresolved_method.rs
index e6e8621..b5d7aa1 100644
--- a/crates/ide-diagnostics/src/handlers/unresolved_method.rs
+++ b/crates/ide-diagnostics/src/handlers/unresolved_method.rs
@@ -1,7 +1,7 @@
use hir::{FileRange, HirDisplay, InFile, db::ExpandDatabase};
use ide_db::text_edit::TextEdit;
use ide_db::{
- assists::{Assist, AssistId, AssistKind},
+ assists::{Assist, AssistId},
label::Label,
source_change::SourceChange,
};
@@ -96,7 +96,7 @@
_ => return None,
};
Some(Assist {
- id: AssistId("expected-method-found-field-fix", AssistKind::QuickFix),
+ id: AssistId::quick_fix("expected-method-found-field-fix"),
label: Label::new("Use parentheses to call the value of the field".to_owned()),
group: None,
target: range,
@@ -175,7 +175,7 @@
let file_id = ctx.sema.original_range_opt(call.receiver()?.syntax())?.file_id;
Some(Assist {
- id: AssistId("method_call_to_assoc_func_call_fix", AssistKind::QuickFix),
+ id: AssistId::quick_fix("method_call_to_assoc_func_call_fix"),
label: Label::new(format!(
"Use associated func call instead: `{assoc_func_call_expr_string}`"
)),
diff --git a/crates/ide-diagnostics/src/handlers/unused_variables.rs b/crates/ide-diagnostics/src/handlers/unused_variables.rs
index c412536..5857b1d 100644
--- a/crates/ide-diagnostics/src/handlers/unused_variables.rs
+++ b/crates/ide-diagnostics/src/handlers/unused_variables.rs
@@ -2,7 +2,7 @@
use ide_db::text_edit::TextEdit;
use ide_db::{
FileRange, RootDatabase,
- assists::{Assist, AssistId, AssistKind},
+ assists::{Assist, AssistId},
label::Label,
source_change::SourceChange,
};
@@ -68,7 +68,7 @@
}
Some(vec![Assist {
- id: AssistId("unscore_unused_variable_name", AssistKind::QuickFix),
+ id: AssistId::quick_fix("unscore_unused_variable_name"),
label: Label::new(format!(
"Rename unused {} to _{}",
var_name.display(db, edition),
diff --git a/crates/ide-diagnostics/src/lib.rs b/crates/ide-diagnostics/src/lib.rs
index 7cba58f..a8d9b67 100644
--- a/crates/ide-diagnostics/src/lib.rs
+++ b/crates/ide-diagnostics/src/lib.rs
@@ -89,7 +89,7 @@
use ide_db::base_db::salsa::AsDynDatabase;
use ide_db::{
EditionedFileId, FileId, FileRange, FxHashMap, FxHashSet, RootDatabase, Severity, SnippetCap,
- assists::{Assist, AssistId, AssistKind, AssistResolveStrategy},
+ assists::{Assist, AssistId, AssistResolveStrategy},
base_db::{ReleaseChannel, RootQueryDb as _},
generated::lints::{CLIPPY_LINT_GROUPS, DEFAULT_LINT_GROUPS, DEFAULT_LINTS, Lint, LintGroup},
imports::insert_use::InsertUseConfig,
@@ -992,7 +992,7 @@
fn unresolved_fix(id: &'static str, label: &str, target: TextRange) -> Assist {
assert!(!id.contains(' '));
Assist {
- id: AssistId(id, AssistKind::QuickFix),
+ id: AssistId::quick_fix(id),
label: Label::new(label.to_owned()),
group: None,
target,
diff --git a/crates/ide/src/ssr.rs b/crates/ide/src/ssr.rs
index 5e439bd..0e06b8e 100644
--- a/crates/ide/src/ssr.rs
+++ b/crates/ide/src/ssr.rs
@@ -2,7 +2,7 @@
//! assist in ide_assists because that would require the ide_assists crate
//! depend on the ide_ssr crate.
-use ide_assists::{Assist, AssistId, AssistKind, AssistResolveStrategy, GroupLabel};
+use ide_assists::{Assist, AssistId, AssistResolveStrategy, GroupLabel};
use ide_db::{FileRange, RootDatabase, label::Label, source_change::SourceChange};
pub(crate) fn ssr_assists(
@@ -16,7 +16,7 @@
Some(ssr_data) => ssr_data,
None => return ssr_assists,
};
- let id = AssistId("ssr", AssistKind::RefactorRewrite);
+ let id = AssistId::refactor_rewrite("ssr");
let (source_change_for_file, source_change_for_workspace) = if resolve.should_resolve(&id) {
let edits = match_finder.edits();
@@ -120,6 +120,7 @@
id: AssistId(
"ssr",
RefactorRewrite,
+ None,
),
label: "Apply SSR in file",
group: Some(
@@ -163,6 +164,7 @@
id: AssistId(
"ssr",
RefactorRewrite,
+ None,
),
label: "Apply SSR in workspace",
group: Some(
@@ -240,6 +242,7 @@
id: AssistId(
"ssr",
RefactorRewrite,
+ None,
),
label: "Apply SSR in file",
group: Some(
@@ -260,6 +263,7 @@
id: AssistId(
"ssr",
RefactorRewrite,
+ None,
),
label: "Apply SSR in workspace",
group: Some(
diff --git a/crates/rust-analyzer/src/handlers/request.rs b/crates/rust-analyzer/src/handlers/request.rs
index ef1cc28..ec8b324 100644
--- a/crates/rust-analyzer/src/handlers/request.rs
+++ b/crates/rust-analyzer/src/handlers/request.rs
@@ -1568,13 +1568,21 @@
fn parse_action_id(action_id: &str) -> anyhow::Result<(usize, SingleResolve), String> {
let id_parts = action_id.split(':').collect::<Vec<_>>();
match id_parts.as_slice() {
- [assist_id_string, assist_kind_string, index_string] => {
+ [assist_id_string, assist_kind_string, index_string, subtype_str] => {
let assist_kind: AssistKind = assist_kind_string.parse()?;
let index: usize = match index_string.parse() {
Ok(index) => index,
Err(e) => return Err(format!("Incorrect index string: {e}")),
};
- Ok((index, SingleResolve { assist_id: assist_id_string.to_string(), assist_kind }))
+ let assist_subtype = subtype_str.parse::<usize>().ok();
+ Ok((
+ index,
+ SingleResolve {
+ assist_id: assist_id_string.to_string(),
+ assist_kind,
+ assist_subtype,
+ },
+ ))
}
_ => Err("Action id contains incorrect number of segments".to_owned()),
}
diff --git a/crates/rust-analyzer/src/lsp/to_proto.rs b/crates/rust-analyzer/src/lsp/to_proto.rs
index 8ea2d46..c30ee0f 100644
--- a/crates/rust-analyzer/src/lsp/to_proto.rs
+++ b/crates/rust-analyzer/src/lsp/to_proto.rs
@@ -1514,7 +1514,12 @@
(Some(it), _) => res.edit = Some(snippet_workspace_edit(snap, it)?),
(None, Some((index, code_action_params, version))) => {
res.data = Some(lsp_ext::CodeActionData {
- id: format!("{}:{}:{index}", assist.id.0, assist.id.1.name()),
+ id: format!(
+ "{}:{}:{index}:{}",
+ assist.id.0,
+ assist.id.1.name(),
+ assist.id.2.map(|x| x.to_string()).unwrap_or("".to_owned())
+ ),
code_action_params,
version,
});
diff --git a/docs/book/src/contributing/README.md b/docs/book/src/contributing/README.md
index cbbf6ac..9e1cdb0 100644
--- a/docs/book/src/contributing/README.md
+++ b/docs/book/src/contributing/README.md
@@ -3,7 +3,7 @@
rust-analyzer is an ordinary Rust project, which is organized as a Cargo workspace, builds on stable and doesn't depend on C libraries.
So, just
-```
+```bash
$ cargo test
```
@@ -140,7 +140,7 @@
`--log-file <PATH>` CLI argument allows logging to file.
Setting the `RA_LOG_FILE=<PATH>` environment variable will also log to file, it will also override `--log-file`.
-To see stderr in the running VS Code instance, go to the "Output" tab of the panel and select `rust-analyzer`.
+To see stderr in the running VS Code instance, go to the "Output" tab of the panel and select `Rust Analyzer Client`.
This shows `eprintln!` as well.
Note that `stdout` is used for the actual protocol, so `println!` will break things.
@@ -148,7 +148,7 @@
* You can log on the server side, by running something like
- ```
+ ```bash
env RA_LOG=lsp_server=debug code .
```
@@ -180,7 +180,7 @@
We have a built-in hierarchical profiler, you can enable it by using `RA_PROFILE` env-var:
-```
+```bash
RA_PROFILE=* // dump everything
RA_PROFILE=foo|bar|baz // enabled only selected entries
RA_PROFILE=*@3>10 // dump everything, up to depth 3, if it takes more than 10 ms
@@ -191,7 +191,7 @@
For machine-readable JSON output, we have the `RA_PROFILE_JSON` env variable. We support
filtering only by span name:
-```
+```bash
RA_PROFILE=* // dump everything
RA_PROFILE_JSON="vfs_load|parallel_prime_caches|discover_command" // dump selected spans
```
@@ -201,13 +201,13 @@
To measure time for from-scratch analysis, use something like this:
-```
+```bash
$ cargo run --release -p rust-analyzer -- analysis-stats ../chalk/
```
For measuring time of incremental analysis, use either of these:
-```
+```bash
$ cargo run --release -p rust-analyzer -- analysis-bench ../chalk/ --highlight ../chalk/chalk-engine/src/logic.rs
$ cargo run --release -p rust-analyzer -- analysis-bench ../chalk/ --complete ../chalk/chalk-engine/src/logic.rs:94:0
```
@@ -220,7 +220,7 @@
`release` assumes that you have checkouts of `rust-analyzer`, `rust-analyzer.github.io`, and `rust-lang/rust` in the same directory:
-```
+```bash
./rust-analyzer
./rust-analyzer.github.io
./rust-rust-analyzer # Note the name!
