fix(formatter): missing comment handling for end-of-line comments in member chains (#17659)

close: #17570

Author: Dunqing

crates/oxc_formatter/src/formatter/comments.rs

@@ -182,7 +182,7 @@ impl<'a> Comments<'a> {
 
     /// Returns end-of-line comments that are after the given position (excluding printed ones).
     pub fn end_of_line_comments_after(&self, mut pos: u32) -> &'a [Comment] {
-        let comments = self.unprinted_comments();
+        let comments = self.comments_after(pos);
         for (index, comment) in comments.iter().enumerate() {
             if self.source_text.all_bytes_match(pos, comment.span.start, |b| {
                 matches!(b, b'\t' | b' ' | b'=' | b':')
@@ -248,6 +248,10 @@ impl<'a> Comments<'a> {
         self.comments_before_iter(start).any(|comment| comment.followed_by_newline())
     }
 
+    pub fn has_end_of_line_comment_after(&self, pos: u32) -> bool {
+        !self.end_of_line_comments_after(pos).is_empty()
+    }
+
     /// **Critical method**: Advances the printed cursor by one.
     ///
     /// This MUST be called after formatting each comment to maintain system integrity.

crates/oxc_formatter/src/utils/member_chain/mod.rs

@@ -8,7 +8,7 @@ use crate::{
     JsLabels,
     ast_nodes::{AstNode, AstNodes},
     best_fitting,
-    formatter::{Buffer, Format, Formatter, prelude::*},
+    formatter::{Buffer, Comments, Format, Formatter, prelude::*},
     utils::{
         is_long_curried_call,
         member_chain::{
@@ -72,14 +72,10 @@ impl<'a, 'b> MemberChain<'a, 'b> {
             return false;
         };
 
-        let has_comment = first_group.members().first().is_some_and(|member| {
-            matches!(member, ChainMember::StaticMember(expression)
-                if f.context().comments().has_comment_in_range(
-                    expression.object().span().end,
-                    expression.property().span.start
-                )
-            )
-        });
+        let has_comment = first_group
+            .members()
+            .first()
+            .is_some_and(|member| Self::has_comment_in_member(member, f.comments()));
 
         if has_comment {
             return false;
@@ -179,15 +175,20 @@ impl<'a, 'b> MemberChain<'a, 'b> {
         self.head.members().iter().chain(self.tail.members())
     }
 
+    /// Check if a member has comments between object and property or end-of-line comments after it
+    fn has_comment_in_member(member: &ChainMember, comments: &Comments) -> bool {
+        matches!(
+            member,
+            ChainMember::StaticMember(member)
+                if comments.has_comment_in_range(member.object().span().end, member.property().span.start) || comments.has_end_of_line_comment_after(member.span.end)
+        )
+    }
+
     fn has_comment(&self, f: &Formatter<'_, 'a>) -> bool {
         let comments = f.comments();
 
         for member in self.members() {
-            if matches!(
-                member,
-                ChainMember::StaticMember(member)
-                    if comments.has_comment_in_range(member.object().span().end, member.property().span.start)
-            ) {
+            if Self::has_comment_in_member(member, comments) {
                 return true;
             }
         }

crates/oxc_formatter/tests/fixtures/ts/member-chains/issue-17570.ts.snap

@@ -20,22 +20,34 @@ getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */
 ------------------
 { printWidth: 80 }
 ------------------
-this.getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */?.();
+this
+  .getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */
+  ?.();
 
-this.getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */?.();
+this
+  .getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */
+  ?.();
 
-foo.getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */?.();
+foo
+  .getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */
+  ?.();
 
 getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */?.();
 
 -------------------
 { printWidth: 100 }
 -------------------
-this.getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */?.();
+this
+  .getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */
+  ?.();
 
-this.getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */?.();
+this
+  .getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */
+  ?.();
 
-foo.getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */?.();
+foo
+  .getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */
+  ?.();
 
 getParameters /* xxxxxxxxxxxxxxxxxxxxxxxxxxxx */?.();