Skip to content

Commit c32f943

Browse files
authored
Don't warn about magic trailing comma when isort.force-single-line is true (#8244)
## Summary Based on [this feedback](#8185 (comment)). Avoid warning about `force-wrap-aliases` and `split-on-trailing-comma` if `force-single-line` is true (which creates a dedicated import for each imported member). ## Test Plan Ran `ruff format . --no-cache` and verified that the warning show up when `force-single-line=false` and aren't shown when `force-single-line=true`
1 parent d211074 commit c32f943

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

crates/ruff_cli/src/commands/format.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,10 @@ pub(super) fn warn_incompatible_formatter_settings(
792792
}
793793

794794
// isort inserts a trailing comma which the formatter preserves, but only if `skip-magic-trailing-comma` isn't false.
795-
if setting.formatter.magic_trailing_comma.is_ignore() {
795+
// This isn't relevant when using `force-single-line`, since isort will never include a trailing comma in that case.
796+
if setting.formatter.magic_trailing_comma.is_ignore()
797+
&& !setting.linter.isort.force_single_line
798+
{
796799
if setting.linter.isort.force_wrap_aliases {
797800
warn!("The isort option `isort.force-wrap-aliases` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.force-wrap-aliases=false` or `format.skip-magic-trailing-comma=false`.");
798801
}

0 commit comments

Comments
 (0)