[isort] Omit trailing whitespace in unsorted-imports (I001)
#15518
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Questions:
|
|
| code | total | + violation | - violation | + fix | - fix |
|---|---|---|---|---|---|
| I001 | 10 | 5 | 5 | 0 | 0 |
Linter (preview)
ℹ️ ecosystem check detected linter changes. (+5 -5 violations, +0 -0 fixes in 1 projects; 54 projects unchanged)
bokeh/bokeh (+5 -5 violations, +0 -0 fixes)
ruff check --no-cache --exit-zero --ignore RUF9 --no-fix --output-format concise --preview --select ALL
- examples/server/app/gapminder/data.py:5:1: I001 [*] Import block is un-sorted or un-formatted + examples/server/app/gapminder/data.py:5:5: I001 [*] Import block is un-sorted or un-formatted - src/bokeh/model/model.py:46:1: I001 [*] Import block is un-sorted or un-formatted + src/bokeh/model/model.py:46:5: I001 [*] Import block is un-sorted or un-formatted - src/bokeh/model/util.py:167:1: I001 [*] Import block is un-sorted or un-formatted + src/bokeh/model/util.py:167:5: I001 [*] Import block is un-sorted or un-formatted - src/bokeh/server/connection.py:28:1: I001 [*] Import block is un-sorted or un-formatted + src/bokeh/server/connection.py:28:5: I001 [*] Import block is un-sorted or un-formatted - tests/test_cross.py:34:1: I001 [*] Import block is un-sorted or un-formatted + tests/test_cross.py:34:5: I001 [*] Import block is un-sorted or un-formatted
Changes by rule (1 rules affected)
| code | total | + violation | - violation | + fix | - fix |
|---|---|---|---|---|---|
| I001 | 10 | 5 | 5 | 0 | 0 |
MichaReiser
reviewed
Jan 16, 2025
| @@ -30,7 +30,7 @@ force_single_line.py:1:1: I001 [*] Import block is un-sorted or un-formatted | |||
| 25 | | | |||
| 26 | | # comment 9 | |||
| 27 | | from baz import * # comment 10 | |||
There was a problem hiding this comment.
Not strictly incorrect but I think I liked the old one better
There was a problem hiding this comment.
I think I like the new one since it's a little more specific. But I do feel like the old one is more aesthetically pleasing.
BurntSushi
reviewed
Jan 16, 2025
| @@ -30,7 +30,7 @@ force_single_line.py:1:1: I001 [*] Import block is un-sorted or un-formatted | |||
| 25 | | | |||
| 26 | | # comment 9 | |||
| 27 | | from baz import * # comment 10 | |||
There was a problem hiding this comment.
I think I like the new one since it's a little more specific. But I do feel like the old one is more aesthetically pleasing.
| 7 | | from my_first_party import my_first_party_object | ||
| 8 | | | ||
| 9 | | from . import my_local_folder_object | ||
| | |____________________________________^ I001 |
| | | ||
| 32 | import sys; import os # isort:skip | ||
| 33 | import sys; import os # isort:skip # isort:skip | ||
| 34 | import sys; import os | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^ I001 | ||
| | ^^^^^^^^^^^^^^^^^^^^^ I001 |
There was a problem hiding this comment.
Another nice improvement I think.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
The fix range for sorting imports accounts for trailing whitespace, but we should only show the trimmed range to the user when displaying the diagnostic. So this PR changes the diagnostic range.
Closes #15504
Test Plan
Reviewed snapshot changes