Skip to content

Commit bea1fec

Browse files
committed
convert generate_enum_variant to use add_variant
1 parent 405dd77 commit bea1fec

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

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

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use hir::{HasSource, InFile};
22
use ide_db::assists::{AssistId, AssistKind};
33
use syntax::{
4-
ast::{self, edit::IndentLevel},
5-
AstNode, TextSize,
4+
ast::{self, make},
5+
AstNode,
66
};
77

88
use crate::assist_context::{AssistContext, Assists};
@@ -65,26 +65,16 @@ fn add_variant_to_accumulator(
6565
) -> Option<()> {
6666
let db = ctx.db();
6767
let InFile { file_id, value: enum_node } = adt.source(db)?.original_ast_node(db)?;
68-
let enum_indent = IndentLevel::from_node(&enum_node.syntax());
69-
70-
let variant_list = enum_node.variant_list()?;
71-
let offset = variant_list.syntax().text_range().end() - TextSize::of('}');
72-
let empty_enum = variant_list.variants().next().is_none();
7368

69+
let variant = make::variant(make::name(&name_ref.text()), None);
7470
acc.add(
7571
AssistId("generate_enum_variant", AssistKind::Generate),
7672
"Generate variant",
7773
target,
7874
|builder| {
7975
builder.edit_file(file_id.original_file(db));
80-
let text = format!(
81-
"{maybe_newline}{indent_1}{name},\n{enum_indent}",
82-
maybe_newline = if empty_enum { "\n" } else { "" },
83-
indent_1 = IndentLevel(1),
84-
name = name_ref,
85-
enum_indent = enum_indent
86-
);
87-
builder.insert(offset, text)
76+
let node = builder.make_mut(enum_node);
77+
node.variant_list().map(|it| it.add_variant(variant.clone_for_update()));
8878
},
8979
)
9080
}

0 commit comments

Comments
 (0)