fix(formatter): decorators and class method on the same line shouldn't be broken by a leading comment of the method #15029

Dunqing · 2025-10-28T07:01:31Z

No description provided.

Dunqing · 2025-10-28T07:01:47Z

perf(formatter): optimize grouping logic for call arguments #15033
fix(formatter): correct calculating layout for TSNonNullExpression in StaticMemberExpression #15065
fix(formatter): print parenthesis for sequence expression in ReturnStatement and ExpressionStatement #15062
fix(formatter): correct printing comments for TSAsExpression #15061
fix(formatter): correct checking of the short argument for CallArguments #15055
fix(formatter): print comments before fat arrow as-is for ArrowFunctionExpression #15050
fix(formatter): should hug parameter with TSMappedType type annotation #15049
fix(formatter): incorrect formatting of a function with this parameter #15031
refactor(formatter): simplify printing ClassElement with a semicolon #15030
fix(formatter): decorators and class method on the same line shouldn't be broken by a leading comment of the method #15029 👈 (View in Graphite)
main

How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

0-merge - adds this PR to the back of the merge queue
hotfix - for urgent hot fixes, skip the queue and merge this PR next

You must have a Graphite account in order to use the merge queue. Sign up using this link.

_{An organization admin has enabled the Graphite Merge Queue in this repository.} _{Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.}

This stack of pull requests is managed by Graphite. Learn more about stacking.

codspeed-hq · 2025-10-28T07:07:06Z

CodSpeed Performance Report

Merging #15029 will not alter performance

_{Comparing 10-28-fix_formatter_decorators_and_class_method_on_the_same_line_shouldn_t_be_broken_by_a_leading_comment_of_the_method (7105e06) with main (43d74e4)}

Summary

✅ 33 untouched
⏩ 4 skipped¹

4 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩

Copilot

Pull Request Overview

This PR refactors decorator formatting to handle leading comments at the decorator list level rather than at individual decorator level. The change ensures that comments before decorators are properly attached to the decorator group when formatting class elements (methods, properties, and accessors).

Key changes:

Removed leading comment formatting from individual decorators
Moved decorator formatting calls from the generic class element handler to specific element type handlers
Simplified class element formatting logic by removing the match statement

Reviewed Changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
`crates/oxc_formatter/src/write/decorators.rs`	Removed `format_leading_comments` call from individual decorator formatting
`crates/oxc_formatter/src/write/class.rs`	Moved decorator formatting to specific element handlers (MethodDefinition, AccessorProperty) and simplified generic element formatter
`crates/oxc_formatter/src/utils/assignment_like.rs`	Added decorator formatting to PropertyDefinition handling
`crates/oxc_formatter/tests/fixtures/ts/class/decorators.ts`	Added test case verifying comment handling with decorators
`crates/oxc_formatter/tests/fixtures/ts/class/decorators.ts.snap`	Expected output snapshot for the test case

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

graphite-app · 2025-10-29T15:46:00Z

Merge activity

Oct 29, 3:45 PM UTC: Dunqing added this pull request to the Graphite merge queue.
Oct 29, 3:52 PM UTC: Merged by the Graphite merge queue.

…t be broken by a leading comment of the method (#15029)

## [0.9.0] - 2025-10-30 ### 🚀 Features - 8fe7e85 formatter: Support printing Formatter IR (#14855) (Dunqing) ### 🐛 Bug Fixes - a6b6ef8 formatter: Correct calculating layout for `TSNonNullExpression` in `StaticMemberExpression` (#15065) (Dunqing) - 99bd995 formatter: Print parenthesis for sequence expression in `ReturnStatement` and `ExpressionStatement` (#15062) (Dunqing) - f3fb998 formatter: Correct printing comments for `TSAsExpression` (#15061) (Dunqing) - 1e4a018 formatter: Correct checking of the short argument for `CallArguments` (#15055) (Dunqing) - c0dfd9b formatter: Print comments before fat arrow as-is for `ArrowFunctionExpression` (#15050) (Dunqing) - 206b519 formatter: Should hug parameter with `TSMappedType` type annotation (#15049) (Dunqing) - e48c604 formatter: Incorrect formatting of a function with `this` parameter (#15031) (Dunqing) - a9f0c45 formatter: Decorators and class method on the same line shouldn't be broken by a leading comment of the method (#15029) (Dunqing) - 43d74e4 formatter: Handle `<CRLF>` for `SourceText` (#15016) (leaysgur) - 34fab40 formatter: Correct calculating layout for `ChainExpression` in `StaticMemberExpression` (#14986) (Dunqing) - 68dc101 formatter: Should not break when the parent of root of `StaticMemberExpression` is used as the `Argument` of `NewExpression` (#14985) (Dunqing) - 071b739 formatter: Align the short argument handling for UnaryExpression with Prettier (#14984) (Dunqing) - 3940f3a formatter: `BestFitting` doesn't exactly matches the `conditinalGroup` behavior in Prettier (#14983) (Dunqing) - 4a84e44 formatter: Align the logic of printing type parameters, parameters, and return type for functions with Prettier (#14942) (Dunqing) - 68c1f2a formatter: Non-nested static member expressions will never break (#14929) (Dunqing) - 42adc47 formatter: Check whether a type alias is complex when its right hand side never break (#14928) (Dunqing) - e501f13 formatter: Should not add a trailing comma for long curried calls when `trailingComma` is es5 (#14913) (Dunqing) ### 🚜 Refactor - 7d64291 formatter: Simplify printing ClassElement with a semicolon (#15030) (Dunqing) - 5de99c2 formatter: Export unified way to get_parse_options (#15027) (leaysgur) - f6f22e2 formatter: Clean up unneeded implementations for printing comments (#14935) (Dunqing) - 7a2b9d1 formatter: Improve printing trailing comments (#14934) (Dunqing) - ba10caa formatter: Align printing trailing comments with Prettier (#14927) (Dunqing) - 597c9e8 formatter: Remove redundunt public API (#14915) (leaysgur) ### ⚡ Performance - 467b3a1 formatter: Optimize grouping logic for call arguments (#15033) (Dunqing) Co-authored-by: leaysgur <6259812+leaysgur@users.noreply.github.com>

## [0.9.0] - 2025-10-30 ### 🚀 Features - 8fe7e85 formatter: Support printing Formatter IR (#14855) (Dunqing) ### 🐛 Bug Fixes - a6b6ef8 formatter: Correct calculating layout for `TSNonNullExpression` in `StaticMemberExpression` (#15065) (Dunqing) - 99bd995 formatter: Print parenthesis for sequence expression in `ReturnStatement` and `ExpressionStatement` (#15062) (Dunqing) - f3fb998 formatter: Correct printing comments for `TSAsExpression` (#15061) (Dunqing) - 1e4a018 formatter: Correct checking of the short argument for `CallArguments` (#15055) (Dunqing) - c0dfd9b formatter: Print comments before fat arrow as-is for `ArrowFunctionExpression` (#15050) (Dunqing) - 206b519 formatter: Should hug parameter with `TSMappedType` type annotation (#15049) (Dunqing) - e48c604 formatter: Incorrect formatting of a function with `this` parameter (#15031) (Dunqing) - a9f0c45 formatter: Decorators and class method on the same line shouldn't be broken by a leading comment of the method (#15029) (Dunqing) - 43d74e4 formatter: Handle `<CRLF>` for `SourceText` (#15016) (leaysgur) - 34fab40 formatter: Correct calculating layout for `ChainExpression` in `StaticMemberExpression` (#14986) (Dunqing) - 68dc101 formatter: Should not break when the parent of root of `StaticMemberExpression` is used as the `Argument` of `NewExpression` (#14985) (Dunqing) - 071b739 formatter: Align the short argument handling for UnaryExpression with Prettier (#14984) (Dunqing) - 3940f3a formatter: `BestFitting` doesn't exactly matches the `conditinalGroup` behavior in Prettier (#14983) (Dunqing) - 4a84e44 formatter: Align the logic of printing type parameters, parameters, and return type for functions with Prettier (#14942) (Dunqing) - 68c1f2a formatter: Non-nested static member expressions will never break (#14929) (Dunqing) - 42adc47 formatter: Check whether a type alias is complex when its right hand side never break (#14928) (Dunqing) - e501f13 formatter: Should not add a trailing comma for long curried calls when `trailingComma` is es5 (#14913) (Dunqing) ### 🚜 Refactor - 7d64291 formatter: Simplify printing ClassElement with a semicolon (#15030) (Dunqing) - 5de99c2 formatter: Export unified way to get_parse_options (#15027) (leaysgur) - f6f22e2 formatter: Clean up unneeded implementations for printing comments (#14935) (Dunqing) - 7a2b9d1 formatter: Improve printing trailing comments (#14934) (Dunqing) - ba10caa formatter: Align printing trailing comments with Prettier (#14927) (Dunqing) - 597c9e8 formatter: Remove redundunt public API (#14915) (leaysgur) ### ⚡ Performance - 467b3a1 formatter: Optimize grouping logic for call arguments (#15033) (Dunqing) ### 💼 Other - aceff66 oxfmt: V0.9.0 (#15088) (Boshen)

## [0.9.0] - 2025-10-30 ### 🚀 Features - 8fe7e85 formatter: Support printing Formatter IR (#14855) (Dunqing) ### 🐛 Bug Fixes - a6b6ef8 formatter: Correct calculating layout for `TSNonNullExpression` in `StaticMemberExpression` (#15065) (Dunqing) - 99bd995 formatter: Print parenthesis for sequence expression in `ReturnStatement` and `ExpressionStatement` (#15062) (Dunqing) - f3fb998 formatter: Correct printing comments for `TSAsExpression` (#15061) (Dunqing) - 1e4a018 formatter: Correct checking of the short argument for `CallArguments` (#15055) (Dunqing) - c0dfd9b formatter: Print comments before fat arrow as-is for `ArrowFunctionExpression` (#15050) (Dunqing) - 206b519 formatter: Should hug parameter with `TSMappedType` type annotation (#15049) (Dunqing) - e48c604 formatter: Incorrect formatting of a function with `this` parameter (#15031) (Dunqing) - a9f0c45 formatter: Decorators and class method on the same line shouldn't be broken by a leading comment of the method (#15029) (Dunqing) - 43d74e4 formatter: Handle `<CRLF>` for `SourceText` (#15016) (leaysgur) - 34fab40 formatter: Correct calculating layout for `ChainExpression` in `StaticMemberExpression` (#14986) (Dunqing) - 68dc101 formatter: Should not break when the parent of root of `StaticMemberExpression` is used as the `Argument` of `NewExpression` (#14985) (Dunqing) - 071b739 formatter: Align the short argument handling for UnaryExpression with Prettier (#14984) (Dunqing) - 3940f3a formatter: `BestFitting` doesn't exactly matches the `conditinalGroup` behavior in Prettier (#14983) (Dunqing) - 4a84e44 formatter: Align the logic of printing type parameters, parameters, and return type for functions with Prettier (#14942) (Dunqing) - 68c1f2a formatter: Non-nested static member expressions will never break (#14929) (Dunqing) - 42adc47 formatter: Check whether a type alias is complex when its right hand side never break (#14928) (Dunqing) - e501f13 formatter: Should not add a trailing comma for long curried calls when `trailingComma` is es5 (#14913) (Dunqing) ### 🚜 Refactor - 7d64291 formatter: Simplify printing ClassElement with a semicolon (#15030) (Dunqing) - 5de99c2 formatter: Export unified way to get_parse_options (#15027) (leaysgur) - f6f22e2 formatter: Clean up unneeded implementations for printing comments (#14935) (Dunqing) - 7a2b9d1 formatter: Improve printing trailing comments (#14934) (Dunqing) - ba10caa formatter: Align printing trailing comments with Prettier (#14927) (Dunqing) - 597c9e8 formatter: Remove redundunt public API (#14915) (leaysgur) ### ⚡ Performance - 467b3a1 formatter: Optimize grouping logic for call arguments (#15033) (Dunqing) ### 💼 Other - 6368793 oxfmt: V0.9.0 (#15091) (Boshen) - aceff66 oxfmt: V0.9.0 (#15088) (Boshen)

github-actions bot added A-formatter Area - Formatter C-bug Category - Bug labels Oct 28, 2025

This was referenced Oct 28, 2025

refactor(formatter): simplify printing ClassElement with a semicolon #15030

Merged

fix(formatter): incorrect formatting of a function with this parameter #15031

Merged

Dunqing marked this pull request as ready for review October 29, 2025 10:00

Copilot AI review requested due to automatic review settings October 29, 2025 10:00

Copilot AI reviewed Oct 29, 2025

View reviewed changes

Dunqing mentioned this pull request Oct 29, 2025

fix(formatter): correct calculating layout for TSNonNullExpression in StaticMemberExpression #15065

Merged

graphite-app bot added the 0-merge Merge with Graphite Merge Queue label Oct 29, 2025

fix(formatter): decorators and class method on the same line shouldn'…

a9f0c45

…t be broken by a leading comment of the method (#15029)

graphite-app bot force-pushed the 10-28-fix_formatter_decorators_and_class_method_on_the_same_line_shouldn_t_be_broken_by_a_leading_comment_of_the_method branch from 7105e06 to a9f0c45 Compare October 29, 2025 15:46

graphite-app bot merged commit a9f0c45 into main Oct 29, 2025
20 checks passed

graphite-app bot deleted the 10-28-fix_formatter_decorators_and_class_method_on_the_same_line_shouldn_t_be_broken_by_a_leading_comment_of_the_method branch October 29, 2025 15:52

graphite-app bot removed the 0-merge Merge with Graphite Merge Queue label Oct 29, 2025

Dunqing mentioned this pull request Oct 29, 2025

perf(formatter): optimize grouping logic for call arguments #15033

Merged

Boshen mentioned this pull request Oct 30, 2025

release(oxfmt): v0.9.0 #15088

Merged

Boshen mentioned this pull request Oct 30, 2025

release(oxfmt): v0.9.0 #15091

Merged

Boshen mentioned this pull request Oct 30, 2025

release(oxfmt): v0.9.0 #15096

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

fix(formatter): decorators and class method on the same line shouldn't be broken by a leading comment of the method #15029

fix(formatter): decorators and class method on the same line shouldn't be broken by a leading comment of the method #15029

Dunqing commented Oct 28, 2025

Uh oh!

Dunqing commented Oct 28, 2025 •

edited

Loading

Uh oh!

codspeed-hq bot commented Oct 28, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

graphite-app bot commented Oct 29, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

fix(formatter): decorators and class method on the same line shouldn't be broken by a leading comment of the method #15029

fix(formatter): decorators and class method on the same line shouldn't be broken by a leading comment of the method #15029

Conversation

Dunqing commented Oct 28, 2025

Uh oh!

Dunqing commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to use the Graphite Merge Queue

Uh oh!

codspeed-hq bot commented Oct 28, 2025

CodSpeed Performance Report

Merging #15029 will not alter performance

Summary

Footnotes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

graphite-app bot commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge activity

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Dunqing commented Oct 28, 2025 •

edited

Loading

graphite-app bot commented Oct 29, 2025 •

edited

Loading