Skip to content

fix(linter/arrow-body-style): preserve comments within function#22854

Merged
graphite-app[bot] merged 1 commit into
mainfrom
05-30-fix_linter_fix_for_array-body-style_preserve_comments
May 30, 2026
Merged

fix(linter/arrow-body-style): preserve comments within function#22854
graphite-app[bot] merged 1 commit into
mainfrom
05-30-fix_linter_fix_for_array-body-style_preserve_comments

Conversation

@Sysix

@Sysix Sysix commented May 30, 2026

Copy link
Copy Markdown
Member

fixes #22833
closes #22853

@github-actions github-actions Bot added the A-linter Area - Linter label May 30, 2026

Sysix commented May 30, 2026

Copy link
Copy Markdown
Member Author

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 changes, fast-track this PR to the front of the merge queue

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

codspeed-hq Bot commented May 30, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 5 untouched benchmarks
⏩ 52 skipped benchmarks1


Comparing 05-30-fix_linter_fix_for_array-body-style_preserve_comments (e476d5e) with main (3d13e29)

Open in CodSpeed

Footnotes

  1. 52 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 AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the eslint/arrow-body-style fixer to preserve comments when converting arrow function block bodies with return statements into concise bodies.

Changes:

  • Passes the full ReturnStatement into the block-to-concise fixer.
  • Replaces whole-body rewriting with smaller edits that remove braces, return, and optional semicolon while preserving interior trivia.
  • Updates fixer expectations and adds comment-preservation test cases.

Comment thread crates/oxc_linter/src/rules/eslint/arrow_body_style.rs Outdated
@Sysix Sysix force-pushed the 05-30-fix_linter_fix_for_array-body-style_preserve_comments branch 2 times, most recently from 37527d9 to e476d5e Compare May 30, 2026 17:47
@Sysix Sysix marked this pull request as ready for review May 30, 2026 18:03
@Sysix Sysix requested a review from camc314 as a code owner May 30, 2026 18:03
@camc314 camc314 self-assigned this May 30, 2026
@camc314 camc314 changed the title fix(linter): fix for array-body-style preserve comments fix(linter/arrow-body-style): preserve comments within function May 30, 2026
@camc314 camc314 added the 0-merge Merge with Graphite Merge Queue label May 30, 2026

camc314 commented May 30, 2026

Copy link
Copy Markdown
Contributor

Merge activity

@graphite-app graphite-app Bot force-pushed the 05-30-fix_linter_fix_for_array-body-style_preserve_comments branch from e476d5e to 39d92d6 Compare May 30, 2026 20:10
@graphite-app graphite-app Bot merged commit 39d92d6 into main May 30, 2026
29 checks passed
@graphite-app graphite-app Bot removed the 0-merge Merge with Graphite Merge Queue label May 30, 2026
@graphite-app graphite-app Bot deleted the 05-30-fix_linter_fix_for_array-body-style_preserve_comments branch May 30, 2026 20:14
camc314 pushed a commit that referenced this pull request Jun 1, 2026
# Oxlint
### 🚀 Features

- e4b1f46 linter/typescript: Implement `method-signature-style` rule
(#22679) (Mikhail Baev)
- bc462ca linter/vue: Implement no-reserved-component-names rule
(#22741) (bab)
- ef9e751 linter/vue: Implement component-definition-name-casing rule
(#22818) (bab)
- d67f51a linter/vue: Implement require-prop-type-constructor rule
(#22708) (bab)
- 1444f82 linter/promise/spec-only: Add `Promise.try` to `Promise`
static methods (#22812) (Ben Saufley)
- 8422e8b linter/jsdoc: Implement `require-yields-description` rule
(#22805) (Mikhail Baev)
- fe93f97 linter/eslint: Implement `prefer-named-capture-group` rule
(#22759) (Sebastian Poxhofer)
- 1a7798b linter: Add suggestion for `unicorn/no-new-array` (#22682)
(Sysix)

### 🐛 Bug Fixes

- 760a9f9 linter: Report errors when writing to the filesystem (#22881)
(camc314)
- e5a2748 linter: Avoid no-unreachable false positive after conditional
loop (#22869) (camc314)
- 39d92d6 linter/arrow-body-style: Preserve comments within function
(#22854) (Sysix)
- 3d13e29 parser: Reject `declare` in an already-ambient context
(TS1038) (#22850) (Boshen)
- 5152854 parser: Reject statements in ambient contexts (TS1036)
(#22849) (Boshen)
- 2eafea6 parser: Reject function implementations in ambient contexts
(TS1183) (#22845) (Boshen)
- c645615 parser: Reject incompatible class member modifiers (#22843)
(Boshen)
- 4a1ca4a linter/export: Detect duplicate explicit exports (#22798)
(camc314)
- 0a9a735 linter/no-loop-func: Allow safe let closures (#22811)
(camc314)
- 1599f11 linter: Align lsp extends default plugins (#22788) (camc314)
- db32ec9 linter/no-accumulating-spread: Use loop as primary span
(#22800) (camc314)
- 33ec6b4 linter/consistent-test-it: Avoid adjacent describe leakage
(#22796) (camc314)
- 2606069 linter/no-array-sort: Unwrap parenthesized sort args (#22794)
(camc314)
- 9f2f709 linter/no-array-sort: Skip non compare fn sort arguments
(#22752) (Gaurav Dubey)
- 27268a0 linter/no-else-return: Preserve statement boundary in fixer
(#22687) (camc314)
- d9cb6d8 linter/no-empty-function: Allow functions callbacks with
`allow: functions` (#22764) (camc314)
- a40a314 linter/no-shadow-restricted-names: Ignore enum members
(#22762) (camc314)
- 82366d9 linter/no-cond-assign: Align ternary handling (#22761)
(camc314)

### 📚 Documentation

- 5e113ba linter: Add license notices for ported ESLint plugins (#22768)
(Boshen)
# Oxfmt
### 🚀 Features

- d75cbbf oxfmt: Format `parser:json` files by `oxc_formatter_json`
(#22709) (leaysgur)
- 49db054 formatter_json: Implement `oxc_formatter_json` (json variant
only) (#22641) (leaysgur)
- 9c71f2e ast, codegen, formatter: Add `WithClauseKeyword::as_str`
helper and use it (#22791) (camc314)

### 🐛 Bug Fixes

- d3cdd62 oxfmt: Skip formatting for whitespace-only file (#22780)
(leaysgur)
- 23f0cc8 formatter: Don't move comments inside variable declaration in
for in loop (#22776) (leaysgur)
- f200c40 formatter: Don't move comments inside variable declaration in
for of loop (#22773) (Leonabcd123)

### 📚 Documentation

- 845f393 oxfmt,formatter,formatter_json,formatter_core: Add/update
AGENTS.md (#22873) (leaysgur)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-linter Area - Linter

Projects

None yet

Development

Successfully merging this pull request may close these issues.

linter: auto-fix for eslint/arrow-body-style removes comments

3 participants