Skip to content

fix: extract mod to file should respect path attribute #17216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 2 commits into from
May 14, 2024
Merged

fix: extract mod to file should respect path attribute #17216

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c13f0c
fix: extract mod to file should respect path attribute
Young-Flash May 9, 2024
3e57aab
test: add test case extract_with_specified_path_attr
Young-Flash May 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: extract mod to file should respect path attribute
  • Loading branch information
@Young-Flash
Young-Flash committed May 12, 2024
commit 0c13f0cd5bbbd229b1d75e095d00f5c3383ec1ff
15 changes: 12 additions & 3 deletions crates/ide-assists/src/handlers/move_module_to_file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::iter;

use ast::edit::IndentLevel;
use hir::HasAttrs;
use ide_db::base_db::AnchoredPathBuf;
use itertools::Itertools;
use stdx::format_to;
Expand Down Expand Up @@ -50,9 +51,17 @@ pub(crate) fn move_module_to_file(acc: &mut Assists, ctx: &AssistContext<'_>) ->
|builder| {
let path = {
let mut buf = String::from("./");
match parent_module.name(ctx.db()) {
Some(name) if !parent_module.is_mod_rs(ctx.db()) => {
format_to!(buf, "{}/", name.display(ctx.db()))
let db = ctx.db();
match parent_module.name(db) {
Some(name)
if !parent_module.is_mod_rs(db)
&& parent_module
.attrs(db)
.by_key("path")
.string_value_unescape()
.is_none() =>
{
format_to!(buf, "{}/", name.display(db))
}
_ => (),
}
Expand Down