Skip to content

Commit 7e3224f

Browse files
committed
Address comments
1 parent 51b1f77 commit 7e3224f

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

crates/ide_assists/src/handlers/move_from_mod_rs.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ use ide_db::{
22
assists::{AssistId, AssistKind},
33
base_db::AnchoredPathBuf,
44
};
5-
use syntax::{ast, AstNode, TextRange};
5+
use syntax::{ast, AstNode};
66

7-
use crate::{assist_context::{AssistContext, Assists}, utils::trimmed_text_range};
7+
use crate::{
8+
assist_context::{AssistContext, Assists},
9+
utils::trimmed_text_range,
10+
};
811

912
// Assist: move_from_mod_rs
1013
//
@@ -35,16 +38,13 @@ pub(crate) fn move_from_mod_rs(acc: &mut Assists, ctx: &AssistContext) -> Option
3538
return None;
3639
}
3740

38-
let target = TextRange::new(
39-
source_file.syntax().text_range().start(),
40-
source_file.syntax().text_range().end(),
41-
);
41+
let target = source_file.syntax().text_range();
4242
let module_name = module.name(ctx.db())?.to_string();
4343
let path = format!("../{}.rs", module_name);
4444
let dst = AnchoredPathBuf { anchor: ctx.frange.file_id, path };
4545
acc.add(
4646
AssistId("move_from_mod_rs", AssistKind::Refactor),
47-
format!("Turn {}/mod.rs to {}.rs", module_name, module_name),
47+
format!("Convert {}/mod.rs to {}.rs", module_name, module_name),
4848
target,
4949
|builder| {
5050
builder.move_file(ctx.frange.file_id, dst);

crates/ide_assists/src/handlers/move_to_mod_rs.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ use ide_db::{
22
assists::{AssistId, AssistKind},
33
base_db::AnchoredPathBuf,
44
};
5-
use syntax::{ast, AstNode, TextRange};
5+
use syntax::{ast, AstNode};
66

7-
use crate::assist_context::{AssistContext, Assists};
8-
use crate::utils::trimmed_text_range;
7+
use crate::{
8+
assist_context::{AssistContext, Assists},
9+
utils::trimmed_text_range,
10+
};
911

1012
// Assist: move_to_mod_rs
1113
//
@@ -36,16 +38,13 @@ pub(crate) fn move_to_mod_rs(acc: &mut Assists, ctx: &AssistContext) -> Option<(
3638
return None;
3739
}
3840

39-
let target = TextRange::new(
40-
source_file.syntax().text_range().start(),
41-
source_file.syntax().text_range().end(),
42-
);
41+
let target = source_file.syntax().text_range();
4342
let module_name = module.name(ctx.db())?.to_string();
4443
let path = format!("./{}/mod.rs", module_name);
4544
let dst = AnchoredPathBuf { anchor: ctx.frange.file_id, path };
4645
acc.add(
4746
AssistId("move_to_mod_rs", AssistKind::Refactor),
48-
format!("Turn {}.rs to {}/mod.rs", module_name, module_name),
47+
format!("Convert {}.rs to {}/mod.rs", module_name, module_name),
4948
target,
5049
|builder| {
5150
builder.move_file(ctx.frange.file_id, dst);

0 commit comments

Comments
 (0)