Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/handlers/move_from_mod_rs.rs')
| -rw-r--r-- | crates/ide-assists/src/handlers/move_from_mod_rs.rs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/crates/ide-assists/src/handlers/move_from_mod_rs.rs b/crates/ide-assists/src/handlers/move_from_mod_rs.rs index 10915f8aaf..a36d3136a1 100644 --- a/crates/ide-assists/src/handlers/move_from_mod_rs.rs +++ b/crates/ide-assists/src/handlers/move_from_mod_rs.rs @@ -1,8 +1,5 @@ -use ide_db::{ - assists::{AssistId, AssistKind}, - base_db::AnchoredPathBuf, -}; -use syntax::{ast, AstNode, ToSmolStr}; +use ide_db::{assists::AssistId, base_db::AnchoredPathBuf}; +use syntax::{AstNode, ToSmolStr, ast}; use crate::{ assist_context::{AssistContext, Assists}, @@ -25,7 +22,7 @@ use crate::{ // ``` pub(crate) fn move_from_mod_rs(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { let source_file = ctx.find_node_at_offset::<ast::SourceFile>()?; - let module = ctx.sema.file_to_module_def(ctx.file_id())?; + let module = ctx.sema.file_to_module_def(ctx.vfs_file_id())?; // Enable this assist if the user select all "meaningful" content in the source file let trimmed_selected_range = trimmed_text_range(&source_file, ctx.selection_trimmed()); let trimmed_file_range = trimmed_text_range(&source_file, source_file.syntax().text_range()); @@ -41,13 +38,13 @@ pub(crate) fn move_from_mod_rs(acc: &mut Assists, ctx: &AssistContext<'_>) -> Op let target = source_file.syntax().text_range(); let module_name = module.name(ctx.db())?.as_str().to_smolstr(); let path = format!("../{module_name}.rs"); - let dst = AnchoredPathBuf { anchor: ctx.file_id().into(), path }; + let dst = AnchoredPathBuf { anchor: ctx.vfs_file_id(), path }; acc.add( - AssistId("move_from_mod_rs", AssistKind::Refactor), + AssistId::refactor("move_from_mod_rs"), format!("Convert {module_name}/mod.rs to {module_name}.rs"), target, |builder| { - builder.move_file(ctx.file_id(), dst); + builder.move_file(ctx.vfs_file_id(), dst); }, ) } |