Use ruff line-length in format_dev #6870
Merged
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
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
PR Check ResultsBenchmarkLinuxWindows |
konstin
commented
Aug 25, 2023
konstin
commented
Aug 25, 2023
konstin
commented
Aug 25, 2023
|
|
||
| let settings = resolver.resolve(&path, pyproject_config); | ||
| // That's a bad way of doing this but it's not worth doing something better for format_dev | ||
| if settings.line_length != LineLength::default() { |
There was a problem hiding this comment.
Is this because you're trying to see if it's not the default? Why can't we just use settings.line_length? Because it will be wrong for projects in the formatter CI that use Black but not Ruff?
There was a problem hiding this comment.
yes, this only exists to have a (dummy) usage for the line length without breaking the formatter ecosystem checks
There was a problem hiding this comment.
Should Settings.line_length be an Option<LineLength> if that's something we want to distinguish?
konstin
force-pushed
the
line-length-in-format-dev
branch
from
340ebe3
to
87ed83b
Compare
konstin
force-pushed
the
line-length-in-format-dev
branch
from
87ed83b
to
716248b
Compare
konstin
requested review from
MichaReiser
and removed request for
MichaReiser
|
Please give this another look, this now only changes what's really needed for |
konstin
commented
Sep 5, 2023
crates/ruff_dev/src/format_dev.rs
Outdated
Comment on lines
554
to
555
| let line_width = LineWidth::try_from(settings.line_length.value()) | ||
| .expect("Configured line length is too large for the formatter"); |
There was a problem hiding this comment.
i still don't like this divergence
There was a problem hiding this comment.
You can do LineWidth::from(NonZeroU16::from(line_length)))
MichaReiser
approved these changes
Sep 5, 2023
crates/ruff_dev/src/format_dev.rs
Outdated
Comment on lines
554
to
555
| let line_width = LineWidth::try_from(settings.line_length.value()) | ||
| .expect("Configured line length is too large for the formatter"); |
There was a problem hiding this comment.
You can do LineWidth::from(NonZeroU16::from(line_length)))
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 Use the
[ruff]config line length setting in format_dev. This aligns it withruff format(originally, this was the prototype forruff format, but nowruff formatworks and we instead need to keepformat_devconsistent).