diff --git a/crates/ruff/src/rules/isort/rules/organize_imports.rs b/crates/ruff/src/rules/isort/rules/organize_imports.rs index ab79ecbda0..7e63d2280f 100644 --- a/crates/ruff/src/rules/isort/rules/organize_imports.rs +++ b/crates/ruff/src/rules/isort/rules/organize_imports.rs @@ -147,16 +147,15 @@ pub(crate) fn organize_imports( let range = TextRange::new(locator.line_start(range.start()), trailing_line_end); let actual = locator.slice(range); if matches_ignoring_indentation(actual, &expected) { - None - } else { - let mut diagnostic = Diagnostic::new(UnsortedImports, range); - if settings.rules.should_fix(diagnostic.kind.rule()) { - #[allow(deprecated)] - diagnostic.set_fix(Fix::unspecified(Edit::range_replacement( - indent(&expected, indentation), - range, - ))); - } - Some(diagnostic) + return None; } + + let mut diagnostic = Diagnostic::new(UnsortedImports, range); + if settings.rules.should_fix(diagnostic.kind.rule()) { + diagnostic.set_fix(Fix::automatic(Edit::range_replacement( + indent(&expected, indentation), + range, + ))); + } + Some(diagnostic) } diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap index 4f17260e63..41e6eb47f6 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap @@ -14,7 +14,7 @@ separate_subpackage_first_and_third_party_imports.py:1:1: I001 [*] Import block | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | import sys 2 |+ 3 |+import foo diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap index 0173d5e76c..fbf2a1df8d 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap @@ -14,7 +14,7 @@ separate_subpackage_first_and_third_party_imports.py:1:1: I001 [*] Import block | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | import sys 2 |+ 2 3 | import baz diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__add_newline_before_comments.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__add_newline_before_comments.py.snap index 1b87be91b5..8089cce5f5 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__add_newline_before_comments.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__add_newline_before_comments.py.snap @@ -13,7 +13,7 @@ add_newline_before_comments.py:1:1: I001 [*] Import block is un-sorted or un-for | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | import os 2 |+ 2 3 | # This is a comment in the same section, so we need to add one newline. diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__as_imports_comments.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__as_imports_comments.py.snap index cd4923d5dc..572fada48a 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__as_imports_comments.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__as_imports_comments.py.snap @@ -21,7 +21,7 @@ as_imports_comments.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from foo import ( # Comment on `foo` 2 |- Member as Alias, # Comment on `Alias` 3 |-) diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap index 69903f1791..920a8da11a 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap @@ -9,7 +9,7 @@ relative_imports_order.py:1:1: I001 [*] Import block is un-sorted or un-formatte | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |+from . import c 2 |+from .. import b 1 3 | from ... import a diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports.py.snap index 38148d302f..ae83cbda38 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports.py.snap @@ -10,7 +10,7 @@ combine_as_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |+from module import CONSTANT, function 1 2 | from module import Class as C 2 |-from module import CONSTANT diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap index 5c2c3f89d2..7460bca867 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap @@ -10,7 +10,7 @@ combine_as_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from module import Class as C 2 |-from module import CONSTANT 3 |-from module import function diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_import_from.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_import_from.py.snap index 6a325c2dc6..998a4bb3d8 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_import_from.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_import_from.py.snap @@ -11,7 +11,7 @@ combine_import_from.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from collections import Awaitable 2 |-from collections import AsyncIterable 3 |-from collections import Collection diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__comments.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__comments.py.snap index b639dd59cb..73b07a1de8 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__comments.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__comments.py.snap @@ -39,7 +39,7 @@ comments.py:3:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | # Comment 1 2 2 | # Comment 2 3 |-import D diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__deduplicate_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__deduplicate_imports.py.snap index eb896ed975..04805215be 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__deduplicate_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__deduplicate_imports.py.snap @@ -10,7 +10,7 @@ deduplicate_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | import os 2 |-import os 3 2 | import os as os1 diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length.py.snap index ae9b9934b8..d6355c64d9 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length.py.snap @@ -15,7 +15,7 @@ fit_line_length.py:7:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 5 5 | 6 6 | if indented: 7 7 | from line_with_88 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length_comment.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length_comment.py.snap index 20c420373d..9b4bae938a 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length_comment.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length_comment.py.snap @@ -14,7 +14,7 @@ fit_line_length_comment.py:1:1: I001 [*] Import block is un-sorted or un-formatt | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | import a 2 |+ 2 3 | # Don't take this comment into account when determining whether the next import can fit on one line. diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_single_line_force_single_line.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_single_line_force_single_line.py.snap index 1d042dfcf8..c7247981b9 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_single_line_force_single_line.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_single_line_force_single_line.py.snap @@ -33,7 +33,7 @@ force_single_line.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-import sys, math 2 |-from os import path, uname 1 |+import math diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections.py.snap index 5d66208de7..6d018eb2e3 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections.py.snap @@ -19,7 +19,7 @@ force_sort_within_sections.py:1:1: I001 [*] Import block is un-sorted or un-form | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from a import a1 # import_from 2 |-from c import * # import_from_star 3 1 | import a # import diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap index cb9acf0d4e..a306bd2cf2 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap @@ -19,7 +19,7 @@ force_sort_within_sections.py:1:1: I001 [*] Import block is un-sorted or un-form | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from a import a1 # import_from 2 |-from c import * # import_from_star 1 |+import z diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top.py.snap index 96167fd8d6..26418b34ad 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top.py.snap @@ -29,7 +29,7 @@ force_to_top.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-import lib6 1 |+import foo 2 |+import lib1 diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top_force_to_top.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top_force_to_top.py.snap index cfc5a7fc8b..229aef46ee 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top_force_to_top.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top_force_to_top.py.snap @@ -29,7 +29,7 @@ force_to_top.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-import lib6 2 |-import lib2 3 |-import lib5 diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases.py.snap index 0c6448490a..7c1ab3dfdf 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases.py.snap @@ -9,7 +9,7 @@ force_wrap_aliases.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from .a import a1 as a1, a2 as a2 1 |+from .a import a1 as a1 2 |+from .a import a2 as a2 diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap index eb0b782623..e2bef255ce 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap @@ -9,7 +9,7 @@ force_wrap_aliases.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from .a import a1 as a1, a2 as a2 1 |+from .a import ( 2 |+ a1 as a1, diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__forced_separate.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__forced_separate.py.snap index 0af334c239..58a69f38ac 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__forced_separate.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__forced_separate.py.snap @@ -14,7 +14,7 @@ forced_separate.py:3:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | # office_helper and tests are both first-party, 2 2 | # but we want tests and experiments to be separated, in that order 3 |+from office_helper.assistants import entity_registry as er diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__import_from_after_import.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__import_from_after_import.py.snap index cbcf20291c..53a884c3e5 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__import_from_after_import.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__import_from_after_import.py.snap @@ -8,7 +8,7 @@ import_from_after_import.py:1:1: I001 [*] Import block is un-sorted or un-format | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |+import os 1 2 | from collections import Collection 2 |-import os diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__inline_comments.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__inline_comments.py.snap index 905c7decec..5e7526984b 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__inline_comments.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__inline_comments.py.snap @@ -17,7 +17,7 @@ inline_comments.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | from a.prometheus.metrics import ( # type:ignore[attr-defined] 2 2 | TERMINAL_CURRENTLY_RUNNING_TOTAL, 3 3 | ) diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.py.snap index da9d97ef54..737b1c8af3 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.py.snap @@ -12,7 +12,7 @@ insert_empty_lines.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | import a 2 2 | import b 3 |+ @@ -33,7 +33,7 @@ insert_empty_lines.py:4:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 3 3 | x = 1 4 4 | import os 5 5 | import sys @@ -56,7 +56,7 @@ insert_empty_lines.py:14:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 13 13 | y = 1 14 14 | import os 15 15 | import sys @@ -76,7 +76,7 @@ insert_empty_lines.py:52:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 51 51 | 52 52 | import os 53 53 | diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.pyi.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.pyi.snap index f788459397..94b08d048d 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.pyi.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.pyi.snap @@ -12,7 +12,7 @@ insert_empty_lines.pyi:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | import a 2 2 | import b 3 |+ @@ -33,7 +33,7 @@ insert_empty_lines.pyi:4:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 3 3 | x = 1 4 4 | import os 5 5 | import sys @@ -55,7 +55,7 @@ insert_empty_lines.pyi:14:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 13 13 | y = 1 14 14 | import os 15 15 | import sys diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap index 1af3a0949f..c46c4efd56 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap @@ -11,7 +11,7 @@ separate_local_folder_imports.py:1:1: I001 [*] Import block is un-sorted or un-f | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |+import os 1 2 | import sys 3 |+ diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap index a28d7c0d9d..d49496d35a 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap @@ -19,7 +19,7 @@ lines_after_imports_class_after.py:1:1: I001 [*] Import block is un-sorted or un | = help: Organize imports -ℹ Suggested fix +ℹ Fix 2 2 | 3 3 | from typing import Any 4 4 | diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap index 106ea36452..dc6bc6c11f 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap @@ -29,7 +29,7 @@ lines_after_imports_func_after.py:1:1: I001 [*] Import block is un-sorted or un- | = help: Organize imports -ℹ Suggested fix +ℹ Fix 2 2 | 3 3 | from typing import Any 4 4 | diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap index 0f28da7ed4..aa2fbb6995 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap @@ -15,7 +15,7 @@ lines_after_imports_nothing_after.py:1:1: I001 [*] Import block is un-sorted or | = help: Organize imports -ℹ Suggested fix +ℹ Fix 2 2 | 3 3 | from typing import Any 4 4 | diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_between_typeslines_between_types.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_between_typeslines_between_types.py.snap index 730779d08a..500a265589 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_between_typeslines_between_types.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_between_typeslines_between_types.py.snap @@ -22,7 +22,7 @@ lines_between_types.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 9 9 | import requests 10 10 | 11 11 | diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__magic_trailing_comma.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__magic_trailing_comma.py.snap index 43209c1082..c43bfa3b76 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__magic_trailing_comma.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__magic_trailing_comma.py.snap @@ -44,7 +44,7 @@ magic_trailing_comma.py:2:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | # This has a magic trailing comma, will be sorted, but not rolled into one line 2 |-from sys import ( 3 |- stderr, diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__natural_order.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__natural_order.py.snap index d001d7922a..b7d3150fa1 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__natural_order.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__natural_order.py.snap @@ -22,7 +22,7 @@ natural_order.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | import numpy1 2 |+import numpy2 2 3 | import numpy10 diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py.snap index ab81767a33..f7ff0486df 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py.snap @@ -15,7 +15,7 @@ no_lines_before.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 2 2 | 3 3 | from typing import Any 4 4 | diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap index ef9df01284..635fcda159 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap @@ -15,7 +15,7 @@ no_lines_before.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | from __future__ import annotations 2 |- 3 2 | from typing import Any diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap index 481c39c1e2..bcc68488ee 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap @@ -9,7 +9,7 @@ no_lines_before_with_empty_sections.py:1:1: I001 [*] Import block is un-sorted o | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | from __future__ import annotations 2 2 | from typing import Any 3 |+ diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_wrap_star.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_wrap_star.py.snap index 456bde70ff..2eb7630eb8 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_wrap_star.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_wrap_star.py.snap @@ -7,7 +7,7 @@ no_wrap_star.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from .subscription import * # type: ignore # some very long comment explaining why this needs a type ignore 1 |+from .subscription import * # type: ignore # some very long comment explaining why this needs a type ignore diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type.py.snap index c3bec94c1a..76e6484c72 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type.py.snap @@ -18,7 +18,7 @@ order_by_type.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-import StringIO 2 1 | import glob 3 2 | import os diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_false_order_by_type.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_false_order_by_type.py.snap index 1068a1c6d4..4f2c173898 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_false_order_by_type.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_false_order_by_type.py.snap @@ -18,7 +18,7 @@ order_by_type.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-import StringIO 2 1 | import glob 3 2 | import os diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes.py.snap index 4593956447..902db7014b 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes.py.snap @@ -10,7 +10,7 @@ order_by_type_with_custom_classes.py:1:1: I001 [*] Import block is un-sorted or | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from sklearn.svm import func, SVC, CONST, Klass 2 |-from subprocess import N_CLASS, PIPE, Popen, STDOUT 3 |-from module import CLASS, Class, CONSTANT, function, BASIC, Apple diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap index 7956cfb365..7147189148 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap @@ -10,7 +10,7 @@ order_by_type_with_custom_classes.py:1:1: I001 [*] Import block is un-sorted or | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from sklearn.svm import func, SVC, CONST, Klass 2 |-from subprocess import N_CLASS, PIPE, Popen, STDOUT 3 |-from module import CLASS, Class, CONSTANT, function, BASIC, Apple diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants.py.snap index e3e6a75772..0a616fa8a1 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants.py.snap @@ -8,7 +8,7 @@ order_by_type_with_custom_constants.py:1:1: I001 [*] Import block is un-sorted o | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from sklearn.svm import XYZ, func, variable, Const, Klass, constant 2 |-from subprocess import First, var, func, Class, konst, A_constant, Last, STDOUT 1 |+from subprocess import STDOUT, A_constant, Class, First, Last, func, konst, var diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap index eca6e9541c..aade3e18a2 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap @@ -8,7 +8,7 @@ order_by_type_with_custom_constants.py:1:1: I001 [*] Import block is un-sorted o | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from sklearn.svm import XYZ, func, variable, Const, Klass, constant 2 |-from subprocess import First, var, func, Class, konst, A_constant, Last, STDOUT 1 |+from subprocess import A_constant, First, konst, Last, STDOUT, Class, func, var diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables.py.snap index 80f41f0b1b..4ac3df49ca 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables.py.snap @@ -8,7 +8,7 @@ order_by_type_with_custom_variables.py:1:1: I001 [*] Import block is un-sorted o | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from sklearn.svm import VAR, Class, MyVar, CONST, abc 2 |-from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe 1 |+from subprocess import CONSTANT, Klass, Variable, exe, utils, var_ABC diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap index 885e9af2bb..002a187b45 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap @@ -8,7 +8,7 @@ order_by_type_with_custom_variables.py:1:1: I001 [*] Import block is un-sorted o | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from sklearn.svm import VAR, Class, MyVar, CONST, abc 2 |-from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe 1 |+from subprocess import CONSTANT, Klass, exe, utils, var_ABC, Variable diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_relative_imports_by_level.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_relative_imports_by_level.py.snap index 1880d3acf2..75940c7d49 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_relative_imports_by_level.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_relative_imports_by_level.py.snap @@ -10,7 +10,7 @@ order_relative_imports_by_level.py:1:1: I001 [*] Import block is un-sorted or un | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from .a import a 2 1 | from ..a import a 3 2 | from ..b import a diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_comment_order.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_comment_order.py.snap index ad469236e6..0a8c62f4b3 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_comment_order.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_comment_order.py.snap @@ -17,7 +17,7 @@ preserve_comment_order.py:1:1: I001 [*] Import block is un-sorted or un-formatte | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |+import abc 1 2 | import io 3 |+ diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_import_star.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_import_star.py.snap index fd4e61e73a..d640a69905 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_import_star.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_import_star.py.snap @@ -12,7 +12,7 @@ preserve_import_star.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from some_other_module import some_class 2 |-from some_other_module import * 3 1 | # Above diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_indentation.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_indentation.py.snap index fe4aa19b25..ed2de4324c 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_indentation.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_indentation.py.snap @@ -13,7 +13,7 @@ preserve_indentation.py:2:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | if True: 2 |+ import os 2 3 | import sys @@ -31,7 +31,7 @@ preserve_indentation.py:5:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 2 2 | import sys 3 3 | import os 4 4 | else: diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap index 829d46b80b..154e06dbc9 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap @@ -10,7 +10,7 @@ propagate_inline_comments.py:1:1: I001 [*] Import block is un-sorted or un-forma | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | from mypackage.subpackage import ( # long comment that seems to be a problem 2 2 | a_long_variable_name_that_causes_problems, 3 |- items, diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__reorder_within_section.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__reorder_within_section.py.snap index 4c595add0c..c8b39c3378 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__reorder_within_section.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__reorder_within_section.py.snap @@ -8,7 +8,7 @@ reorder_within_section.py:1:1: I001 [*] Import block is un-sorted or un-formatte | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |+import os 1 2 | import sys 2 |-import os diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__section_order_sections.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__section_order_sections.py.snap index 9c56da2249..accc2bec47 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__section_order_sections.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__section_order_sections.py.snap @@ -13,7 +13,7 @@ sections.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | from __future__ import annotations 2 |+ 2 3 | import os diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sections_sections.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sections_sections.py.snap index e594cb563d..44a174f26b 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sections_sections.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sections_sections.py.snap @@ -13,7 +13,7 @@ sections.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | from __future__ import annotations 2 |+ 2 3 | import os diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_first_party_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_first_party_imports.py.snap index 1d79b820f0..4152577a2b 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_first_party_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_first_party_imports.py.snap @@ -11,7 +11,7 @@ separate_first_party_imports.py:1:1: I001 [*] Import block is un-sorted or un-fo | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |+import os 1 2 | import sys 3 |+ diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_future_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_future_imports.py.snap index c80e025a20..35071c595f 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_future_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_future_imports.py.snap @@ -9,7 +9,7 @@ separate_future_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatt | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-import sys 2 |-import os 3 1 | from __future__ import annotations diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_local_folder_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_local_folder_imports.py.snap index 512687da97..50a99dc995 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_local_folder_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_local_folder_imports.py.snap @@ -11,7 +11,7 @@ separate_local_folder_imports.py:1:1: I001 [*] Import block is un-sorted or un-f | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |+import os 1 2 | import sys 3 |+ diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_third_party_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_third_party_imports.py.snap index f4bbd525d4..93364da9d2 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_third_party_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_third_party_imports.py.snap @@ -10,7 +10,7 @@ separate_third_party_imports.py:1:1: I001 [*] Import block is un-sorted or un-fo | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-import pandas as pd 1 |+import os 2 2 | import sys diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__skip.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__skip.py.snap index ec609bca13..02bea0868e 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__skip.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__skip.py.snap @@ -14,7 +14,7 @@ skip.py:20:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 17 17 | def f(): 18 18 | import sys 19 19 | import os # isort: skip @@ -34,7 +34,7 @@ skip.py:27:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 24 24 | def f(): 25 25 | import sys 26 26 | import os # isort:skip diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sort_similar_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sort_similar_imports.py.snap index 3cd427ec13..7de30d7bc5 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sort_similar_imports.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sort_similar_imports.py.snap @@ -32,7 +32,7 @@ sort_similar_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 |-from a import b 1 |+import A 2 |+import a diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split.py.snap index 4168c74208..080e5b7bc0 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split.py.snap @@ -12,7 +12,7 @@ split.py:15:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 12 12 | import b 13 13 | 14 14 | if True: @@ -32,7 +32,7 @@ split.py:20:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 17 17 | 18 18 | # isort: split 19 19 | diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap index 820b50e85e..8a49442fb0 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap @@ -44,7 +44,7 @@ magic_trailing_comma.py:2:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | # This has a magic trailing comma, will be sorted, but not rolled into one line 2 |-from sys import ( 3 |- stderr, diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__star_before_others.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__star_before_others.py.snap index 716293803c..fc46ab5b8d 100644 --- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__star_before_others.py.snap +++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__star_before_others.py.snap @@ -9,7 +9,7 @@ star_before_others.py:1:1: I001 [*] Import block is un-sorted or un-formatted | = help: Organize imports -ℹ Suggested fix +ℹ Fix 1 1 | from .logging import config_logging 2 |+from .settings import * 2 3 | from .settings import ENV