Use BestFit layout even for attributes with a short name (#6872)

astral-sh · Aug 25, 2023 · 29a0c10 · 29a0c10
1 parent 15b7525
commit 29a0c10
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/unsplittable.py b/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/unsplittable.py
@@ -65,3 +65,8 @@ def test():
 
 m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.ManyToManyField(Person, blank=True)
 m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.ManyToManyFieldAttributeChainFieeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeld
+
+def test():
+ if True:
+ VLM_m2m = VLM.m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.through
+ allows_group_by_select_index = self.connection.features.allows_group_by_select_index
diff --git a/crates/ruff_python_formatter/src/expression/expr_attribute.rs b/crates/ruff_python_formatter/src/expression/expr_attribute.rs
@@ -153,6 +153,8 @@ impl NeedsParentheses for ExprAttribute {
  OptionalParentheses::Multiline
  } else if context.comments().has_dangling(self) {
  OptionalParentheses::Always
+ } else if self.value.is_name_expr() {
+ OptionalParentheses::BestFit
  } else {
  self.value.needs_parentheses(self.into(), context)
  }

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@expression__unsplittable.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@expression__unsplittable.py.snap
@@ -71,6 +71,11 @@ def test():
 
 m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.ManyToManyField(Person, blank=True)
 m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.ManyToManyFieldAttributeChainFieeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeld
+
+def test():
+ if True:
+ VLM_m2m = VLM.m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.through
+ allows_group_by_select_index = self.connection.features.allows_group_by_select_index
 ```
 
 ## Output
@@ -152,6 +157,16 @@ m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = (
  models.ManyToManyField(Person, blank=True)
 )
 m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.ManyToManyFieldAttributeChainFieeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeld
+
+
+def test():
+ if True:
+ VLM_m2m = (
+ VLM.m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.through
+ )
+ allows_group_by_select_index = (
+ self.connection.features.allows_group_by_select_index
+ )
 ```