Simplify with adt.source()

This commit is contained in:
Amos Wenger 2022-05-21 01:32:25 +02:00
parent 2347da8c8d
commit 7d716cbeb9

View File

@ -59,7 +59,7 @@ fn add_variant_to_accumulator(
adt: hir::Enum,
name_ref: &ast::NameRef,
) -> Option<()> {
let adt_ast = get_enum_ast(ctx, adt)?;
let adt_ast = adt.source(ctx.db())?.original_ast_node(ctx.db())?.value;
let enum_indent_level = IndentLevel::from_node(&adt_ast.syntax());
@ -80,15 +80,6 @@ fn add_variant_to_accumulator(
)
}
fn get_enum_ast(ctx: &AssistContext, adt: hir::Enum) -> Option<ast::Enum> {
let range = adt.source(ctx.db())?.syntax().original_file_range(ctx.db());
let file = ctx.sema.parse(range.file_id);
let adt_ast: ast::Enum =
ctx.sema.find_node_at_offset_with_macros(file.syntax(), range.range.start())?;
Some(adt_ast)
}
#[cfg(test)]
mod tests {
use crate::tests::{check_assist, check_assist_not_applicable};