about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--crates/ide_assists/src/handlers/move_from_mod_rs.rs14
-rw-r--r--crates/ide_assists/src/handlers/move_to_mod_rs.rs15
2 files changed, 14 insertions, 15 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 28482b85f48..026f4aaf6c4 100644
--- a/crates/ide_assists/src/handlers/move_from_mod_rs.rs
+++ b/crates/ide_assists/src/handlers/move_from_mod_rs.rs
@@ -2,9 +2,12 @@ use ide_db::{
     assists::{AssistId, AssistKind},
     base_db::AnchoredPathBuf,
 };
-use syntax::{ast, AstNode, TextRange};
+use syntax::{ast, AstNode};
 
-use crate::{assist_context::{AssistContext, Assists}, utils::trimmed_text_range};
+use crate::{
+    assist_context::{AssistContext, Assists},
+    utils::trimmed_text_range,
+};
 
 // Assist: move_from_mod_rs
 //
@@ -35,16 +38,13 @@ pub(crate) fn move_from_mod_rs(acc: &mut Assists, ctx: &AssistContext) -> Option
         return None;
     }
 
-    let target = TextRange::new(
-        source_file.syntax().text_range().start(),
-        source_file.syntax().text_range().end(),
-    );
+    let target = source_file.syntax().text_range();
     let module_name = module.name(ctx.db())?.to_string();
     let path = format!("../{}.rs", module_name);
     let dst = AnchoredPathBuf { anchor: ctx.frange.file_id, path };
     acc.add(
         AssistId("move_from_mod_rs", AssistKind::Refactor),
-        format!("Turn {}/mod.rs to {}.rs", module_name, module_name),
+        format!("Convert {}/mod.rs to {}.rs", module_name, module_name),
         target,
         |builder| {
             builder.move_file(ctx.frange.file_id, dst);
diff --git a/crates/ide_assists/src/handlers/move_to_mod_rs.rs b/crates/ide_assists/src/handlers/move_to_mod_rs.rs
index 3f8340b7296..6f505de4cf0 100644
--- a/crates/ide_assists/src/handlers/move_to_mod_rs.rs
+++ b/crates/ide_assists/src/handlers/move_to_mod_rs.rs
@@ -2,10 +2,12 @@ use ide_db::{
     assists::{AssistId, AssistKind},
     base_db::AnchoredPathBuf,
 };
-use syntax::{ast, AstNode, TextRange};
+use syntax::{ast, AstNode};
 
-use crate::assist_context::{AssistContext, Assists};
-use crate::utils::trimmed_text_range;
+use crate::{
+    assist_context::{AssistContext, Assists},
+    utils::trimmed_text_range,
+};
 
 // Assist: move_to_mod_rs
 //
@@ -36,16 +38,13 @@ pub(crate) fn move_to_mod_rs(acc: &mut Assists, ctx: &AssistContext) -> Option<(
         return None;
     }
 
-    let target = TextRange::new(
-        source_file.syntax().text_range().start(),
-        source_file.syntax().text_range().end(),
-    );
+    let target = source_file.syntax().text_range();
     let module_name = module.name(ctx.db())?.to_string();
     let path = format!("./{}/mod.rs", module_name);
     let dst = AnchoredPathBuf { anchor: ctx.frange.file_id, path };
     acc.add(
         AssistId("move_to_mod_rs", AssistKind::Refactor),
-        format!("Turn {}.rs to {}/mod.rs", module_name, module_name),
+        format!("Convert {}.rs to {}/mod.rs", module_name, module_name),
         target,
         |builder| {
             builder.move_file(ctx.frange.file_id, dst);