rust-analyzer

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 8124fecff6..9571270758 100644
--- a/crates/ide-assists/src/handlers/add_missing_match_arms.rs
+++ b/crates/ide-assists/src/handlers/add_missing_match_arms.rs

@@ -3,7 +3,6 @@ use std::iter::{self, Peekable};

use either::Either;

use hir::{Adt, AsAssocItem, Crate, FindPathConfig, HasAttrs, ModuleDef, Semantics};

use ide_db::RootDatabase;

-use ide_db::assists::ExprFillDefaultMode;

use ide_db::syntax_helpers::suggest_name;

use ide_db::{famous_defs::FamousDefs, helpers::mod_path_to_ast};

use itertools::Itertools;

@@ -229,17 +228,7 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)

// filter out hidden patterns because they're handled by the catch-all arm

!hidden

})

- .map(|(pat, _)| {

- make.match_arm(

- pat,

- None,

- match ctx.config.expr_fill_default {

- ExprFillDefaultMode::Todo => make::ext::expr_todo(),

- ExprFillDefaultMode::Underscore => make::ext::expr_underscore(),

- ExprFillDefaultMode::Default => make::ext::expr_todo(),

- },

- )

- });

+ .map(|(pat, _)| make.match_arm(pat, None, utils::expr_fill_default(ctx.config)));

let mut arms: Vec<_> = match_arm_list

.arms()

@@ -266,11 +255,7 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)

let arm = make.match_arm(

make.wildcard_pat().into(),

None,

- match ctx.config.expr_fill_default {

- ExprFillDefaultMode::Todo => make::ext::expr_todo(),

- ExprFillDefaultMode::Underscore => make::ext::expr_underscore(),

- ExprFillDefaultMode::Default => make::ext::expr_todo(),

- },

+ utils::expr_fill_default(ctx.config),

);

arms.push(arm);

}

diff --git a/crates/ide-assists/src/handlers/desugar_try_expr.rs b/crates/ide-assists/src/handlers/desugar_try_expr.rs
index 4022030159..02879837dc 100644
--- a/crates/ide-assists/src/handlers/desugar_try_expr.rs
+++ b/crates/ide-assists/src/handlers/desugar_try_expr.rs

@@ -1,9 +1,6 @@

use std::iter;

-use ide_db::{

- assists::{AssistId, ExprFillDefaultMode},

- ty_filter::TryEnum,

-};

+use ide_db::{assists::AssistId, ty_filter::TryEnum};

use syntax::{

AstNode, T,

ast::{

@@ -80,16 +77,9 @@ pub(crate) fn desugar_try_expr(acc: &mut Assists, ctx: &AssistContext<'_>) -> Op

)

.into(),

};

- let sad_expr = match try_enum {

- TryEnum::Option => make.expr_return(Some(make.expr_path(make.ident_path("None")))),

- TryEnum::Result => make.expr_return(Some(

- make.expr_call(

- make.expr_path(make.ident_path("Err")),

- make.arg_list(iter::once(make.expr_path(make.ident_path("err")))),

- )

- .into(),

- )),

- };

+ let sad_expr = make.expr_return(Some(sad_expr(try_enum, &make, || {

+ make.expr_path(make.ident_path("err"))

+ })));

let happy_arm = make.match_arm(

try_enum.happy_pattern(make.ident_pat(false, false, make.name("it")).into()),

@@ -123,6 +113,7 @@ pub(crate) fn desugar_try_expr(acc: &mut Assists, ctx: &AssistContext<'_>) -> Op

let mut editor = builder.make_editor(let_stmt.syntax());

let indent_level = IndentLevel::from_node(let_stmt.syntax());

+ let fill_expr = || crate::utils::expr_fill_default(ctx.config);

let new_let_stmt = make.let_else_stmt(

try_enum.happy_pattern(pat),

let_stmt.ty(),

@@ -130,41 +121,7 @@ pub(crate) fn desugar_try_expr(acc: &mut Assists, ctx: &AssistContext<'_>) -> Op

make.block_expr(

iter::once(

make.expr_stmt(

- make.expr_return(Some(match try_enum {

- TryEnum::Option => make.expr_path(make.ident_path("None")),

- TryEnum::Result => make

- .expr_call(

- make.expr_path(make.ident_path("Err")),

- make.arg_list(iter::once(

- match ctx.config.expr_fill_default {

- ExprFillDefaultMode::Todo => make

- .expr_macro(

- make.ident_path("todo"),

- make.token_tree(

- syntax::SyntaxKind::L_PAREN,

- [],

- ),

- )

- .into(),

- ExprFillDefaultMode::Underscore => {

- make.expr_underscore().into()

- }

- ExprFillDefaultMode::Default => make

- .expr_macro(

- make.ident_path("todo"),

- make.token_tree(

- syntax::SyntaxKind::L_PAREN,

- [],

- ),

- )

- .into(),

- },

- )),

- )

- .into(),

- }))

- .indent(indent_level + 1)

- .into(),

+ make.expr_return(Some(sad_expr(try_enum, &make, fill_expr))).into(),

)

.into(),

@@ -181,6 +138,15 @@ pub(crate) fn desugar_try_expr(acc: &mut Assists, ctx: &AssistContext<'_>) -> Op

Some(())

}

+fn sad_expr(try_enum: TryEnum, make: &SyntaxFactory, err: impl Fn() -> ast::Expr) -> ast::Expr {

+ match try_enum {

+ TryEnum::Option => make.expr_path(make.ident_path("None")),

+ TryEnum::Result => make

+ .expr_call(make.expr_path(make.ident_path("Err")), make.arg_list(iter::once(err())))

+ .into(),

+ }

#[cfg(test)]

mod tests {

use super::*;

diff --git a/crates/ide-assists/src/handlers/generate_blanket_trait_impl.rs b/crates/ide-assists/src/handlers/generate_blanket_trait_impl.rs
index b0fa9e6b3e..e022a27e51 100644
--- a/crates/ide-assists/src/handlers/generate_blanket_trait_impl.rs
+++ b/crates/ide-assists/src/handlers/generate_blanket_trait_impl.rs

@@ -5,15 +5,15 @@ use crate::{

use hir::{HasCrate, Semantics};

use ide_db::{

RootDatabase,

- assists::{AssistId, AssistKind, ExprFillDefaultMode},

+ assists::{AssistId, AssistKind},

famous_defs::FamousDefs,

syntax_helpers::suggest_name,

};

use syntax::{

AstNode,

ast::{

- self, AssocItem, BlockExpr, GenericParam, HasAttrs, HasGenericParams, HasName,

- HasTypeBounds, HasVisibility, edit::AstNodeEdit, make,

+ self, AssocItem, GenericParam, HasAttrs, HasGenericParams, HasName, HasTypeBounds,

+ HasVisibility, edit::AstNodeEdit, make,

syntax_editor::Position,

};

@@ -269,7 +269,7 @@ fn todo_fn(f: &ast::Fn, config: &AssistConfig) -> ast::Fn {

f.generic_param_list(),

f.where_clause(),

params,

- default_block(config),

+ make::block_expr(None, Some(crate::utils::expr_fill_default(config))),

f.ret_type(),

f.async_token().is_some(),

f.const_token().is_some(),

@@ -278,15 +278,6 @@ fn todo_fn(f: &ast::Fn, config: &AssistConfig) -> ast::Fn {

)

}

-fn default_block(config: &AssistConfig) -> BlockExpr {

- let expr = match config.expr_fill_default {

- ExprFillDefaultMode::Todo => make::ext::expr_todo(),

- ExprFillDefaultMode::Underscore => make::ext::expr_underscore(),

- ExprFillDefaultMode::Default => make::ext::expr_todo(),

- };

- make::block_expr(None, Some(expr))

fn cfg_attrs(node: &impl HasAttrs) -> impl Iterator<Item = ast::Attr> {

node.attrs().filter(|attr| attr.as_simple_call().is_some_and(|(name, _arg)| name == "cfg"))

}

diff --git a/crates/ide-assists/src/handlers/generate_function.rs b/crates/ide-assists/src/handlers/generate_function.rs
index f62eccaf19..fbf6241e43 100644
--- a/crates/ide-assists/src/handlers/generate_function.rs
+++ b/crates/ide-assists/src/handlers/generate_function.rs

@@ -4,7 +4,6 @@ use hir::{

};

use ide_db::{

FileId, FxHashMap, FxHashSet, RootDatabase, SnippetCap,

- assists::ExprFillDefaultMode,

defs::{Definition, NameRefClass},

famous_defs::FamousDefs,

helpers::is_editable_crate,

@@ -24,7 +23,7 @@ use syntax::{

use crate::{

AssistContext, AssistId, Assists,

- utils::{convert_reference_type, find_struct_impl},

+ utils::{convert_reference_type, expr_fill_default, find_struct_impl},

};

// Assist: generate_function

@@ -286,11 +285,7 @@ impl FunctionBuilder {

target_module,

&mut necessary_generic_params,

);

- let placeholder_expr = match ctx.config.expr_fill_default {

- ExprFillDefaultMode::Todo => make::ext::expr_todo(),

- ExprFillDefaultMode::Underscore => make::ext::expr_underscore(),

- ExprFillDefaultMode::Default => make::ext::expr_todo(),

- };

+ let placeholder_expr = expr_fill_default(ctx.config);

fn_body = make::block_expr(vec![], Some(placeholder_expr));

};

@@ -345,11 +340,7 @@ impl FunctionBuilder {

let (generic_param_list, where_clause) =

fn_generic_params(ctx, necessary_generic_params, &target)?;

- let placeholder_expr = match ctx.config.expr_fill_default {

- ExprFillDefaultMode::Todo => make::ext::expr_todo(),

- ExprFillDefaultMode::Underscore => make::ext::expr_underscore(),

- ExprFillDefaultMode::Default => make::ext::expr_todo(),

- };

+ let placeholder_expr = expr_fill_default(ctx.config);

let fn_body = make::block_expr(vec![], Some(placeholder_expr));

Some(Self {

@@ -465,11 +456,7 @@ fn make_fn_body_as_new_function(

let adt_info = adt_info.as_ref()?;

let path_self = make::ext::ident_path("Self");

- let placeholder_expr = match ctx.config.expr_fill_default {

- ExprFillDefaultMode::Todo => make::ext::expr_todo(),

- ExprFillDefaultMode::Underscore => make::ext::expr_underscore(),

- ExprFillDefaultMode::Default => make::ext::expr_todo(),

- };

+ let placeholder_expr = expr_fill_default(ctx.config);

let tail_expr = if let Some(strukt) = adt_info.adt.as_struct() {

match strukt.kind(ctx.db()) {

StructKind::Record => {

diff --git a/crates/ide-assists/src/utils.rs b/crates/ide-assists/src/utils.rs
index 0657e7243a..0f28a20225 100644
--- a/crates/ide-assists/src/utils.rs
+++ b/crates/ide-assists/src/utils.rs

@@ -248,17 +248,9 @@ pub fn add_trait_assoc_items_to_impl(

.filter_map(|item| match item {

ast::AssocItem::Fn(fn_) if fn_.body().is_none() => {

let fn_ = fn_.clone_subtree();

- let new_body = &make::block_expr(

- None,

- Some(match config.expr_fill_default {

- ExprFillDefaultMode::Todo => make::ext::expr_todo(),

- ExprFillDefaultMode::Underscore => make::ext::expr_underscore(),

- ExprFillDefaultMode::Default => make::ext::expr_todo(),

- }),

- );

- let new_body = AstNodeEdit::indent(new_body, IndentLevel::single());

+ let new_body = make::block_expr(None, Some(expr_fill_default(config)));

let mut fn_editor = SyntaxEditor::new(fn_.syntax().clone());

- fn_.replace_or_insert_body(&mut fn_editor, new_body);

+ fn_.replace_or_insert_body(&mut fn_editor, new_body.clone_for_update());

let new_fn_ = fn_editor.finish().new_root().clone();

ast::AssocItem::cast(new_fn_)

}

@@ -465,6 +457,15 @@ fn check_pat_variant_nested_or_literal_with_depth(

}

+pub(crate) fn expr_fill_default(config: &AssistConfig) -> ast::Expr {

+ let make = SyntaxFactory::without_mappings();

+ match config.expr_fill_default {

+ ExprFillDefaultMode::Todo => make.expr_todo(),

+ ExprFillDefaultMode::Underscore => make.expr_underscore().into(),

+ ExprFillDefaultMode::Default => make.expr_todo(),

+ }

// Uses a syntax-driven approach to find any impl blocks for the struct that

// exist within the module/file