[isort] Add support for length-sort settings

crates/ruff_linter/resources/test/fixtures/isort/length_sort_from_imports.py

@@ -0,0 +1,3 @@
+from mediuuuuuuuuuuum import a
+from short import b
+from loooooooooooooooooooooog import c

crates/ruff_linter/resources/test/fixtures/isort/length_sort_non_ascii_members.py

@@ -0,0 +1,11 @@
+from module1 import (
+    loooooooooooooong,
+    σηορτ,
+    mediuuuuum,
+    shoort,
+    looooooooooooooong,
+    μεδιυυυυυμ,
+    short,
+    mediuuuuuum,
+    λοοοοοοοοοοοοοονγ,
+)

crates/ruff_linter/resources/test/fixtures/isort/length_sort_non_ascii_modules.py

@@ -0,0 +1,9 @@
+import loooooooooooooong
+import mediuuuuuum
+import short
+import σηορτ
+import shoort
+import mediuuuuum
+import λοοοοοοοοοοοοοονγ
+import μεδιυυυυυμ
+import looooooooooooooong

crates/ruff_linter/resources/test/fixtures/isort/length_sort_straight_and_from_imports.py

@@ -0,0 +1,6 @@
+import mediuuuuuum
+import short
+import looooooooooooooooong
+from looooooooooooooong import a
+from mediuuuum import c
+from short import b

crates/ruff_linter/resources/test/fixtures/isort/length_sort_straight_imports.py

@@ -0,0 +1,4 @@
+import mediuuuuuumb
+import short
+import looooooooooooooooong
+import mediuuuuuuma

crates/ruff_linter/resources/test/fixtures/isort/length_sort_with_relative_imports.py

@@ -0,0 +1,7 @@
+from ..looooooooooooooong import a
+from ...mediuuuum import b
+from .short import c
+from ....short import c
+from . import d
+from .mediuuuum import a
+from ......short import b

crates/ruff_linter/resources/test/fixtures/isort/length_sort_with_star_import.py

@@ -0,0 +1,3 @@
+from looooooooooooooong import a
+from mediuuuum import *
+from short import *

crates/ruff_linter/src/rules/isort/mod.rs

@@ -1138,4 +1138,47 @@ mod tests {
         assert_messages!(diagnostics);
         Ok(())
     }
+
+    #[test_case(Path::new("length_sort_straight_imports.py"))]
+    #[test_case(Path::new("length_sort_from_imports.py"))]
+    #[test_case(Path::new("length_sort_straight_and_from_imports.py"))]
+    #[test_case(Path::new("length_sort_non_ascii_members.py"))]
+    #[test_case(Path::new("length_sort_non_ascii_modules.py"))]
+    #[test_case(Path::new("length_sort_with_relative_imports.py"))]
+    fn length_sort(path: &Path) -> Result<()> {
+        let snapshot = format!("length_sort__{}", path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("isort").join(path).as_path(),
+            &LinterSettings {
+                isort: super::settings::Settings {
+                    length_sort: true,
+                    ..super::settings::Settings::default()
+                },
+                src: vec![test_resource_path("fixtures/isort")],
+                ..LinterSettings::for_rule(Rule::UnsortedImports)
+            },
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
+
+    #[test_case(Path::new("length_sort_straight_imports.py"))]
+    #[test_case(Path::new("length_sort_from_imports.py"))]
+    #[test_case(Path::new("length_sort_straight_and_from_imports.py"))]
+    fn length_sort_straight(path: &Path) -> Result<()> {
+        let snapshot = format!("length_sort_straight__{}", path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("isort").join(path).as_path(),
+            &LinterSettings {
+                isort: super::settings::Settings {
+                    length_sort_straight: true,
+                    ..super::settings::Settings::default()
+                },
+                src: vec![test_resource_path("fixtures/isort")],
+                ..LinterSettings::for_rule(Rule::UnsortedImports)
+            },
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
 }

crates/ruff_linter/src/rules/isort/order.rs

@@ -56,21 +56,27 @@ pub(crate) fn order_imports<'a>(
             .map(Import)
             .chain(from_imports.map(ImportFrom))
             .sorted_by_cached_key(|import| match import {
-                Import((alias, _)) => {
-                    ModuleKey::from_module(Some(alias.name), alias.asname, None, None, settings)
-                }
+                Import((alias, _)) => ModuleKey::from_module(
+                    Some(alias.name),
+                    alias.asname,
+                    None,
+                    None,
+                    settings,
+                    true,
+                ),
                 ImportFrom((import_from, _, _, aliases)) => ModuleKey::from_module(
                     import_from.module,
                     None,
                     import_from.level,
                     aliases.first().map(|(alias, _)| (alias.name, alias.asname)),
                     settings,
+                    false,
                 ),
             })
             .collect()
     } else {
         let ordered_straight_imports = straight_imports.sorted_by_cached_key(|(alias, _)| {
-            ModuleKey::from_module(Some(alias.name), alias.asname, None, None, settings)
+            ModuleKey::from_module(Some(alias.name), alias.asname, None, None, settings, true)
         });
         let ordered_from_imports =
             from_imports.sorted_by_cached_key(|(import_from, _, _, aliases)| {
@@ -80,6 +86,7 @@ pub(crate) fn order_imports<'a>(
                     import_from.level,
                     aliases.first().map(|(alias, _)| (alias.name, alias.asname)),
                     settings,
+                    false,
                 )
             });
         if settings.from_first {

crates/ruff_linter/src/rules/isort/settings.rs

@@ -58,6 +58,8 @@ pub struct Settings {
     pub section_order: Vec<ImportSection>,
     pub no_sections: bool,
     pub from_first: bool,
+    pub length_sort: bool,
+    pub length_sort_straight: bool,
 }
 
 impl Default for Settings {
@@ -86,6 +88,8 @@ impl Default for Settings {
             section_order: ImportType::iter().map(ImportSection::Known).collect(),
             no_sections: false,
             from_first: false,
+            length_sort: false,
+            length_sort_straight: false,
         }
     }
 }

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_from_imports.py.snap

@@ -0,0 +1,18 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+length_sort_from_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
+  |
+1 | / from mediuuuuuuuuuuum import a
+2 | | from short import b
+3 | | from loooooooooooooooooooooog import c
+  |
+  = help: Organize imports
+
+ℹ Safe fix
+  1 |+from short import b
+1 2 | from mediuuuuuuuuuuum import a
+2   |-from short import b
+3 3 | from loooooooooooooooooooooog import c
+
+

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_members.py.snap

@@ -0,0 +1,37 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+length_sort_non_ascii_members.py:1:1: I001 [*] Import block is un-sorted or un-formatted
+   |
+ 1 | / from module1 import (
+ 2 | |     loooooooooooooong,
+ 3 | |     σηορτ,
+ 4 | |     mediuuuuum,
+ 5 | |     shoort,
+ 6 | |     looooooooooooooong,
+ 7 | |     μεδιυυυυυμ,
+ 8 | |     short,
+ 9 | |     mediuuuuuum,
+10 | |     λοοοοοοοοοοοοοονγ,
+11 | | )
+   |
+   = help: Organize imports
+
+ℹ Safe fix
+1  1  | from module1 import (
+2     |-    loooooooooooooong,
+   2  |+    short,
+3  3  |     σηορτ,
+   4  |+    shoort,
+4  5  |     mediuuuuum,
+5     |-    shoort,
+6     |-    looooooooooooooong,
+7  6  |     μεδιυυυυυμ,
+8     |-    short,
+9  7  |     mediuuuuuum,
+   8  |+    loooooooooooooong,
+10 9  |     λοοοοοοοοοοοοοονγ,
+   10 |+    looooooooooooooong,
+11 11 | )
+
+

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_modules.py.snap

@@ -0,0 +1,32 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+length_sort_non_ascii_modules.py:1:1: I001 [*] Import block is un-sorted or un-formatted
+  |
+1 | / import loooooooooooooong
+2 | | import mediuuuuuum
+3 | | import short
+4 | | import σηορτ
+5 | | import shoort
+6 | | import mediuuuuum
+7 | | import λοοοοοοοοοοοοοονγ
+8 | | import μεδιυυυυυμ
+9 | | import looooooooooooooong
+  |
+  = help: Organize imports
+
+ℹ Safe fix
+1   |-import loooooooooooooong
+2   |-import mediuuuuuum
+3 1 | import short
+4 2 | import σηορτ
+5 3 | import shoort
+6 4 | import mediuuuuum
+  5 |+import μεδιυυυυυμ
+  6 |+import mediuuuuuum
+  7 |+import loooooooooooooong
+7 8 | import λοοοοοοοοοοοοοονγ
+8   |-import μεδιυυυυυμ
+9 9 | import looooooooooooooong
+
+

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_and_from_imports.py.snap

@@ -0,0 +1,26 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+length_sort_straight_and_from_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
+  |
+1 | / import mediuuuuuum
+2 | | import short
+3 | | import looooooooooooooooong
+4 | | from looooooooooooooong import a
+5 | | from mediuuuum import c
+6 | | from short import b
+  |
+  = help: Organize imports
+
+ℹ Safe fix
+  1 |+import short
+1 2 | import mediuuuuuum
+2   |-import short
+3 3 | import looooooooooooooooong
+4   |-from looooooooooooooong import a
+  4 |+from short import b
+5 5 | from mediuuuum import c
+6   |-from short import b
+  6 |+from looooooooooooooong import a
+
+

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_imports.py.snap

@@ -0,0 +1,21 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+length_sort_straight_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
+  |
+1 | / import mediuuuuuumb
+2 | | import short
+3 | | import looooooooooooooooong
+4 | | import mediuuuuuuma
+  |
+  = help: Organize imports
+
+ℹ Safe fix
+  1 |+import short
+  2 |+import mediuuuuuuma
+1 3 | import mediuuuuuumb
+2   |-import short
+3 4 | import looooooooooooooooong
+4   |-import mediuuuuuuma
+
+

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_with_relative_imports.py.snap

@@ -0,0 +1,28 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+length_sort_with_relative_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
+  |
+1 | / from ..looooooooooooooong import a
+2 | | from ...mediuuuum import b
+3 | | from .short import c
+4 | | from ....short import c
+5 | | from . import d
+6 | | from .mediuuuum import a
+7 | | from ......short import b
+  |
+  = help: Organize imports
+
+ℹ Safe fix
+1   |-from ..looooooooooooooong import a
+2   |-from ...mediuuuum import b
+  1 |+from . import d
+3 2 | from .short import c
+4 3 | from ....short import c
+5   |-from . import d
+6 4 | from .mediuuuum import a
+7 5 | from ......short import b
+  6 |+from ...mediuuuum import b
+  7 |+from ..looooooooooooooong import a
+
+

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_from_imports.py.snap

@@ -0,0 +1,18 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+length_sort_from_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
+  |
+1 | / from mediuuuuuuuuuuum import a
+2 | | from short import b
+3 | | from loooooooooooooooooooooog import c
+  |
+  = help: Organize imports
+
+ℹ Safe fix
+  1 |+from loooooooooooooooooooooog import c
+1 2 | from mediuuuuuuuuuuum import a
+2 3 | from short import b
+3   |-from loooooooooooooooooooooog import c
+
+

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_and_from_imports.py.snap

@@ -0,0 +1,23 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+length_sort_straight_and_from_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
+  |
+1 | / import mediuuuuuum
+2 | | import short
+3 | | import looooooooooooooooong
+4 | | from looooooooooooooong import a
+5 | | from mediuuuum import c
+6 | | from short import b
+  |
+  = help: Organize imports
+
+ℹ Safe fix
+  1 |+import short
+1 2 | import mediuuuuuum
+2   |-import short
+3 3 | import looooooooooooooooong
+4 4 | from looooooooooooooong import a
+5 5 | from mediuuuum import c
+
+

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_imports.py.snap

@@ -0,0 +1,21 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+length_sort_straight_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
+  |
+1 | / import mediuuuuuumb
+2 | | import short
+3 | | import looooooooooooooooong
+4 | | import mediuuuuuuma
+  |
+  = help: Organize imports
+
+ℹ Safe fix
+  1 |+import short
+  2 |+import mediuuuuuuma
+1 3 | import mediuuuuuumb
+2   |-import short
+3 4 | import looooooooooooooooong
+4   |-import mediuuuuuuma
+
+