Speed up resolving "Generate delegate method" assist (part 2)

Make it compile by adding a `None` subtype to rest of the AssistId
instantiations.

Author: nemethf

crates/ide-assists/src/handlers/add_braces.rs

@@ -32,7 +32,7 @@ pub(crate) fn add_braces(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<(
     let (expr_type, expr) = get_replacement_node(ctx)?;
 
     acc.add(
-        AssistId("add_braces", AssistKind::RefactorRewrite),
+        AssistId("add_braces", AssistKind::RefactorRewrite, None),
         match expr_type {
             ParentType::ClosureExpr => "Add braces to closure body",
             ParentType::MatchArmExpr => "Add braces to arm expression",

crates/ide-assists/src/handlers/add_explicit_enum_discriminant.rs

@@ -53,7 +53,7 @@ pub(crate) fn add_explicit_enum_discriminant(
     }
 
     acc.add(
-        AssistId("add_explicit_enum_discriminant", AssistKind::RefactorRewrite),
+        AssistId("add_explicit_enum_discriminant", AssistKind::RefactorRewrite, None),
         "Add explicit enum discriminants",
         enum_node.syntax().text_range(),
         |builder| {

crates/ide-assists/src/handlers/add_explicit_type.rs

@@ -71,7 +71,7 @@ pub(crate) fn add_explicit_type(acc: &mut Assists, ctx: &AssistContext<'_>) -> O
 
     let inferred_type = ty.display_source_code(ctx.db(), module.into(), false).ok()?;
     acc.add(
-        AssistId("add_explicit_type", AssistKind::RefactorRewrite),
+        AssistId("add_explicit_type", AssistKind::RefactorRewrite, None),
         format!("Insert explicit type `{inferred_type}`"),
         pat_range,
         |builder| match ascribed_ty {

crates/ide-assists/src/handlers/add_label_to_loop.rs

@@ -35,7 +35,7 @@ pub(crate) fn add_label_to_loop(acc: &mut Assists, ctx: &AssistContext<'_>) -> O
     }
 
     acc.add(
-        AssistId("add_label_to_loop", AssistKind::Generate),
+        AssistId("add_label_to_loop", AssistKind::Generate, None),
         "Add Label",
         loop_expr.syntax().text_range(),
         |builder| {

crates/ide-assists/src/handlers/add_lifetime_to_type.rs

@@ -38,7 +38,7 @@ pub(crate) fn add_lifetime_to_type(acc: &mut Assists, ctx: &AssistContext<'_>) -
     let target = node.syntax().text_range();
 
     acc.add(
-        AssistId("add_lifetime_to_type", AssistKind::Generate),
+        AssistId("add_lifetime_to_type", AssistKind::Generate, None),
         "Add lifetime",
         target,
         |builder| {

crates/ide-assists/src/handlers/add_missing_impl_members.rs

@@ -146,7 +146,7 @@ fn add_missing_impl_members_inner(
     }
 
     let target = impl_def.syntax().text_range();
-    acc.add(AssistId(assist_id, AssistKind::QuickFix), label, target, |edit| {
+    acc.add(AssistId(assist_id, AssistKind::QuickFix, None), 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,

crates/ide-assists/src/handlers/add_missing_match_arms.rs

@@ -205,7 +205,7 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)
     }
 
     acc.add(
-        AssistId("add_missing_match_arms", AssistKind::QuickFix),
+        AssistId("add_missing_match_arms", AssistKind::QuickFix, None),
         "Fill match arms",
         ctx.sema.original_range(match_expr.syntax()).range,
         |builder| {

crates/ide-assists/src/handlers/add_return_type.rs

@@ -25,7 +25,7 @@ pub(crate) fn add_return_type(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opt
     let ty = ty.display_source_code(ctx.db(), module.into(), true).ok()?;
 
     acc.add(
-        AssistId("add_return_type", AssistKind::RefactorRewrite),
+        AssistId("add_return_type", AssistKind::RefactorRewrite, None),
         match fn_type {
             FnType::Function => "Add this function's return type",
             FnType::Closure { .. } => "Add this closure's return type",

crates/ide-assists/src/handlers/add_turbo_fish.rs

@@ -89,7 +89,7 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opti
             let_stmt.pat()?;
 
             acc.add(
-                AssistId("add_type_ascription", AssistKind::RefactorRewrite),
+                AssistId("add_type_ascription", AssistKind::RefactorRewrite, None),
                 "Add `: _` before assignment operator",
                 ident.text_range(),
                 |builder| {
@@ -135,7 +135,7 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opti
         .count();
 
     acc.add(
-        AssistId("add_turbo_fish", AssistKind::RefactorRewrite),
+        AssistId("add_turbo_fish", AssistKind::RefactorRewrite, None),
         "Add `::<>`",
         ident.text_range(),
         |builder| {

crates/ide-assists/src/handlers/apply_demorgan.rs

@@ -108,7 +108,7 @@ pub(crate) fn apply_demorgan(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opti
 
     acc.add_group(
         &GroupLabel("Apply De Morgan's law".to_owned()),
-        AssistId("apply_demorgan", AssistKind::RefactorRewrite),
+        AssistId("apply_demorgan", AssistKind::RefactorRewrite, None),
         "Apply De Morgan's law",
         op_range,
         |builder| {
@@ -191,7 +191,7 @@ pub(crate) fn apply_demorgan_iterator(acc: &mut Assists, ctx: &AssistContext<'_>
     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("apply_demorgan_iterator", AssistKind::RefactorRewrite, None),
         label,
         op_range,
         |builder| {

crates/ide-assists/src/handlers/auto_import.rs

@@ -126,8 +126,10 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<
     for import in proposed_imports {
         let import_path = import.import_path;
 
-        let (assist_id, import_name) =
-            (AssistId("auto_import", AssistKind::QuickFix), import_path.display(ctx.db(), edition));
+        let (assist_id, import_name) = (
+            AssistId("auto_import", AssistKind::QuickFix, None),
+            import_path.display(ctx.db(), edition),
+        );
         acc.add_group(
             &group_label,
             assist_id,

crates/ide-assists/src/handlers/bind_unused_param.rs

@@ -42,7 +42,7 @@ pub(crate) fn bind_unused_param(acc: &mut Assists, ctx: &AssistContext<'_>) -> O
     let r_curly_range = stmt_list.r_curly_token()?.text_range();
 
     acc.add(
-        AssistId("bind_unused_param", AssistKind::QuickFix),
+        AssistId("bind_unused_param", AssistKind::QuickFix, None),
         format!("Bind as `let _ = {ident_pat};`"),
         param.syntax().text_range(),
         |builder| {

crates/ide-assists/src/handlers/change_visibility.rs

@@ -76,7 +76,7 @@ fn add_vis(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
     };
 
     acc.add(
-        AssistId("change_visibility", AssistKind::RefactorRewrite),
+        AssistId("change_visibility", AssistKind::RefactorRewrite, None),
         "Change visibility to pub(crate)",
         target,
         |edit| {
@@ -112,7 +112,7 @@ fn change_vis(acc: &mut Assists, vis: ast::Visibility) -> Option<()> {
     if vis.syntax().text() == "pub" {
         let target = vis.syntax().text_range();
         return acc.add(
-            AssistId("change_visibility", AssistKind::RefactorRewrite),
+            AssistId("change_visibility", AssistKind::RefactorRewrite, None),
             "Change Visibility to pub(crate)",
             target,
             |edit| {
@@ -123,7 +123,7 @@ fn change_vis(acc: &mut Assists, vis: ast::Visibility) -> Option<()> {
     if vis.syntax().text() == "pub(crate)" {
         let target = vis.syntax().text_range();
         return acc.add(
-            AssistId("change_visibility", AssistKind::RefactorRewrite),
+            AssistId("change_visibility", AssistKind::RefactorRewrite, None),
             "Change visibility to pub",
             target,
             |edit| {

crates/ide-assists/src/handlers/convert_bool_then.rs

@@ -73,7 +73,7 @@ pub(crate) fn convert_if_to_bool_then(acc: &mut Assists, ctx: &AssistContext<'_>
 
     let target = expr.syntax().text_range();
     acc.add(
-        AssistId("convert_if_to_bool_then", AssistKind::RefactorRewrite),
+        AssistId("convert_if_to_bool_then", AssistKind::RefactorRewrite, None),
         "Convert `if` expression to `bool::then` call",
         target,
         |builder| {
@@ -181,7 +181,7 @@ pub(crate) fn convert_bool_then_to_if(acc: &mut Assists, ctx: &AssistContext<'_>
 
     let target = mcall.syntax().text_range();
     acc.add(
-        AssistId("convert_bool_then_to_if", AssistKind::RefactorRewrite),
+        AssistId("convert_bool_then_to_if", AssistKind::RefactorRewrite, None),
         "Convert `bool::then` call to `if`",
         target,
         |builder| {

crates/ide-assists/src/handlers/convert_bool_to_enum.rs

@@ -62,7 +62,7 @@ pub(crate) fn convert_bool_to_enum(acc: &mut Assists, ctx: &AssistContext<'_>) -
 
     let target = name.syntax().text_range();
     acc.add(
-        AssistId("convert_bool_to_enum", AssistKind::RefactorRewrite),
+        AssistId("convert_bool_to_enum", AssistKind::RefactorRewrite, None),
         "Convert boolean to enum",
         target,
         |edit| {

crates/ide-assists/src/handlers/convert_closure_to_fn.rs

@@ -146,7 +146,7 @@ pub(crate) fn convert_closure_to_fn(acc: &mut Assists, ctx: &AssistContext<'_>)
     };
 
     acc.add(
-        AssistId("convert_closure_to_fn", AssistKind::RefactorRewrite),
+        AssistId("convert_closure_to_fn", AssistKind::RefactorRewrite, None),
         "Convert closure to fn",
         closure.param_list()?.syntax().text_range(),
         |builder| {

crates/ide-assists/src/handlers/convert_comment_block.rs

@@ -38,7 +38,7 @@ fn block_to_line(acc: &mut Assists, comment: ast::Comment) -> Option<()> {
     let target = comment.syntax().text_range();
 
     acc.add(
-        AssistId("block_to_line", AssistKind::RefactorRewrite),
+        AssistId("block_to_line", AssistKind::RefactorRewrite, None),
         "Replace block comment with line comments",
         target,
         |edit| {
@@ -80,7 +80,7 @@ fn line_to_block(acc: &mut Assists, comment: ast::Comment) -> Option<()> {
     );
 
     acc.add(
-        AssistId("line_to_block", AssistKind::RefactorRewrite),
+        AssistId("line_to_block", AssistKind::RefactorRewrite, None),
         "Replace line comments with a single block comment",
         target,
         |edit| {

crates/ide-assists/src/handlers/convert_comment_from_or_to_doc.rs

@@ -39,7 +39,7 @@ fn doc_to_comment(acc: &mut Assists, comment: ast::Comment) -> Option<()> {
     };
 
     acc.add(
-        AssistId("doc_to_comment", AssistKind::RefactorRewrite),
+        AssistId("doc_to_comment", AssistKind::RefactorRewrite, None),
         "Replace doc comment with comment",
         target,
         |edit| {
@@ -86,7 +86,7 @@ fn comment_to_doc(acc: &mut Assists, comment: ast::Comment, style: CommentPlacem
     };
 
     acc.add(
-        AssistId("comment_to_doc", AssistKind::RefactorRewrite),
+        AssistId("comment_to_doc", AssistKind::RefactorRewrite, None),
         "Replace comment with doc comment",
         target,
         |edit| {

crates/ide-assists/src/handlers/convert_for_to_while_let.rs

@@ -47,7 +47,7 @@ pub(crate) fn convert_for_loop_to_while_let(
     }
 
     acc.add(
-        AssistId("convert_for_loop_to_while_let", AssistKind::RefactorRewrite),
+        AssistId("convert_for_loop_to_while_let", AssistKind::RefactorRewrite, None),
         "Replace this for loop with `while let`",
         for_loop.syntax().text_range(),
         |builder| {

crates/ide-assists/src/handlers/convert_from_to_tryfrom.rs

@@ -71,7 +71,7 @@ pub(crate) fn convert_from_to_tryfrom(acc: &mut Assists, ctx: &AssistContext<'_>
     }
 
     acc.add(
-        AssistId("convert_from_to_tryfrom", AssistKind::RefactorRewrite),
+        AssistId("convert_from_to_tryfrom", AssistKind::RefactorRewrite, None),
         "Convert From to TryFrom",
         impl_.syntax().text_range(),
         |builder| {

crates/ide-assists/src/handlers/convert_integer_literal.rs

@@ -47,7 +47,7 @@ pub(crate) fn convert_integer_literal(acc: &mut Assists, ctx: &AssistContext<'_>
 
         acc.add_group(
             &group_id,
-            AssistId("convert_integer_literal", AssistKind::RefactorInline),
+            AssistId("convert_integer_literal", AssistKind::RefactorInline, None),
             label,
             range,
             |builder| builder.replace(range, converted),

crates/ide-assists/src/handlers/convert_into_to_from.rs

@@ -85,7 +85,7 @@ pub(crate) fn convert_into_to_from(acc: &mut Assists, ctx: &AssistContext<'_>) -
         .filter(|name| name.text() == "self" || name.text() == "Self");
 
     acc.add(
-        AssistId("convert_into_to_from", AssistKind::RefactorRewrite),
+        AssistId("convert_into_to_from", AssistKind::RefactorRewrite, None),
         "Convert Into to From",
         impl_.syntax().text_range(),
         |builder| {

crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs

@@ -53,7 +53,7 @@ pub(crate) fn convert_iter_for_each_to_for(
     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("convert_iter_for_each_to_for", AssistKind::RefactorRewrite, None),
         "Replace this `Iterator::for_each` with a for loop",
         range,
         |builder| {
@@ -108,7 +108,7 @@ pub(crate) fn convert_for_loop_with_for_each(
     }
 
     acc.add(
-        AssistId("convert_for_loop_with_for_each", AssistKind::RefactorRewrite),
+        AssistId("convert_for_loop_with_for_each", AssistKind::RefactorRewrite, None),
         "Replace this for loop with `Iterator::for_each`",
         for_loop.syntax().text_range(),
         |builder| {

crates/ide-assists/src/handlers/convert_let_else_to_match.rs

@@ -43,7 +43,7 @@ pub(crate) fn convert_let_else_to_match(acc: &mut Assists, ctx: &AssistContext<'
 
     let target = let_stmt.syntax().text_range();
     acc.add(
-        AssistId("convert_let_else_to_match", AssistKind::RefactorRewrite),
+        AssistId("convert_let_else_to_match", AssistKind::RefactorRewrite, None),
         "Convert let-else to let and match",
         target,
         |edit| {

crates/ide-assists/src/handlers/convert_match_to_let_else.rs

@@ -54,7 +54,7 @@ pub(crate) fn convert_match_to_let_else(acc: &mut Assists, ctx: &AssistContext<'
     let extracted_variable_positions = find_extracted_variable(ctx, &extracting_arm)?;
 
     acc.add(
-        AssistId("convert_match_to_let_else", AssistKind::RefactorRewrite),
+        AssistId("convert_match_to_let_else", AssistKind::RefactorRewrite, None),
         "Convert match to let-else",
         let_stmt.syntax().text_range(),
         |builder| {

crates/ide-assists/src/handlers/convert_named_struct_to_tuple_struct.rs

@@ -68,7 +68,7 @@ pub(crate) fn convert_named_struct_to_tuple_struct(
     };
 
     acc.add(
-        AssistId("convert_named_struct_to_tuple_struct", AssistKind::RefactorRewrite),
+        AssistId("convert_named_struct_to_tuple_struct", AssistKind::RefactorRewrite, None),
         "Convert to tuple struct",
         strukt.syntax().text_range(),
         |edit| {

crates/ide-assists/src/handlers/convert_nested_function_to_closure.rs

@@ -44,7 +44,7 @@ pub(crate) fn convert_nested_function_to_closure(
     let param_list = function.param_list()?;
 
     acc.add(
-        AssistId("convert_nested_function_to_closure", AssistKind::RefactorRewrite),
+        AssistId("convert_nested_function_to_closure", AssistKind::RefactorRewrite, None),
         "Convert nested function to closure",
         target,
         |edit| {

crates/ide-assists/src/handlers/convert_to_guarded_return.rs

@@ -127,7 +127,7 @@ fn if_expr_to_guarded_return(
 
     let target = if_expr.syntax().text_range();
     acc.add(
-        AssistId("convert_to_guarded_return", AssistKind::RefactorRewrite),
+        AssistId("convert_to_guarded_return", AssistKind::RefactorRewrite, None),
         "Convert to guarded return",
         target,
         |edit| {
@@ -209,7 +209,7 @@ fn let_stmt_to_guarded_return(
     };
 
     acc.add(
-        AssistId("convert_to_guarded_return", AssistKind::RefactorRewrite),
+        AssistId("convert_to_guarded_return", AssistKind::RefactorRewrite, None),
         "Convert to guarded return",
         target,
         |edit| {

crates/ide-assists/src/handlers/convert_tuple_return_type_to_struct.rs

@@ -62,7 +62,7 @@ pub(crate) fn convert_tuple_return_type_to_struct(
 
     let target = type_ref.syntax().text_range();
     acc.add(
-        AssistId("convert_tuple_return_type_to_struct", AssistKind::RefactorRewrite),
+        AssistId("convert_tuple_return_type_to_struct", AssistKind::RefactorRewrite, None),
         "Convert tuple return type to tuple struct",
         target,
         move |edit| {

crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs

@@ -64,7 +64,7 @@ pub(crate) fn convert_tuple_struct_to_named_struct(
     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("convert_tuple_struct_to_named_struct", AssistKind::RefactorRewrite, None),
         "Convert to named struct",
         target,
         |edit| {

crates/ide-assists/src/handlers/convert_two_arm_bool_match_to_matches_macro.rs

@@ -56,7 +56,7 @@ pub(crate) fn convert_two_arm_bool_match_to_matches_macro(
     let expr = match_expr.expr()?;
 
     acc.add(
-        AssistId("convert_two_arm_bool_match_to_matches_macro", AssistKind::RefactorRewrite),
+        AssistId("convert_two_arm_bool_match_to_matches_macro", AssistKind::RefactorRewrite, None),
         "Convert to matches!",
         target_range,
         |builder| {

crates/ide-assists/src/handlers/convert_while_to_loop.rs

@@ -47,7 +47,7 @@ pub(crate) fn convert_while_to_loop(acc: &mut Assists, ctx: &AssistContext<'_>)
 
     let target = while_expr.syntax().text_range();
     acc.add(
-        AssistId("convert_while_to_loop", AssistKind::RefactorRewrite),
+        AssistId("convert_while_to_loop", AssistKind::RefactorRewrite, None),
         "Convert while to loop",
         target,
         |edit| {

crates/ide-assists/src/handlers/destructure_struct_binding.rs

@@ -47,7 +47,7 @@ pub(crate) fn destructure_struct_binding(acc: &mut Assists, ctx: &AssistContext<
     let data = collect_data(ident_pat, ctx)?;
 
     acc.add(
-        AssistId("destructure_struct_binding", AssistKind::RefactorRewrite),
+        AssistId("destructure_struct_binding", AssistKind::RefactorRewrite, None),
         "Destructure struct binding",
         data.ident_pat.syntax().text_range(),
         |edit| destructure_struct_binding_impl(ctx, edit, &data),

crates/ide-assists/src/handlers/destructure_tuple_binding.rs

@@ -65,15 +65,15 @@ pub(crate) fn destructure_tuple_binding_impl(
 
     if with_sub_pattern {
         acc.add(
-            AssistId("destructure_tuple_binding_in_sub_pattern", AssistKind::RefactorRewrite),
+            AssistId("destructure_tuple_binding_in_sub_pattern", AssistKind::RefactorRewrite, None),
             "Destructure tuple in sub-pattern",
             data.ident_pat.syntax().text_range(),
             |edit| destructure_tuple_edit_impl(ctx, edit, &data, true),
         );
     }
 
     acc.add(
-        AssistId("destructure_tuple_binding", AssistKind::RefactorRewrite),
+        AssistId("destructure_tuple_binding", AssistKind::RefactorRewrite, None),
         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),