Skip to content
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

Treat super and crate as top_level in use merge. #6908

Merged
merged 1 commit into from
Dec 22, 2024
+20 −2
Merged

Treat super and crate as top_level in use merge. #6908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions crates/cairo-lang-formatter/src/formatter_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ impl UseTree {

let mut nested_paths = vec![];
for (segment, subtree) in self.children {
let (subtree_merged_use_items, is_single_leaf) =
subtree.create_merged_use_items(allow_duplicate_uses, false);
let (subtree_merged_use_items, is_single_leaf) = subtree.create_merged_use_items(
allow_duplicate_uses,
matches!(segment.as_str(), "crate" | "super"),
);

let formatted_subtree_paths =
subtree_merged_use_items.into_iter().map(|child| format!("{segment}::{child}"));
Expand Down
9 changes: 9 additions & 0 deletions crates/cairo-lang-formatter/test_data/cairo_files/use_merge.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,12 @@ use d::{e, *};
// Testing not merging the top level.
use x;
use y;
// Testing not merging crate and super.
use crate::a;
use crate::b;
use crate::c::d;
use crate::c::e;
use super::a;
use super::b;
use super::c::d;
use super::c::e;
7 changes: 7 additions & 0 deletions crates/cairo-lang-formatter/test_data/expected_results/use_merge.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,14 @@ use a::{c, d};
// Testing wildcard.
mod w;
use a::{*, a, b, c};
// Testing not merging crate and super.
use crate::a;
use crate::b;
use crate::c::{d, e};
use d::{*, e};
use super::a;
use super::b;
use super::c::{d, e};
// Testing not merging the top level.
use x;
use y;
Loading