Skip to content

Commit 7d716cb

Browse files
Simplify with adt.source()
1 parent 2347da8 commit 7d716cb

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

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

+1-10
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn add_variant_to_accumulator(
5959
adt: hir::Enum,
6060
name_ref: &ast::NameRef,
6161
) -> Option<()> {
62-
let adt_ast = get_enum_ast(ctx, adt)?;
62+
let adt_ast = adt.source(ctx.db())?.original_ast_node(ctx.db())?.value;
6363

6464
let enum_indent_level = IndentLevel::from_node(&adt_ast.syntax());
6565

@@ -80,15 +80,6 @@ fn add_variant_to_accumulator(
8080
)
8181
}
8282

83-
fn get_enum_ast(ctx: &AssistContext, adt: hir::Enum) -> Option<ast::Enum> {
84-
let range = adt.source(ctx.db())?.syntax().original_file_range(ctx.db());
85-
let file = ctx.sema.parse(range.file_id);
86-
let adt_ast: ast::Enum =
87-
ctx.sema.find_node_at_offset_with_macros(file.syntax(), range.range.start())?;
88-
89-
Some(adt_ast)
90-
}
91-
9283
#[cfg(test)]
9384
mod tests {
9485
use crate::tests::{check_assist, check_assist_not_applicable};

0 commit comments

Comments
 (0)