feat(codegen): preserve comments between CatchClause's param and body by Copilot · Pull Request #16167 · oxc-project/oxc

Copilot · 2025-11-26T14:09:31Z

graphite-app · 2025-11-26T14:09:38Z

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

.serena/memories/project_overview.md

crates/oxc_codegen/tests/integration/comments.rs

codspeed-hq · 2025-11-27T08:34:51Z

CodSpeed Performance Report

Merging #16167 will not alter performance

_{Comparing copilot/preserve-comments-in-catch-clause (4faf829) with main (cfdfe7d)¹}

Summary

✅ 42 untouched
⏩ 3 skipped²

No successful run was found on main (e34897b) during the generation of this report, so cfdfe7d was used instead as the comparison base. There might be some changes unrelated to this pull request in this report. ↩
3 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 adds support for preserving comments between a catch clause's parameter and body, enabling code coverage tools that use ignore hints (like /* v8 ignore next */) to properly instrument catch blocks.

Key Changes:

Modified comment parsing to treat line comments after ) as leading rather than trailing
Added comment printing logic in CatchClause codegen before the block body
Added manual handling of the print_next_indent_as_space flag to ensure proper spacing

Reviewed changes

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

File	Description
crates/oxc_parser/src/lexer/trivia_builder.rs	Updated trailing comment detection to exclude `Kind::RParen`, making line comments after `)` be treated as leading comments attached to the next token
crates/oxc_codegen/src/gen.rs	Added `print_comments_at(self.body.span.start)` before printing catch block body, with manual handling of spacing flag for inline comments
crates/oxc_codegen/tests/integration/comments.rs	Added three test cases covering inline block comments, multiple comments, and line comments between catch parameter and body
crates/oxc_codegen/tests/integration/snapshots/coverage.snap	Added snapshot expectations for the three new test cases showing proper comment preservation

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

crates/oxc_parser/src/lexer/trivia_builder.rs

crates/oxc_codegen/tests/integration/comments.rs

crates/oxc_codegen/tests/integration/js.rs

crates/oxc_codegen/tests/integration/snapshots/coverage_minify.snap

sapphi-red · 2025-12-05T04:49:44Z

@copilot fix lint

Copilot · 2025-12-05T04:55:20Z

@copilot fix lint

Fixed in 4faf829. Removed unused imports (CodegenOptions, CommentOptions, and snapshot_options) from comments.rs.

Boshen · 2025-12-05T06:29:24Z

Merge activity

Dec 5, 6:29 AM UTC: The merge label '0-merge' was detected. This PR will be added to the Graphite merge queue once it meets the requirements.
Dec 5, 6:29 AM UTC: Boshen added this pull request to the Graphite merge queue.
Dec 5, 6:35 AM UTC: Merged by the Graphite merge queue.

…#16167) Fixes #16076

### 💥 BREAKING CHANGES - 083fea9 napi/parser: [**BREAKING**] Represent empty optional fields on JS side as `null` (#16411) (overlookmotel) ### 🚀 Features - 7a2afee parser: Add TS1174 error for classes extending multiple base classes (#15993) (sapphi-red) - da87812 semantic: Add TS2309 error for export assignment with other exports (#15992) (sapphi-red) - d6d2bcd minifier: Remove unused function calls that are marked by `manual_pure_functions` (#16534) (sapphi-red) - c90f053 minifier: Support `.` separated values for `compress.treeshake.manualPureFunctions` (#16529) (sapphi-red) - a607cc4 codegen: Preserve comments between CatchClause's param and body (#16167) (copilot-swe-agent) - 8c10694 semantic: Expose get_comment_at method (#16439) (camc314) - 3981e7a ast: Add get_comment_at to lookup a comment by span (#16438) (camc314) ### 🐛 Bug Fixes - 699406a napi/parser: Move `ExportEntry::module_request` field to first (#16412) (overlookmotel) - 12bd794 napi/parser: Move `ExportEntry::module_request` field to last (#16403) (overlookmotel) ### ⚡ Performance - 790beeb napi/parser: Do not remove extraneous options on JS side (#16447) (overlookmotel) Co-authored-by: Boshen <1430279+Boshen@users.noreply.github.com>

…oxc-project#16167) Fixes oxc-project#16076

### 💥 BREAKING CHANGES - 083fea9 napi/parser: [**BREAKING**] Represent empty optional fields on JS side as `null` (oxc-project#16411) (overlookmotel) ### 🚀 Features - 7a2afee parser: Add TS1174 error for classes extending multiple base classes (oxc-project#15993) (sapphi-red) - da87812 semantic: Add TS2309 error for export assignment with other exports (oxc-project#15992) (sapphi-red) - d6d2bcd minifier: Remove unused function calls that are marked by `manual_pure_functions` (oxc-project#16534) (sapphi-red) - c90f053 minifier: Support `.` separated values for `compress.treeshake.manualPureFunctions` (oxc-project#16529) (sapphi-red) - a607cc4 codegen: Preserve comments between CatchClause's param and body (oxc-project#16167) (copilot-swe-agent) - 8c10694 semantic: Expose get_comment_at method (oxc-project#16439) (camc314) - 3981e7a ast: Add get_comment_at to lookup a comment by span (oxc-project#16438) (camc314) ### 🐛 Bug Fixes - 699406a napi/parser: Move `ExportEntry::module_request` field to first (oxc-project#16412) (overlookmotel) - 12bd794 napi/parser: Move `ExportEntry::module_request` field to last (oxc-project#16403) (overlookmotel) ### ⚡ Performance - 790beeb napi/parser: Do not remove extraneous options on JS side (oxc-project#16447) (overlookmotel) Co-authored-by: Boshen <1430279+Boshen@users.noreply.github.com>

Copilot AI assigned Copilot and sapphi-red Nov 26, 2025

Copilot started work on behalf of sapphi-red November 26, 2025 14:09 View session

Copilot AI changed the title ~~[WIP] Fix codegen to preserve comments in CatchClause~~ feat(codegen): preserve comments between CatchClause's param and body Nov 26, 2025

Copilot finished work on behalf of sapphi-red November 26, 2025 14:31

Copilot AI requested a review from sapphi-red November 26, 2025 14:31

sapphi-red reviewed Nov 26, 2025

View reviewed changes

.serena/memories/project_overview.md Outdated Show resolved Hide resolved

crates/oxc_codegen/tests/integration/comments.rs Show resolved Hide resolved

Copilot started work on behalf of sapphi-red November 26, 2025 14:39 View session

Copilot AI requested a review from sapphi-red November 26, 2025 14:49

Copilot finished work on behalf of sapphi-red November 26, 2025 14:49

Copilot started work on behalf of sapphi-red November 27, 2025 07:06 View session

Copilot finished work on behalf of sapphi-red November 27, 2025 07:17

Copilot finished work on behalf of sapphi-red November 27, 2025 07:19

sapphi-red approved these changes Nov 27, 2025

View reviewed changes

sapphi-red marked this pull request as ready for review November 27, 2025 08:27

Copilot AI review requested due to automatic review settings November 27, 2025 08:27

Copilot started reviewing on behalf of sapphi-red November 27, 2025 08:28 View session

github-actions bot added A-parser Area - Parser A-codegen Area - Code Generation C-enhancement Category - New feature or request labels Nov 27, 2025

Copilot finished reviewing on behalf of sapphi-red November 27, 2025 08:34

Copilot AI reviewed Nov 27, 2025

View reviewed changes

crates/oxc_parser/src/lexer/trivia_builder.rs Outdated Show resolved Hide resolved

sapphi-red marked this pull request as draft November 27, 2025 09:53

Copilot started work on behalf of sapphi-red November 27, 2025 09:54 View session

Copilot AI requested a review from sapphi-red November 27, 2025 10:00

Copilot finished work on behalf of sapphi-red November 27, 2025 10:00

sapphi-red force-pushed the copilot/preserve-comments-in-catch-clause branch from 78c730b to bc81ea4 Compare November 27, 2025 10:18

Copilot finished work on behalf of sapphi-red November 28, 2025 02:09

sapphi-red reviewed Dec 1, 2025

View reviewed changes

crates/oxc_codegen/tests/integration/comments.rs Outdated Show resolved Hide resolved

sapphi-red reviewed Dec 1, 2025

View reviewed changes

crates/oxc_codegen/tests/integration/js.rs Outdated Show resolved Hide resolved

sapphi-red reviewed Dec 1, 2025

View reviewed changes

crates/oxc_codegen/tests/integration/snapshots/coverage_minify.snap Outdated Show resolved Hide resolved

sapphi-red removed the A-parser Area - Parser label Dec 1, 2025

Copilot started work on behalf of sapphi-red December 1, 2025 14:48 View session

Copilot AI requested a review from sapphi-red December 1, 2025 14:52

Copilot finished work on behalf of sapphi-red December 1, 2025 14:52

Copilot started work on behalf of sapphi-red December 5, 2025 04:50 View session

Copilot finished work on behalf of sapphi-red December 5, 2025 04:56

sapphi-red marked this pull request as ready for review December 5, 2025 06:18

sapphi-red requested review from Boshen and removed request for sapphi-red December 5, 2025 06:18

sapphi-red assigned Boshen and unassigned sapphi-red and Copilot Dec 5, 2025

Boshen added the 0-merge Merge with Graphite Merge Queue label Dec 5, 2025

feat(codegen): preserve comments between CatchClause's param and body (…

a607cc4

…#16167) Fixes #16076

graphite-app bot force-pushed the copilot/preserve-comments-in-catch-clause branch from 4faf829 to a607cc4 Compare December 5, 2025 06:29

graphite-app bot merged commit a607cc4 into main Dec 5, 2025
20 checks passed

graphite-app bot deleted the copilot/preserve-comments-in-catch-clause branch December 5, 2025 06:35

graphite-app bot removed the 0-merge Merge with Graphite Merge Queue label Dec 5, 2025

Boshen mentioned this pull request Dec 8, 2025

release(crates): oxc v0.102.0 #16595

Merged

taearls pushed a commit to taearls/oxc that referenced this pull request Dec 11, 2025

feat(codegen): preserve comments between CatchClause's param and body (…

11247a1

…oxc-project#16167) Fixes oxc-project#16076

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(codegen): preserve comments between CatchClause's param and body#16167

feat(codegen): preserve comments between CatchClause's param and body#16167
graphite-app[bot] merged 1 commit intomainfrom
copilot/preserve-comments-in-catch-clause

Copilot AI commented Nov 26, 2025 •

edited by Boshen

Loading

Uh oh!

graphite-app bot commented Nov 26, 2025

Uh oh!

Uh oh!

Uh oh!

codspeed-hq bot commented Nov 27, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sapphi-red commented Dec 5, 2025

Uh oh!

Copilot AI commented Dec 5, 2025

Uh oh!

Boshen commented Dec 5, 2025 •

edited by graphite-app bot

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

Copilot AI commented Nov 26, 2025 • edited by Boshen Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

graphite-app bot commented Nov 26, 2025

How to use the Graphite Merge Queue

Uh oh!

Uh oh!

Uh oh!

codspeed-hq bot commented Nov 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CodSpeed Performance Report

Merging #16167 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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sapphi-red commented Dec 5, 2025

Uh oh!

Copilot AI commented Dec 5, 2025

Uh oh!

Boshen commented Dec 5, 2025 • edited by graphite-app bot 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!

4 participants

Copilot AI commented Nov 26, 2025 •

edited by Boshen

Loading

codspeed-hq bot commented Nov 27, 2025 •

edited

Loading

Boshen commented Dec 5, 2025 •

edited by graphite-app bot

Loading