Skip to content

Commit 072f44f

Browse files
committed
update normalize_import to use editor variant of merge_import methods
1 parent 59b9453 commit 072f44f

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use ide_db::imports::merge_imports::try_normalize_import;
2-
use syntax::{AstNode, ast};
2+
use syntax::{AstNode, ast, syntax_editor::SyntaxEditor};
33

44
use crate::{
55
AssistId,
@@ -25,11 +25,13 @@ pub(crate) fn normalize_import(acc: &mut Assists, ctx: &AssistContext<'_, '_>) -
2525
};
2626

2727
let target = use_item.syntax().text_range();
28+
let (editor, _) = SyntaxEditor::new(use_item.syntax().ancestors().last().unwrap());
2829
let normalized_use_item =
29-
try_normalize_import(&use_item, ctx.config.insert_use.granularity.into())?;
30+
try_normalize_import(&editor, &use_item, ctx.config.insert_use.granularity.into())?;
31+
editor.replace(use_item.syntax(), normalized_use_item.syntax());
3032

3133
acc.add(AssistId::refactor_rewrite("normalize_import"), "Normalize import", target, |builder| {
32-
builder.replace_ast(use_item, normalized_use_item);
34+
builder.add_file_edits(ctx.vfs_file_id(), editor);
3335
})
3436
}
3537

0 commit comments

Comments
 (0)