fix(formatter): incorrect inline comment placement in try-catch by Dunqing · Pull Request #17657 · oxc-project/oxc

Dunqing · 2026-01-05T06:38:49Z

Dunqing · 2026-01-05T06:39:07Z

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.

Copilot

Pull request overview

This PR fixes incorrect inline comment placement in try-catch-finally statements by adding conditional logic to handle comments appropriately based on whether they are own-line comments or inline comments.

Key Changes:

Added conditional checks using has_leading_own_line_comment() to determine comment handling strategy
Uses block.write(f) for blocks with own-line comments (to avoid printing them, as they'll be handled inside the block)
Uses write!(f, block) for blocks with inline comments (to allow proper formatting)

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File	Description
`crates/oxc_formatter/src/write/try_statement.rs`	Adds conditional logic to handle inline vs own-line comments for try blocks, catch blocks, and finally blocks
`crates/oxc_formatter/tests/fixtures/js/comments/try-catch.js`	Adds test fixture with various inline comment scenarios in try-catch-finally statements
`crates/oxc_formatter/tests/fixtures/js/comments/try-catch.js.snap`	Adds snapshot showing expected formatting output for the test cases

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

crates/oxc_formatter/src/write/try_statement.rs

codspeed-hq · 2026-01-05T07:25:58Z

CodSpeed Performance Report

Merging #17657 will not alter performance

_{Comparing 01-05-fix_formatter_incorrect_inline_comment_placement_in_try-catch (ecd31fb) with main (8fd4ea9)}

Summary

✅ 38 untouched
⏩ 7 skipped¹

7 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. ↩

leaysgur

👍🏻 also copilot review seems valid.

graphite-app · 2026-01-05T07:44:53Z

Merge activity

Jan 5, 7:44 AM UTC: Dunqing added this pull request to the Graphite merge queue.
Jan 5, 7:51 AM UTC: Merged by the Graphite merge queue.

close: #17653

# Oxlint ### 💥 BREAKING CHANGES - f7da875 oxlint: [**BREAKING**] Remove oxc_language_server binary (#17457) (Boshen) ### 🚀 Features - 659c23e linter: Init note field boilerplate (#17589) (Shrey Sudhir) - 6870b64 parser: Add TS1363 error code (#17609) (Sysix) - 6154c8c linter/eslint-plugin-vitest: Implemented vitest/warn-todo rule (#17228) (Said Atrahouch) - 0043cd6 linter/eslint-plugin-vitest: Implement consistent-vitest-vi rule (#17389) (Said Atrahouch) - a6d773d linter: Add full TS support to eslint/no-useless-constructor (#17592) (camc314) - f02c0e7 linter/eslint: Implement complexity (#17569) (Nguyen Tran) - bc7aae7 linter/no-unused-vars: Add fixer to remove unused catch bindings (#17567) (Don Isaac) - 9e8ec78 linter/only-throw-error rule: Add `allowRethrowing` option for (#17554) (camc314) - b67e819 linter: Add fixer for `unicorn/prefer-response-static-json` rule (#17559) (Mikhail Baev) - 44b0361 linter/vue: Implement no-this-in-before-route-enter (#17525) (yefan) - ee34716 linter/react: Implement no-will-update-set-state (#17530) (Kenzo Wada) - 3088e1d linter/react: Implement no-this-in-sfc (#17535) (Kenzo Wada) - 29a2868 linter/jsx-a11y: Implement no-static-element-interactions (#17538) (Kenzo Wada) - eadf057 linter: Enable tsconfig auto discovery by default (#17489) (Boshen) - 12a7d6e website_linter: Add a count of rules with fixes available to rules table. (#17476) (Connor Shea) ### 🐛 Bug Fixes - a702f13 oxlint/lsp: Correct position for "disable for this file" with shebang (#17613) (Sysix) - 19fdfb6 linter: Panic in `sort-keys` rule with Unicode numeric characters (#17629) (Adel Rodríguez) - 2e8f469 vscode: Search for `node_modules/.bin/oxlint.exe` too (bun setup) (#17597) (Sysix) - be39906 linter/aria-proptypes: Allow template literals with expressions for string-type ARIA props (#17460) (Jökull Sólberg Auðunsson) - 529901c linter: Include JS plugin rules when calculating total rule count (#17520) (connorshea) - 96ef2cc linter: Print total rule # when using a single nested config (#17517) (connorshea) - 9ad0f29 oxlint: Do not enable external plugin store when no external linter is passed (#17498) (Sysix) - 174375d oxfmt,oxlint: Disable mimalloc for 32-bit Arm targets (#17473) (Yaksh Bariya) - ff70fe9 linter/no-standalone-expect: Allows expect in wrapper functions passed to test blocks (#17427) (Copilot) - dab232f linter/catch-or-return: Handle arrow functions with implicit returns correctly (#17440) (Copilot) - a38892a linter: Update no-unnecessary-template-expression docs and test case (#17453) (camc314) ### ⚡ Performance - 605dbf1 vscode: Restrict searching for oxlint/oxfmt binaries only 3 levels deep + 10s timeout (#17345) (Sysix) ### 📚 Documentation - 884fb63 linter/react: Improve docs for jsx-curly-brace-presence (#17579) (connorshea) - 1d3ee07 linter: Improve rule explanation for `vue/no-this-in-before-route-enter`. (#17581) (connorshea) - 5f189f8 linter/arrow-body-style: Correctly document default mode option (#17566) (Rägnar O'ock) - bb2e8e4 linter: Add a note to the `typescript/no-var-requires` rule about the missing `allow` option (#17551) (connorshea) - 655afc1 linter: Improve docs for `import/extensions` and add a few more tests (#17539) (connorshea) - 7e5fc90 linter: Update list of plugins that are reserved. (#17516) (connorshea) # Oxfmt ### 💥 BREAKING CHANGES - f7da875 oxlint: [**BREAKING**] Remove oxc_language_server binary (#17457) (Boshen) ### 🚀 Features - 8fd4ea9 oxfmt: `options.embeddedLanguageFormatting` is now `"auto"` by default (#17649) (leaysgur) ### 🐛 Bug Fixes - c9b5d7d formatter/sort_imports: Handle alignable_comment correctly (#17646) (leaysgur) - 453222d formatter: Missing comment handling for end-of-line comments in member chains (#17659) (Dunqing) - 0805ff2 formatter: Incorrect inline comment placement in try-catch (#17657) (Dunqing) - 3a0c782 formatter: Don't move comments into optional call parentheses (#17582) (magic-akari) - 174375d oxfmt,oxlint: Disable mimalloc for 32-bit Arm targets (#17473) (Yaksh Bariya) ### ⚡ Performance - abb28dc oxfmt: Turn of pretty print from sort-package-json (#17452) (Boshen)

github-actions bot added A-formatter Area - Formatter C-bug Category - Bug labels Jan 5, 2026

Dunqing force-pushed the 01-05-fix_formatter_incorrect_inline_comment_placement_in_try-catch branch from ebb27de to 7c71d92 Compare January 5, 2026 07:21

Dunqing mentioned this pull request Jan 5, 2026

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

Merged

Dunqing marked this pull request as ready for review January 5, 2026 07:22

Copilot AI review requested due to automatic review settings January 5, 2026 07:22

Copilot started reviewing on behalf of Dunqing January 5, 2026 07:22 View session

Copilot AI reviewed Jan 5, 2026

View reviewed changes

crates/oxc_formatter/src/write/try_statement.rs Outdated Show resolved Hide resolved

leaysgur approved these changes Jan 5, 2026

View reviewed changes

graphite-app bot added the 0-merge Merge with Graphite Merge Queue label Jan 5, 2026

fix(formatter): incorrect inline comment placement in try-catch (#17657)

0805ff2

close: #17653

graphite-app bot force-pushed the 01-05-fix_formatter_incorrect_inline_comment_placement_in_try-catch branch from ecd31fb to 0805ff2 Compare January 5, 2026 07:45

graphite-app bot merged commit 0805ff2 into main Jan 5, 2026
20 checks passed

graphite-app bot deleted the 01-05-fix_formatter_incorrect_inline_comment_placement_in_try-catch branch January 5, 2026 07:51

graphite-app bot removed the 0-merge Merge with Graphite Merge Queue label Jan 5, 2026

leaysgur mentioned this pull request Jan 5, 2026

formatter: Diff with Prettier on inline instanbul code comment in try/catch #17653

Closed

Boshen mentioned this pull request Jan 5, 2026

release(apps): oxlint v1.37.0 && oxfmt v0.22.0 #17662

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(formatter): incorrect inline comment placement in try-catch#17657

fix(formatter): incorrect inline comment placement in try-catch#17657
graphite-app[bot] merged 1 commit intomainfrom
01-05-fix_formatter_incorrect_inline_comment_placement_in_try-catch

Dunqing commented Jan 5, 2026 •

edited

Loading

Uh oh!

Dunqing commented Jan 5, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

codspeed-hq bot commented Jan 5, 2026 •

edited

Loading

Uh oh!

leaysgur left a comment

Uh oh!

graphite-app bot commented Jan 5, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

Dunqing commented Jan 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Dunqing commented Jan 5, 2026 • 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!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

codspeed-hq bot commented Jan 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CodSpeed Performance Report

Merging #17657 will not alter performance

Summary

Footnotes

Uh oh!

leaysgur left a comment

Choose a reason for hiding this comment

Uh oh!

graphite-app bot commented Jan 5, 2026 • 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!

3 participants

Dunqing commented Jan 5, 2026 •

edited

Loading

Dunqing commented Jan 5, 2026 •

edited

Loading

codspeed-hq bot commented Jan 5, 2026 •

edited

Loading

graphite-app bot commented Jan 5, 2026 •

edited

Loading