Change attribute comment placement to fix stability

crates/ruff_python_formatter/resources/test/fixtures/ruff/call_chains.py

@@ -12,11 +12,11 @@
  aaaa
 )
 
-blogs1 = Blog.objects.filter(entry__headline__contains="Lennon").filter(
+a1 = Blog.objects.filter(entry__headline__contains="Lennon").filter(
  entry__pub_date__year=2008
 )
 
-blogs2 = Blog.objects.filter(
+a2 = Blog.objects.filter(
  entry__headline__contains="Lennon",
 ).filter(
  entry__pub_date__year=2008,
@@ -47,15 +47,15 @@
 )
 
 # Break only after calls and indexing
-result = (
+b1 = (
  session.query(models.Customer.id)
  .filter(
  models.Customer.account_id == account_id, models.Customer.email == email_address
  )
  .count()
 )
 
-raise (
+b2 = (
  Blog.objects.filter(
  entry__headline__contains="Lennon",
  )
@@ -66,7 +66,7 @@
 )
 
 # Nested call chains
-blogs = (
+c1 = (
  Blog.objects.filter(
  entry__headline__contains="Lennon",
  ).filter(
@@ -80,3 +80,30 @@
  entry__pub_date__year=2010,
  )
 ).all()
+
+# Test different cases with trailing end of line comments:
+# * fluent style, fits: no parentheses -> ignore the expand_parent
+# * fluent style, doesn't fit: break all soft line breaks
+# * default, fits: no parentheses
+# * default, doesn't fit: parentheses but no soft line breaks
+
+# Fits, either style
+d11 = x.e().e().e() #
+d12 = (x.e().e().e()) #
+d13 = (
+ x.e() #
+ .e()
+ .e()
+)
+
+# Doesn't fit, default
+d2 = (
+ x.e().esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkfsdddd() #
+)
+
+# Doesn't fit, fluent style
+d3 = (
+ x.e() #
+ .esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk()
+ .esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk()
+)

crates/ruff_python_formatter/src/comments/placement.rs

@@ -945,15 +945,15 @@ fn handle_attribute_comment<'a>(
  .contains(comment.slice().start())
  );
  if comment.line_position().is_end_of_line() {
- // Attach to node with b
+ // Attach as trailing comment to a. The specific placement is only relevant for fluent style
  // ```python
  // x322 = (
  // a
  // . # end-of-line dot comment 2
  // b
  // )
  // ```
- CommentPlacement::trailing(comment.enclosing_node(), comment)
+ CommentPlacement::trailing(attribute.value.as_ref(), comment)
  } else {
  CommentPlacement::dangling(attribute, comment)
  }

crates/ruff_python_formatter/tests/snapshots/format@call_chains.py.snap

@@ -18,11 +18,11 @@ raise OsError(
  aaaa
 )
 
-blogs1 = Blog.objects.filter(entry__headline__contains="Lennon").filter(
+a1 = Blog.objects.filter(entry__headline__contains="Lennon").filter(
  entry__pub_date__year=2008
 )
 
-blogs2 = Blog.objects.filter(
+a2 = Blog.objects.filter(
  entry__headline__contains="Lennon",
 ).filter(
  entry__pub_date__year=2008,
@@ -53,15 +53,15 @@ raise OsError("sökdjffffsldkfjlhsakfjhalsökafhsöfdahsödfjösaaksjdllllllllll
 )
 
 # Break only after calls and indexing
-result = (
+b1 = (
  session.query(models.Customer.id)
  .filter(
  models.Customer.account_id == account_id, models.Customer.email == email_address
  )
  .count()
 )
 
-raise (
+b2 = (
  Blog.objects.filter(
  entry__headline__contains="Lennon",
  )
@@ -72,7 +72,7 @@ raise (
 )
 
 # Nested call chains
-blogs = (
+c1 = (
  Blog.objects.filter(
  entry__headline__contains="Lennon",
  ).filter(
@@ -86,6 +86,33 @@ blogs = (
  entry__pub_date__year=2010,
  )
 ).all()
+
+# Test different cases with trailing end of line comments:
+# * fluent style, fits: no parentheses -> ignore the expand_parent
+# * fluent style, doesn't fit: break all soft line breaks
+# * default, fits: no parentheses
+# * default, doesn't fit: parentheses but no soft line breaks
+
+# Fits, either style
+d11 = x.e().e().e() #
+d12 = (x.e().e().e()) #
+d13 = (
+ x.e() #
+ .e()
+ .e()
+)
+
+# Doesn't fit, default
+d2 = (
+ x.e().esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkfsdddd() #
+)
+
+# Doesn't fit, fluent style
+d3 = (
+ x.e() #
+ .esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk()
+ .esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk()
+)
 ```
 
 ## Output
@@ -102,11 +129,11 @@ raise OsError(
  aksjdhflsakhdflkjsadlfajkslhfdkjsaldajlahflashdfljahlfksajlhfajfjfsaahflakjslhdfkjalhdskjfa
 ).a(aaaa)
 
-blogs1 = Blog.objects.filter(entry__headline__contains="Lennon").filter(
+a1 = Blog.objects.filter(entry__headline__contains="Lennon").filter(
  entry__pub_date__year=2008
 )
 
-blogs2 = Blog.objects.filter(
+a2 = Blog.objects.filter(
  entry__headline__contains="Lennon",
 ).filter(
  entry__pub_date__year=2008,
@@ -137,15 +164,15 @@ raise OsError("sökdjffffsldkfjlhsakfjhalsökafhsöfdahsödfjösaaksjdllllllllll
 )
 
 # Break only after calls and indexing
-result = (
+b1 = (
  session.query(models.Customer.id)
  .filter(
  models.Customer.account_id == account_id, models.Customer.email == email_address
  )
  .count()
 )
 
-raise (
+b2 = (
  Blog.objects.filter(
  entry__headline__contains="Lennon",
  )
@@ -156,7 +183,7 @@ raise (
 )
 
 # Nested call chains
-blogs = (
+c1 = (
  Blog.objects.filter(
  entry__headline__contains="Lennon",
  ).filter(
@@ -170,6 +197,31 @@ blogs = (
  entry__pub_date__year=2010,
  )
 ).all()
+
+# Test different cases with trailing end of line comments:
+# * fluent style, fits: no parentheses -> ignore the expand_parent
+# * fluent style, doesn't fit: break all soft line breaks
+# * default, fits: no parentheses
+# * default, doesn't fit: parentheses but no soft line breaks
+
+# Fits, either style
+d11 = x.e().e().e() #
+d12 = x.e().e().e() #
+d13 = (
+ x.e() #
+ .e()
+ .e()
+)
+
+# Doesn't fit, default
+d2 = x.e().esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkfsdddd() #
+
+# Doesn't fit, fluent style
+d3 = (
+ x.e() #
+ .esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk()
+ .esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk()
+)
 ```
 
 

crates/ruff_python_formatter/tests/snapshots/format@expression__attribute.py.snap

@@ -141,10 +141,10 @@ a = Namespace()
 
 
 (
- a.
+ a. # trailing dot comment
  # comment
  # in between
- b # trailing dot comment # trailing identifier comment
+ b # trailing identifier comment
 )
 
 
@@ -155,10 +155,10 @@ a.aaaaaaaaaaaaaaaaaaaaa.lllllllllllllllllllllllllllloooooooooong.chaaaaaaaaaaaaa
 # chain if and only if we need them, that is if there are own line comments inside
 # the chain.
 x1 = (
- a.b.
+ a.b. # comment 2
  # comment 1
  # comment 3
- c.d # comment 2
+ c.d
 )
 
 x20 = a.b