Skip to content

Commit

Permalink
Auto merge of rust-lang#12384 - fasterthanlime:rust-langgh-12372, r=V…
Browse files Browse the repository at this point in the history
…eykril

Generate variant: insert code in file with enum definition

Closes rust-lang#12372
  • Loading branch information
bors committed May 25, 2022
2 parents c13f04d + 89e27ed commit 0468d84
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions crates/ide-assists/src/handlers/generate_enum_variant.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use hir::HasSource;
use hir::{HasSource, InFile};
use ide_db::assists::{AssistId, AssistKind};
use syntax::{
ast::{self, edit::IndentLevel},
Expand Down Expand Up @@ -63,10 +63,11 @@ fn add_variant_to_accumulator(
adt: hir::Enum,
name_ref: &ast::NameRef,
) -> Option<()> {
let adt_ast = adt.source(ctx.db())?.original_ast_node(ctx.db())?.value;
let enum_indent = IndentLevel::from_node(&adt_ast.syntax());
let db = ctx.db();
let InFile { file_id, value: enum_node } = adt.source(db)?.original_ast_node(db)?;
let enum_indent = IndentLevel::from_node(&enum_node.syntax());

let variant_list = adt_ast.variant_list()?;
let variant_list = enum_node.variant_list()?;
let offset = variant_list.syntax().text_range().end() - TextSize::of('}');
let empty_enum = variant_list.variants().next().is_none();

Expand All @@ -75,6 +76,7 @@ fn add_variant_to_accumulator(
"Generate variant",
target,
|builder| {
builder.edit_file(file_id.original_file(db));
let text = format!(
"{maybe_newline}{indent_1}{name},\n{enum_indent}",
maybe_newline = if empty_enum { "\n" } else { "" },
Expand Down

0 comments on commit 0468d84

Please sign in to comment.