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.

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

[isort] Add support for length-sort settings #8841

Merged
merged 8 commits into from
Nov 28, 2023
Prev Previous commit
Next Next commit
Reorder members of the module key
- Makes more sense to have force_to_top first
- Allows to place maybe_length after force_to_top but before distance
  • Loading branch information
bluthej committed Nov 26, 2023
commit 11fa9b42c7910e514478a2766a8fde860de9dda2
20 changes: 11 additions & 9 deletions crates/ruff_linter/src/rules/isort/sorting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ pub(crate) enum Distance {
/// `foo` in `from foo import bar`).
#[derive(Debug, PartialOrd, Ord, PartialEq, Eq)]
pub(crate) struct ModuleKey<'a> {
distance: Distance,
force_to_top: Option<bool>,
force_to_top: bool,
maybe_length: Option<usize>,
distance: Distance,
maybe_lowercase_name: Option<NatOrdStr<'a>>,
module_name: Option<NatOrdStr<'a>>,
first_alias: Option<MemberKey<'a>>,
Expand All @@ -93,19 +93,21 @@ impl<'a> ModuleKey<'a> {
settings: &Settings,
straight_import: bool,
) -> Self {
let force_to_top = !name
.map(|name| settings.force_to_top.contains(name))
.unwrap_or_default(); // `false` < `true` so we get forced to top first

let maybe_length = (settings.length_sort
|| (settings.length_sort_straight && straight_import))
.then_some(name.map(str::width).unwrap_or_default());

let distance = match settings.relative_imports_order {
RelativeImportsOrder::ClosestToFurthest => Distance::Nearest(level.unwrap_or_default()),
RelativeImportsOrder::FurthestToClosest => {
Distance::Furthest(Reverse(level.unwrap_or_default()))
}
};

let force_to_top = name.map(|name| !settings.force_to_top.contains(name)); // `false` < `true` so we get forced to top first

let maybe_length = (settings.length_sort
|| (settings.length_sort_straight && straight_import))
.then_some(name.map(str::width).unwrap_or_default());

let maybe_lowercase_name = name.and_then(|name| {
(!settings.case_sensitive).then_some(NatOrdStr(maybe_lowercase(name)))
});
Expand All @@ -118,9 +120,9 @@ impl<'a> ModuleKey<'a> {
first_alias.map(|(name, asname)| MemberKey::from_member(name, asname, settings));

Self {
distance,
force_to_top,
maybe_length,
distance,
maybe_lowercase_name,
module_name,
first_alias,
Expand Down